silicons
|
dedb0cb62e
|
Merge remote-tracking branch 'citadel/master' into tgsync
|
2021-01-19 04:24:42 -07:00 |
|
Lin
|
73213b4bad
|
Merge pull request #14079 from LetterN/patch-3
Fixes this vending oversight
|
2021-01-18 13:17:05 -06:00 |
|
silicons
|
2266a9e17b
|
Merge pull request #14037 from DeltaFire15/nanogel
Nanogel for robotic limbs
|
2021-01-17 20:42:19 -07:00 |
|
silicons
|
829e946755
|
Merge pull request #14061 from Hatterhat/gauze-parity
something something gauze things
|
2021-01-17 20:40:09 -07:00 |
|
Letter N
|
0b088be4df
|
missing ,
|
2021-01-17 18:00:43 +08:00 |
|
Letter N
|
919b8c8d57
|
Update machine_circuitboards.dm
|
2021-01-17 17:54:06 +08:00 |
|
DeltaFire
|
3e917653c7
|
Merge pull request #14044 from corin9090/beadies
Belt slot prayer beads
|
2021-01-15 18:50:14 +01:00 |
|
DeltaFire
|
d331dd4b1e
|
Merge pull request #14046 from Citadel-Station-13/silicons-patch-10
buffs and fixes BOOMERANG STUNBATONS
|
2021-01-15 18:30:32 +01:00 |
|
DeltaFire
|
de40e96180
|
Merge pull request #14047 from Citadel-Station-13/silicons-patch-11
boomerangs now properly turn ON your throw mode rather than turning it off when it already is
|
2021-01-15 18:30:16 +01:00 |
|
Hatterhat
|
798b25846d
|
gauze parity
|
2021-01-14 20:53:55 -06:00 |
|
The0bserver
|
ffe401544c
|
First wave of fixing
|
2021-01-13 23:35:37 -05:00 |
|
silicons
|
ea07ad6e48
|
Merge remote-tracking branch 'citadel/master' into tgsync
|
2021-01-13 15:41:28 -07:00 |
|
silicons
|
06bc57580a
|
Update stunbaton.dm
|
2021-01-13 15:22:41 -07:00 |
|
silicons
|
701bacd355
|
Update stunbaton.dm
|
2021-01-13 15:06:35 -07:00 |
|
corin9090
|
9f0280309d
|
Belt slot prayer beads
uwu
|
2021-01-13 09:24:55 -08:00 |
|
DeltaFire
|
6192d4ddab
|
fixes
|
2021-01-13 00:08:59 +01:00 |
|
DeltaFire
|
f591bff85b
|
sprite stuff
|
2021-01-12 23:54:40 +01:00 |
|
DeltaFire
|
032c169098
|
whoops
|
2021-01-12 23:29:51 +01:00 |
|
Hatterhat
|
2042de0f19
|
sterilegauze buff
|
2021-01-12 16:13:08 -06:00 |
|
Hatterhat
|
cb40ad4764
|
atomization is cowardice actually
|
2021-01-12 16:08:17 -06:00 |
|
DeltaFire
|
13beddd42b
|
nanogel time
|
2021-01-12 23:02:44 +01:00 |
|
silicons
|
9733305997
|
Merge remote-tracking branch 'citadel/master' into tgsync
|
2021-01-09 14:56:32 -08:00 |
|
silicons
|
656691912e
|
Merge pull request #13965 from Xantholne/GoodNightDisky
Good Night Disky
|
2021-01-09 15:39:06 -07:00 |
|
DeltaFire
|
23c5f1744d
|
actually
|
2021-01-09 00:12:10 +01:00 |
|
DeltaFire
|
4f3df626c6
|
no cell no problem
|
2021-01-09 00:09:17 +01:00 |
|
silicons
|
ddad368d6a
|
Merge remote-tracking branch 'citadel/master' into tgsync
|
2021-01-08 00:33:57 -08:00 |
|
DeltaFire
|
d153d82441
|
Merge pull request #13931 from shellspeed1/porting-turret
Ports disposable sentry gun for station engineers as a traitor item from TG
|
2021-01-08 02:59:48 +01:00 |
|
DeltaFire
|
d100fe1d58
|
Merge pull request #13981 from MrJWhit/caution-sign
Porting the ability to wear the caution sign (plus a random metastation fix)
|
2021-01-07 20:17:03 +01:00 |
|
DeltaFire
|
3d09edfc4b
|
Merge pull request #13978 from Citadel-Station-13/silicons-patch-3
removes c4 mob gibbing
|
2021-01-07 06:22:06 +01:00 |
|
shellspeed1
|
926b4ca609
|
Merge branch 'porting-turret' of https://github.com/shellspeed1/Citadel-Station-13 into porting-turret
|
2021-01-06 18:48:47 -08:00 |
|
shellspeed1
|
21e81faff5
|
Update traitordevices.dm
|
2021-01-06 18:48:02 -08:00 |
|
shellspeed1
|
b5e8d3308c
|
Update traitordevices.dm
|
2021-01-06 18:40:49 -08:00 |
|
silicons
|
90826aeb28
|
Update robot_parts.dm
|
2021-01-06 19:39:28 -07:00 |
|
shellspeed1
|
67364f4254
|
Update traitordevices.dm
|
2021-01-06 18:26:07 -08:00 |
|
MrJWhit
|
ba98a0aacd
|
Update miscellaneous.dm
|
2021-01-06 14:42:00 -05:00 |
|
DeltaFire
|
3f736aaa36
|
Merge pull request #13834 from zeroisthebiggay/pogbox
ports the traitor assistant POGBOX that scales damage with tc from /TG/
|
2021-01-06 19:29:17 +01:00 |
|
MrJWhit
|
abffac67b2
|
Port'n
|
2021-01-06 03:16:08 -05:00 |
|
silicons
|
ab59a0d035
|
Update plastic.dm
|
2021-01-05 23:38:33 -07:00 |
|
Xantholne
|
18a336cec5
|
Adds bed tucking element
|
2021-01-05 02:47:21 -07:00 |
|
necromanceranne
|
0fda694a52
|
A bunch of fixes for bokkens, renamed all references to 'ironwood' to 'steelwood', since I got confused.
|
2021-01-04 15:30:28 +11:00 |
|
zeroisthebiggay
|
b20607cb1a
|
Update toolbox.dm
|
2021-01-03 20:18:55 -05:00 |
|
silicons
|
4c6cc24343
|
Merge pull request #13948 from necromanceranne/sheath_stuff
Bokken and Bokken Accessories: Bonkvengeance
|
2021-01-03 18:18:29 -07:00 |
|
silicons
|
0581748282
|
Merge pull request #13942 from YakumoChen/power-sink
#13925 but doesn't underestimate engineering autism
|
2021-01-03 18:09:38 -07:00 |
|
silicons
|
697619856c
|
Merge pull request #13859 from timothyteakettle/unlockable-loadout-items
unlockable loadout items
|
2021-01-03 18:07:18 -07:00 |
|
Timothy Teakettle
|
813e0f4c79
|
Merge remote-tracking branch 'upstream/master' into unlockable-loadout-items
|
2021-01-01 22:30:04 +00:00 |
|
necromanceranne
|
6a247e2a68
|
Adds a new version of bokken, cleans up some unnecessary code, completely redoes several bokken related sprites
|
2021-01-02 04:26:39 +11:00 |
|
YakumoChen
|
9325daa743
|
Update powersink.dm
|
2021-01-01 03:35:54 +00:00 |
|
necromanceranne
|
0aa5338f9b
|
Adds wakibokken, puts bokken crafting into the craft menu, makes proper bokken a little harder to make but obviously an upgrade, makes crafted katanas and bokken have actual belt overlays
|
2021-01-01 05:42:28 +11:00 |
|
shellspeed1
|
b69132bede
|
ports https://github.com/tgstation/tgstation/pull/52931
|
2020-12-31 00:34:44 -08:00 |
|
SandPoot
|
1fa828a3f7
|
upload files
|
2020-12-30 13:57:10 -03:00 |
|