Putnam3145
|
5cde6e0157
|
Merge pull request #13871 from silicons/debris
Merry Christmas - GIVING JANITORS A JOB
|
2021-01-08 00:26:52 -08:00 |
|
silicons
|
407b1fe071
|
Update humans.dm
|
2021-01-07 23:14:59 -07: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 |
|
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 |
|
silicons
|
78322199e3
|
fix
|
2021-01-01 00:38:46 -08: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 |
|
silicons
|
34256a61ef
|
remove drips
|
2020-12-30 21:06:34 -08:00 |
|
SandPoot
|
1fa828a3f7
|
upload files
|
2020-12-30 13:57:10 -03:00 |
|
silicons
|
e6000ceffa
|
meme
|
2020-12-29 11:12:06 -08:00 |
|
silicons
|
da25c48b2c
|
Merge pull request #13855 from Chiirno/paramedBoxOffice
Paramed office on box + Surgery remodel
|
2020-12-29 01:27:49 -07:00 |
|
DeltaFire
|
46a0c65e46
|
Merge branch 'master' into debris
|
2020-12-28 19:04:22 +01:00 |
|
DeltaFire
|
a390816092
|
Merge pull request #13888 from Citadel-Station-13/silicons-patch-48
adds vv wrapper for snowflake plushies
|
2020-12-28 17:42:26 +01:00 |
|
DeltaFire
|
8843a830d2
|
Merge pull request #13897 from keronshb/energybolafix
Fixess Energy Bola to be catchable
|
2020-12-28 17:08:29 +01:00 |
|
keronshb
|
365abe1c5a
|
Allows Energy Bola to be catchable
Allows Energy Bola to be catchable
|
2020-12-27 17:15:59 -05:00 |
|
silicons
|
d4f94724ec
|
Update plushes.dm
|
2020-12-27 10:51:44 -07:00 |
|
silicons
|
798b1b50f4
|
Update plushes.dm
|
2020-12-27 10:38:07 -07:00 |
|
silicons
|
57d85f7e86
|
okay
|
2020-12-27 05:20:29 -08:00 |
|
silicons
|
a42fa987ba
|
ok
|
2020-12-26 22:43:25 -08:00 |
|
silicons
|
5266ae1437
|
okay
|
2020-12-26 22:28:41 -08:00 |
|
silicons
|
bfb3d087c3
|
ok
|
2020-12-26 20:50:28 -08:00 |
|
silicons
|
d3414a4d23
|
ok
|
2020-12-26 20:47:50 -08:00 |
|
silicons
|
dafc6bf89f
|
fix
|
2020-12-26 20:41:21 -08:00 |
|
silicons
|
3228435237
|
errors
|
2020-12-26 20:33:16 -08:00 |
|
silicons
|
6044086de0
|
changes
|
2020-12-26 20:29:52 -08:00 |
|
silicons
|
b7cd14b41e
|
poggy?
|
2020-12-26 20:09:24 -08:00 |
|
Lin
|
b0b483105a
|
Merge pull request #13857 from silicons/contractor_fix_for_real
fixes contractor pods this time for real (and 25% tested instead of 0%)
|
2020-12-26 23:52:51 +00:00 |
|
Timothy Teakettle
|
c3e9cdd9a5
|
finale
|
2020-12-26 23:09:19 +00:00 |
|
silicons
|
9f130e0c5a
|
blood
|
2020-12-26 14:09:10 -08:00 |
|
silicons
|
5c0b4f824f
|
hoh boy
|
2020-12-26 12:42:03 -08:00 |
|
silicons
|
45af2360ad
|
changes
|
2020-12-26 11:35:47 -08:00 |
|
silicons
|
5cf717e75d
|
self message
|
2020-12-25 16:10:32 -08:00 |
|