Commit Graph
9261 Commits
Author SHA1 Message Date
siliconsandGitHub a0d58cd18d Merge pull request #13954 from EmeraldSundisk/coglocks
Cog and firelocks.
2021-01-03 20:19:46 -07:00
zeroisthebiggayandGitHub b20607cb1a Update toolbox.dm 2021-01-03 20:18:55 -05:00
siliconsandGitHub 4c6cc24343 Merge pull request #13948 from necromanceranne/sheath_stuff
Bokken and Bokken Accessories: Bonkvengeance
2021-01-03 18:18:29 -07:00
siliconsandGitHub 0581748282 Merge pull request #13942 from YakumoChen/power-sink
#13925 but doesn't underestimate engineering autism
2021-01-03 18:09:38 -07:00
siliconsandGitHub 697619856c Merge pull request #13859 from timothyteakettle/unlockable-loadout-items
unlockable loadout items
2021-01-03 18:07:18 -07:00
LinandGitHub 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
DeltaFireandGitHub a2bb761bee Merge pull request #13924 from SandPoot/master
Allows mass sticking money into your id
2021-01-01 08:15:53 +01:00
siliconsandGitHub fbb2cfbba1 Update colormate.dm 2020-12-31 23:05:14 -07:00
YakumoChenandGitHub 9325daa743 Update powersink.dm 2021-01-01 03:35:54 +00:00
siliconsandGitHub 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
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
siliconsandGitHub 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
DeltaFireandGitHub 46a0c65e46 Merge branch 'master' into debris 2020-12-28 19:04:22 +01:00
DeltaFireandGitHub 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
DeltaFireandGitHub 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
DeltaFireandGitHub 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
siliconsandGitHub 5e269c327a Update space.dm 2020-12-27 10:53:11 -07:00
siliconsandGitHub d4f94724ec Update plushes.dm 2020-12-27 10:51:44 -07:00
siliconsandGitHub 798b1b50f4 Update plushes.dm 2020-12-27 10:38:07 -07:00
silicons 57d85f7e86 okay 2020-12-27 05:20:29 -08:00
raspy-on-osu 2352580b41 init 2020-12-27 05:36:49 -05:00
silicons a42fa987ba ok 2020-12-26 22:43:25 -08:00
silicons 5266ae1437 okay 2020-12-26 22:28:41 -08:00
silicons a6ae0fe5c2 ok 2020-12-26 20:56:48 -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
LinandGitHub 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