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 |
|
MrJWhit
|
1cf951c4d4
|
Update atmos_control.dm
|
2021-01-06 02:38:37 -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 |
|
Xantholne
|
fe4f184792
|
good night disky
|
2021-01-04 03:50:43 -07:00 |
|
silicons
|
d6d753e9f7
|
Merge pull request #13959 from necromanceranne/bokken_fixes
Bokken Fixes: You can make them now. Nyoops.
|
2021-01-03 21:37: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 |
|
silicons
|
a0d58cd18d
|
Merge pull request #13954 from EmeraldSundisk/coglocks
Cog and firelocks.
|
2021-01-03 20:19:46 -07: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 |
|
Lin
|
b3c1c69861
|
Merge pull request #13944 from Citadel-Station-13/silicons-patch-59
fixes matrix labels on colormates (swapped 1 and 2, rg is actually gr)
|
2021-01-02 16:17:24 +00:00 |
|
EmeraldSundisk
|
291c0a0a22
|
Update Space_Station_13_areas.dm
|
2021-01-01 22:46:36 -08: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 |
|
DeltaFire
|
a2bb761bee
|
Merge pull request #13924 from SandPoot/master
Allows mass sticking money into your id
|
2021-01-01 08:15:53 +01:00 |
|
silicons
|
fbb2cfbba1
|
Update colormate.dm
|
2020-12-31 23:05:14 -07:00 |
|
YakumoChen
|
9325daa743
|
Update powersink.dm
|
2021-01-01 03:35:54 +00:00 |
|
silicons
|
f1205efa0f
|
Merge pull request #13885 from raspy-on-osu/spaceheater-buff
Makes space heaters worth using
|
2020-12-31 12:38:07 -07: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 |
|
Letter N
|
56789c5924
|
firsthit-lib_machines
|
2020-12-31 16:46:40 +08: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 |
|
EmeraldSundisk
|
b1f76a8566
|
Update Space_Station_13_areas.dm
|
2020-12-29 11:38:07 -08:00 |
|
silicons
|
e6000ceffa
|
meme
|
2020-12-29 11:12:06 -08:00 |
|
EmeraldSundisk
|
0707f6ecfc
|
Update Space_Station_13_areas.dm
|
2020-12-29 10:56:58 -08:00 |
|
EmeraldSundisk
|
6af5d180d0
|
Update Space_Station_13_areas.dm
|
2020-12-29 10:29:28 -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 |
|
Letter N
|
40f937c28b
|
linter again
|
2020-12-29 13:56:50 +08:00 |
|
Letter N
|
f28363ae56
|
code quality
|
2020-12-29 11:12:56 +08:00 |
|
Letter N
|
51143f89e5
|
Merge remote-tracking branch 'origin/master' into semi-sync
|
2020-12-29 10:37:06 +08: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
|
9b6d4c1371
|
Merge pull request #13889 from Citadel-Station-13/silicons-patch-49
adds recursive pulling check to space transitions
|
2020-12-28 17:39:59 +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 |
|
Letter N
|
ce5ab2f3a4
|
Merge remote-tracking branch 'origin/master' into semi-sync
|
2020-12-28 09:35:58 +08:00 |
|
keronshb
|
365abe1c5a
|
Allows Energy Bola to be catchable
Allows Energy Bola to be catchable
|
2020-12-27 17:15:59 -05:00 |
|
silicons
|
5e269c327a
|
Update space.dm
|
2020-12-27 10:53:11 -07: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 |
|