Commit Graph

18053 Commits

Author SHA1 Message Date
Trilbyspaceclone
94f305656d Update grass_carpet.dm 2019-12-28 22:57:38 -05:00
Putnam
00c7d5a41d WOW THAT'S A BIG NUMBER 2019-12-28 19:40:31 -08:00
Trilbyspaceclone
75a24449c8 Update borghydro.dm 2019-12-28 21:36:21 -05:00
Putnam
dda7c832f1 Fixes a runtime, almost definitely 2019-12-28 18:14:02 -08:00
kevinz000
96d9fed565 Merge pull request #10091 from Ghommie/Ghommie-cit442
Reduces the blue, amber and red alert sounds volume.
2019-12-28 18:08:33 -08:00
kevinz000
429aaaa342 Merge pull request #10318 from Trilbyspaceclone/patch-252
Allows AI/Sillicons to speak slime
2019-12-28 18:07:55 -08:00
Putnam
ed0c91b556 Makes ass slap attempts fail more loudly on opted-out mobs 2019-12-28 16:23:02 -08:00
Arturlang
10538e6da9 Aarggghh small fucking differences 2019-12-29 02:12:22 +02:00
Arturlang
c01852ff5d Whoops 2019-12-29 02:04:00 +02:00
Arturlang
207a72b84c Physiology so species changes dont fuck it up 2019-12-29 01:58:00 +02:00
Ghom
f68d7fa1a3 Merge pull request #10328 from Putnam3145/dynamic-ghost-tweaks
Makes ghost cafe mobs actually a ghost role
2019-12-29 00:08:38 +01:00
Ghommie
f93077e730 F to pay respect. 2019-12-29 00:08:34 +01:00
Ghommie
7837688426 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit490 2019-12-28 23:41:10 +01:00
Ghommie
37441437d1 a 2019-12-28 23:02:28 +01:00
keronshb
390cfd8b64 Nanite ports from /tg/
Ports a couple of the newer nanite features from /tg/
2019-12-28 16:56:17 -05:00
Putnam
7947f06557 Made sure ghost cafe visitors don't get midround antags 2019-12-28 13:56:03 -08:00
Putnam
a0374f82e2 Made a line use the dang macro 2019-12-28 13:55:54 -08:00
Ghom
4fb549631f Don't use named arguments on new, please. 2019-12-28 19:12:10 +01:00
Seris02
897766e781 maybe fixes? 2019-12-29 00:55:13 +08:00
Ghom
2ad4698225 Merge pull request #10217 from Putnam3145/radiation
Nerfing radioactive contamination
2019-12-28 17:21:25 +01:00
Seris02
70744ef171 ah 2019-12-29 00:19:19 +08:00
Seris02
1ff7709765 all of the weh. 2019-12-29 00:12:25 +08:00
Seris02
46f3a70c4b even more weh. 2019-12-29 00:09:30 +08:00
Seris02
c0e8e55d70 more weh. 2019-12-29 00:07:11 +08:00
Ghom
d2c1eb3e47 Merge pull request #10299 from kappa-sama/patch-13
sunflowers are no longer explosive
2019-12-28 17:02:50 +01:00
Ghom
fe78c98f71 Merge pull request #10297 from Hatterhat/tg-45547-luxbar
the one with the luxury bar capsule
2019-12-28 17:00:19 +01:00
Seris02
7bde63dcc4 weh 2019-12-28 23:58:28 +08:00
Arturlang
c4975d88e4 Wait no its actually the other way around. 2019-12-28 15:26:44 +02:00
Arturlang
d2709e86ec What about this? 2019-12-28 15:20:16 +02:00
Seris02
2c26c3bdec does the fix? 2019-12-28 21:11:17 +08:00
Ghom
a7ccd85bdb Merge pull request #10291 from Citadel-Station-13/kevinz000-patch-1
fixes pai holochassis spam
2019-12-28 13:15:42 +01:00
Trilbyspaceclone
3177b5786a Update food_reagents.dm 2019-12-28 05:26:46 -05:00
Seris02
973fdb61c6 probably fixes pandoras attacking their owners 2019-12-28 17:33:19 +08:00
Seris02
cd9966cd7a fixes the thing 2019-12-28 17:08:34 +08:00
Seris02
69d82338bc excludes certain ghost roles from being affected by health events 2019-12-28 16:46:50 +08:00
Seris02
4a2b7c2438 cocooooonuuuuuuts 2019-12-28 16:02:53 +08:00
Putnam
25d4b53f94 wow how'd i leave that in 2019-12-27 22:46:32 -08:00
Putnam
5174cb08a6 Made war ops always allowed on teamwork, chaotic 2019-12-27 22:45:06 -08:00
Trilbyspaceclone
fd476b4f5b Update language_holder.dm 2019-12-28 01:05:51 -05:00
Lin
d562a5ba27 Merge pull request #10212 from Ghommie/Ghommie-cit471
Ports some hud and update_icon code updates.
2019-12-28 04:07:03 +00:00
kevinz000
139d4b4b3a ehh fine but why would you use this proc for that 2019-12-27 18:44:46 -08:00
Lin
80daaacc86 Merge pull request #10268 from Ghommie/Ghommie-cit487
Effectively removes the old unused roboticist encryption key and headset.
2019-12-28 00:08:24 +00:00
Lin
be57c26acc Merge pull request #10289 from Ghommie/Ghommie-cit493
[s] fixes a little door assembly glass dupe exploit
2019-12-28 00:06:25 +00:00
Putnam
78f60df907 Brought the weight up on extended/chaotic 2019-12-27 15:58:17 -08:00
Ghom
93248336ea Merge pull request #10265 from Trilbyspaceclone/map_redo
Cit-iftyed Box map as well as adding back blasters back to armory
2019-12-27 22:54:35 +01:00
Commandersand
1a886adc3d FIXEdD 2019-12-27 13:01:14 -06:00
Commandersand
815e57697d vending 2019-12-27 12:29:39 -06:00
Commandersand
6b6ef569c2 fix 2019-12-27 12:14:46 -06:00
Commandersand
45e6cca8b8 clothing add 2019-12-27 11:53:57 -06:00
Ghommie
21cfb2914b Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit490 2019-12-27 17:49:59 +01:00