tommy/tbd-station-14
2
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
23,806 Commits 3 Branches 5 Tags
c35ff87e146f0cda7c10782f4ab80b784b51e5fe
Commit Graph

889 Commits

Author SHA1 Message Date
Nim
4ed11ca73b Energy Shield (#16996) 
* energy shield

* description edits

* shields protect

* small correction

* say no to asteroid bees

* fix

* BlockModifier

* fix

* tweak

* tweak

* ops

* fix

* Update RobustToolbox

* Revert "Update RobustToolbox"

This reverts commit 55be82fe537490367e0afaf86365b0e274e6597e.

* formatting
 2023-06-22 00:08:58 -04:00
Nemanja
9c1c7cabb3 machine part resprite (#17447) 2023-06-18 17:28:27 -06:00
Nemanja
3975578e4e Arsenal tech discipline (#17400) 2023-06-18 15:56:49 -06:00
FacePluslll
422a84e029 Adds Double bladed Esword (#17227) 
* Changed Energy Sword system to allow Wieldable eswords

Needed to add conditions to allow the wielding system to handle the esword if the component existed in the entity. The normal eswords work just fine still.

* Adds sprites for double bladed esword

* added double bladed esword to yml

* Add double bladed esword to uplink catalog

* fixed sprites on right handed wielding

* decresed speed a little and added a wielding time

* Reduced damage

* Damage change

* Balence change

* edited attack speed and heavy windup

* fixed readability issue and removed unwanted brackets

* reflectProp to .75

Co-authored-by: keronshb <54602815+keronshb@users.noreply.github.com>

* wieldTime to 0

Co-authored-by: keronshb <54602815+keronshb@users.noreply.github.com>

* litDisarmMalus to .7

Co-authored-by: keronshb <54602815+keronshb@users.noreply.github.com>

* changed heat and slash damage to 9 and structural damage to 20

* changed uplink desc

---------

Co-authored-by: keronshb <54602815+keronshb@users.noreply.github.com>
 2023-06-18 15:35:23 -04:00
Nemanja
0d0bef455e artifact resprite (#17417) 2023-06-19 01:02:27 +10:00
Nemanja
0b5ccf3395 Artifact Fragments (#17420) 2023-06-19 00:56:45 +10:00
lzk
b31c848418 [Sprites] guitar back and some resprites (#16611) 2023-06-15 21:55:06 +10:00
Nemanja
fa23d57fd8 Remove cloning tech, add bluespace chemistry tech (#17345) 2023-06-14 21:11:11 -06:00
brainfood1183
4322faf5c9 Behonker and Clown Spider (ready for merge) (#16678) 2023-06-15 12:47:36 +10:00
SonicHDC
7c609c913e Dumplings (#16966) 2023-06-15 12:45:30 +10:00
Nemanja
9946bd1f61 Sheet-meister 2000 (#16686) 2023-06-15 10:49:23 +10:00
HerCoyote23
080060d135 L6 Wielded Sprites (#17078) 2023-06-08 17:22:34 +10:00
brainfood1183
cd7d4be188 HAMTR mech (hamster mech) (needs review) (#16393) 
Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
 2023-06-08 16:33:35 +10:00
deltanedas
07d2430840 logic gate stuff (#16943) 
Co-authored-by: deltanedas <@deltanedas:kde.org>
 2023-06-07 16:48:42 -07:00
Renlou
e190771d09 Add funny hampter plushie (#17099) 2023-06-03 11:50:53 -07:00
brainfood1183
c99585c94f Toy Box filled with toys (ready for merge) (#16252) 2023-06-03 13:31:47 +10:00
eoineoineoin
c8a2fb6cd4 Add custom paper for forensic scanner output (#16221) 
Co-authored-by: Eoin Mcloughlin <helloworld@eoinrul.es>
 2023-05-31 19:09:05 +10:00
Puro
2179a4d534 [Sprite + SG] Centcom (#16913) 2023-05-30 21:43:55 -06:00
metalgearsloth
552fbb0585 Adds grappling gun (#16662) 2023-05-27 14:15:15 +10:00
Nemanja
1aceaccc27 Resprite network configurator (#16838) 2023-05-27 13:51:33 +10:00
Slava0135
9abe2900b7 less syringe fill states (#16744) 2023-05-23 13:06:35 -06:00
potato1234_x
cf80193ef6 whoops (#16728) 2023-05-22 23:59:37 -06:00
Jackal298
f8d404d783 Mercenary Items (#16665) 
* Mercenary Items

Adding Mercenary Items

* Fix

* icon jumpsuit fix

* Bot

* bot fix
 2023-05-22 15:57:15 -06:00
TaralGit
57dfb82117 Shivs, spears and guns (#16654) 
* weapons

* craft

* crafting but working this time. hopefully

* spear crafting fix

* graph id fix

---------

Co-authored-by: and_a <and_a@DESKTOP-RJENGIR>
 2023-05-21 18:14:42 -06:00
Slava0135
e554958be6 Add space glue tube (#16600) 2023-05-20 12:42:38 +10:00
Jackal298
ed05998f4c Changeling Sting Sprites Update (#16620) 
I updated the sprites for the changeling sting
 2023-05-19 14:11:25 -06:00
metalgearsloth
65e69cd472 Fix tethergun sprite (#16616) 2023-05-20 00:48:18 +10:00
Julian Giebel
84aaec20d9 Revert "resprite network configurator (#16214)" (#16598) 
This reverts commit 9011039b52.
 2023-05-19 03:27:08 -06:00
metalgearsloth
4efb41aa58 Adds force-gun (#16561) 2023-05-19 17:10:31 +10:00
metalgearsloth
775258be52 Add tether gun (#16430) 2023-05-18 11:36:06 +10:00
Jackal298
11a1140127 Fix kitchen cleaver sprite (#16438) 2023-05-14 14:26:32 -04:00
metalgearsloth
6417bb4fa0 Proto-kinetic crusher (#16277) 
Co-authored-by: AJCM-git <60196617+AJCM-git@users.noreply.github.com>
 2023-05-14 13:15:18 +10:00
Vasilis
4f8d4f89d6 Health analyzer displays turns off when the battery dies (#16125) 2023-05-13 12:28:11 -04:00
deltanedas
22088f693b manly dorf is now like oily oaf (#16349) 2023-05-13 08:14:56 -04:00
forkeyboards
e72db80060 White Cane for Blind People (#16318) 2023-05-13 13:11:35 +10:00
deltanedas
9011039b52 resprite network configurator (#16214) 2023-05-12 17:09:37 -04:00
Velcroboy
74c1a17888 Removes duplicate fortune cookie (#16304) 
Co-authored-by: Jeff <velcroboy333@hotmail.com>
 2023-05-11 00:20:27 +10:00
deltanedas
21166406d8 condiment rework (#16247) 
Co-authored-by: deltanedas <@deltanedas:kde.org>
 2023-05-10 21:36:47 +10:00
potato1234_x
2aa45f2524 Data Disk Update (#16240) 2023-05-08 22:28:37 +10:00
lzk228
f976ca0270 Add xeno plushie (#16228) 2023-05-07 15:50:08 -07:00
Kevin Zheng
4e5adc2b86 Add interlocking airlocks (#14177) 
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
 2023-05-07 16:49:11 +10:00
Julian Giebel
6ebd784cb6 Device Linking and better linking ui (#13645) 
Co-authored-by: AJCM-git <60196617+AJCM-git@users.noreply.github.com>
Co-authored-by: Visne <39844191+Visne@users.noreply.github.com>
Co-authored-by: ElectroJr <leonsfriedrich@gmail.com>
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
 2023-05-07 16:07:24 +10:00
Nemanja
4c2b521c90 Water gun cargo crate (#16172) 2023-05-07 13:14:54 +10:00
potato1234_x
c2a5ca96e8 TG Station Burgers (#15217) 
Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
 2023-05-06 17:43:09 +10:00
potato1234_x
aded6efc0a TG Station Bread (#15234) 
Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
 2023-05-06 17:41:32 +10:00
lapatison
1a466388c1 [Frozen] Soups tweaks (#15110) 
Co-authored-by: Moony <moony@hellomouse.net>
Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
 2023-05-06 17:36:33 +10:00
Tom Leys
eef3c6a5c7 Meat kudzu (from anomoly) more killable, telegraphs better (#16107) 2023-05-06 15:08:50 +10:00
AsikKEsel
b67cb04f19 Added uranium glass and uranium window (#15869) 
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
 2023-05-06 14:47:19 +10:00
Kit0vras
f9fba74101 a librarian's paradise (new books) (#15585) 2023-05-06 12:10:09 +10:00
Nemanja
98481fb9a2 Spray Nozzle & Backpack Water Tank (#16133) 2023-05-06 11:50:09 +10:00