Commit Graph
33931 Commits
Author SHA1 Message Date
Detective Google c4ca8db4de showers + insuls 2020-05-14 00:42:32 -05:00
Detective Google dc49df0a4d clean up 2020-05-13 15:03:41 -05:00
Detective Google 234ed8da8e service lathe go brr 2020-05-13 14:33:29 -05:00
Detective Google f5754a55ea armory cams 2020-05-13 03:15:41 -05:00
Detective Google c613376e47 try 2 at nerfing these barricades 2020-05-13 03:10:38 -05:00
Detective Google e79b1312eb gps for lower mining 2020-05-13 03:06:46 -05:00
Detective Google 676af007fe fan 2020-05-13 02:28:45 -05:00
Detective Google 75ae4f5aa6 more directional doors for medbay 2020-05-13 01:35:50 -05:00
Detective Google c0843d46d9 tiny fans galore 2020-05-13 01:02:52 -05:00
Detective Google e2ddfcf77b Merge remote-tracking branch 'upstream/master' into snaxi2 2020-05-13 00:56:25 -05:00
871361936c Replaces mosins in russian crates with 10mm surplus rifles (#12176)
* Update security.dm

* Update armory.dm

* desc

Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com>
2020-05-13 05:35:01 +02:00
Detective Google 4378a34ea7 Merge remote-tracking branch 'upstream/master' into snaxi2 2020-05-12 21:34:04 -05:00
Detective Google 70094fb1cf empty commit to reroll bots 2020-05-12 21:33:53 -05:00
kevinz000andGitHub 4aca1e8f62 Update medicine_reagents.dm (#12233) 2020-05-13 04:20:05 +02:00
LinandGitHub fd30edca9c infinixeno (#12234) 2020-05-13 03:18:25 +02:00
kevinz000andGitHub 5a905b2f02 Fixes boxstation (#12236)
* revert

* ok
2020-05-13 03:15:17 +02:00
Detective Google 6e5e1b249f Merge remote-tracking branch 'upstream/master' into snaxi2 2020-05-12 18:38:28 -05:00
Detective Google 4f75358ab3 maint bar barricades no longer take 50 years to break 2020-05-12 17:17:12 -05:00
Detective Google 948081fdce outdoor lights, rad protection 2020-05-12 17:13:23 -05:00
kevinz000andGitHub ffc7211444 Update _wires.dm (#12199) 2020-05-12 22:02:40 +02:00
kevinz000andGitHub 81424914e6 Merge pull request #12215 from Trilbyspaceclone/patch-377
Adds more ballmer lines
2020-05-12 12:35:05 -07:00
kevinz000andGitHub 5364666d0c Merge pull request #12212 from Trilbyspaceclone/patch-376
Buffs and corrects organ storage box
2020-05-12 12:34:45 -07:00
kevinz000andGitHub e0f1b65785 Merge pull request #12209 from MrJWhit/moving-fire-alarm-in-boxstation-chemistry
Moves fire alarm in box station in the chem department
2020-05-12 12:28:41 -07:00
kevinz000andGitHub 6ddd0ffa77 Merge pull request #12207 from Ghommie/Ghommie-cit743
Fixed several item action buttons not using their own states
2020-05-12 12:28:24 -07:00
kevinz000andGitHub ff2158b20b Merge pull request #12206 from Ghommie/Ghommie-cit742
Porting tg's icon for that plant-speak language.
2020-05-12 12:28:08 -07:00
kevinz000andGitHub 395d434e6e Merge pull request #12200 from Ghommie/Ghommie-cit738
nutrition adjustment wrapper procs from tg.
2020-05-12 12:28:02 -07:00
kevinz000andGitHub 40d2d35ffa Merge pull request #12205 from Ghommie/Ghommie-cit741
A few runtimes, fixed.
2020-05-12 12:27:45 -07:00
kevinz000andGitHub afbbde610a Merge pull request #12201 from Ghommie/Ghommie-cit740
Purging unused dogborg items.
2020-05-12 12:27:26 -07:00
kevinz000andGitHub cd46bce126 Merge pull request #11890 from Ghommie/Ghommie-cit685
Porting Goofconomy & co.
2020-05-12 12:25:12 -07:00
Ghommie 84af9d9d40 wtf 2020-05-12 21:12:17 +02:00
Ghommie 757706653d Map paths. 2020-05-12 21:01:34 +02:00
Ghommie 7fb96ab0cf Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit685 2020-05-12 20:06:59 +02:00
ArturlangandGitHub 0b03958136 Makes The syndi outpust tanks work (#12228) 2020-05-12 18:31:33 +02:00
kevinz000andGitHub 90d4f213bf Update preferences.dm (#12230) 2020-05-12 17:39:37 +02:00
Detective Google 2edfcada4c adds a medlathe 2020-05-12 05:03:41 -05:00
Detective Google 10cd4320a7 gaytway 2020-05-12 04:40:18 -05:00
Detective Google ad1a03d679 chem unfuckery 2020-05-12 02:04:12 -05:00
Detective Google 8f06ae3c56 Q-pads and disposals tune ups 2020-05-11 22:53:32 -05:00
Detective Google dc931490fd disposals needs a recycler 2020-05-11 21:38:49 -05:00
Detective Google 88f87a444d spare out of locker 2020-05-11 21:09:29 -05:00
Detective Google bcd30a9838 more requested fans 2020-05-11 21:06:20 -05:00
Detective Google 7cb79695c5 first round of testing fixes 2020-05-11 21:04:46 -05:00
Detective Google bfde367c4e Merge remote-tracking branch 'upstream/master' into snaxi2 2020-05-11 20:56:42 -05:00
TrilbyspacecloneandGitHub 95330e4baf Update life.dm 2020-05-11 17:17:04 -04:00
TrilbyspacecloneandGitHub c14197bd1b Update life.dm 2020-05-11 17:16:10 -04:00
TrilbyspacecloneandGitHub 0df3483d6f Update life.dm 2020-05-11 17:15:29 -04:00
TrilbyspacecloneandGitHub 8fa1a0ba58 Update life.dm 2020-05-11 15:48:01 -04:00
TrilbyspacecloneandGitHub 720abbf1c5 Update life.dm 2020-05-11 15:21:49 -04:00
TrilbyspacecloneandGitHub 1e5cce73d9 Update life.dm 2020-05-11 15:19:39 -04:00
TrilbyspacecloneandGitHub db87da599c Update firstaid.dm 2020-05-11 08:41:03 -04:00