Commit Graph

24553 Commits

Author SHA1 Message Date
Putnam e243752369 Removed tossing from pressure diff (for now) 2020-05-12 16:10:20 -07:00
Detective Google 948081fdce outdoor lights, rad protection 2020-05-12 17:13:23 -05:00
Putnam 25b2a856bf updated tank default release pressure for C++mos 2020-05-12 15:10:15 -07:00
Putnam 885a09111f Enables monstermos (this is gonna suck) 2020-05-12 15:07:20 -07:00
Putnam 8458f97692 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into putnamos-for-real 2020-05-12 13:34:31 -07:00
kevinz000 ffc7211444 Update _wires.dm (#12199) 2020-05-12 22:02:40 +02:00
kevinz000 81424914e6 Merge pull request #12215 from Trilbyspaceclone/patch-377
Adds more ballmer lines
2020-05-12 12:35:05 -07:00
kevinz000 5364666d0c Merge pull request #12212 from Trilbyspaceclone/patch-376
Buffs and corrects organ storage box
2020-05-12 12:34:45 -07:00
kevinz000 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
kevinz000 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
kevinz000 395d434e6e Merge pull request #12200 from Ghommie/Ghommie-cit738
nutrition adjustment wrapper procs from tg.
2020-05-12 12:28:02 -07:00
kevinz000 40d2d35ffa Merge pull request #12205 from Ghommie/Ghommie-cit741
A few runtimes, fixed.
2020-05-12 12:27:45 -07:00
kevinz000 afbbde610a Merge pull request #12201 from Ghommie/Ghommie-cit740
Purging unused dogborg items.
2020-05-12 12:27:26 -07:00
Trilbyspaceclone 11f3d19edf brute force 2020-05-12 15:02:37 -04:00
Ghommie 757706653d Map paths. 2020-05-12 21:01:34 +02:00
Trilbyspaceclone c5c11a7937 i hope we use PENDAS 2020-05-12 14:53:06 -04:00
kevinz000 1f773cf4fe fixes 2020-05-12 11:52:45 -07:00
Trilbyspaceclone 72fbd8ec87 6 rather the 4 miss-keyed 2020-05-12 14:27:32 -04:00
Trilbyspaceclone 88394151d8 Update research.dm 2020-05-12 14:22:05 -04: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
kevinz000 90d4f213bf Update preferences.dm (#12230) 2020-05-12 17:39:37 +02:00
kevinz000 8952eb3e96 WOOPS 2020-05-12 07:45:00 -07:00
kevinz000 ea35e297c2 fixes 2020-05-12 07:38:52 -07:00
kevinz000 c473280099 Update subsystems.dm 2020-05-12 07:04:00 -07:00
kevinz000 bcf60089b0 Update projectiles.dm 2020-05-12 07:03:06 -07:00
The0bserver e9a432d438 Initial Commit: Hey Drake? Where's the cell for electroplating? 2020-05-12 04:07:26 -04:00
MrJWhit bc148ad39f Space diner location 2020-05-12 01:52:47 -04:00
Putnam baaee906a2 fixin' a multiz segfault 2020-05-11 22:01:20 -07:00
Putnam 17826fe98b monstermos wow 2020-05-11 22:00:04 -07:00
Detective Google bfde367c4e Merge remote-tracking branch 'upstream/master' into snaxi2 2020-05-11 20:56:42 -05:00
Putnam c859cfee6b Bad merge, ouchies 2020-05-11 17:36:26 -07:00
Putnam 478400979d Added a fallback, just in case (may not work?) 2020-05-11 17:13:47 -07:00
Putnam f4f80594bd Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into putnamos-for-real 2020-05-11 17:10:55 -07:00
Putnam 121d594faa Fixes 2020-05-11 17:09:35 -07:00
Putnam e8d7da56f4 Ported C++mos from yogs (help me) 2020-05-11 15:44:26 -07:00
Ghom bd19763236 Update lighting.dm 2020-05-12 00:18:27 +02:00
Trilbyspaceclone 95330e4baf Update life.dm 2020-05-11 17:17:04 -04:00
Trilbyspaceclone c14197bd1b Update life.dm 2020-05-11 17:16:10 -04:00
Trilbyspaceclone 0df3483d6f Update life.dm 2020-05-11 17:15:29 -04:00
Trilbyspaceclone 8fa1a0ba58 Update life.dm 2020-05-11 15:48:01 -04:00
Trilbyspaceclone 720abbf1c5 Update life.dm 2020-05-11 15:21:49 -04:00
Trilbyspaceclone 1e5cce73d9 Update life.dm 2020-05-11 15:19:39 -04:00
Ghommie dfae071015 Final adjustments. 2020-05-11 19:05:58 +02:00
Trilbyspaceclone db87da599c Update firstaid.dm 2020-05-11 08:41:03 -04:00
Trilbyspaceclone 3c87647fd2 Update firstaid.dm 2020-05-11 08:32:36 -04:00
kevinz000 dbfa8ac1ea Merge branch 'master' into typing_indicators 2020-05-11 05:00:23 -07:00
kappa-sama 78004a7b73 kek (#12208) 2020-05-11 13:57:42 +02:00
kevinz000 0ed3b17d28 Merge pull request #12179 from Putnam3145/fix-atmos
Brings back the gas archive
2020-05-11 04:19:50 -07:00
kevinz000 657a4831b4 Merge pull request #12182 from kappa-sama/patch-25
you can now mass produce electrochromatic kits
2020-05-11 04:18:48 -07:00
kevinz000 f1ba2ae8e4 Merge pull request #12196 from Citadel-Station-13/Ghommie-patch-1
bumps up savefile version cause horns/wings
2020-05-11 04:18:29 -07:00