Commit Graph

13933 Commits

Author SHA1 Message Date
Ghom
ca8d93ad17 Merge branch 'master' into alcohol-intolerance 2020-01-04 23:17:55 +01:00
Ghom
9e257599ab Merge pull request #10413 from nik707/master
Reduces engraving light power
2020-01-04 22:30:37 +01:00
kevinz000
b4736febcf uhh 2020-01-04 13:02:23 -08:00
Ghommie
356304f68f Fixes roundstart mushpeople not having MUSH PUUUUUUUUUUUUNCH!! 2020-01-04 20:34:31 +01:00
Ghom
a75b8a387e ok 2020-01-04 18:30:37 +01:00
Hatterhat
92f6fe129a tgstation 40394 port 2020-01-04 07:14:39 -06:00
Ghom
499907f9b7 Merge pull request #10191 from Citadel-Station-13/michael_labs
Custom Holoforms for pAIs and AIs oh and adds certain cyborg pai holograms. also mild pai nerf.
2020-01-04 14:07:25 +01:00
Ghommie
686a76dd1d Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit265 2020-01-04 13:35:05 +01:00
kevinz000
a930464f57 Update extra_drone_types.dm 2020-01-04 00:54:06 -08:00
Hatterhat
97242050ec bad idea 2020-01-04 02:16:55 -06:00
Hatterhat
7c98656939 upstream merge 2020-01-04 01:48:50 -06:00
kevinz000
0567dcd6df Update godhand.dm 2020-01-03 23:34:37 -08:00
kevinz000
a4fa24ac15 Update touch_attacks.dm 2020-01-03 23:33:39 -08:00
Hatterhat
186194418e tg 43454+43688 port, tweaks w/ trilby, db crate 2020-01-04 01:33:32 -06:00
Trilbyspaceclone
94fb114611 Update hardsuit.dm 2020-01-04 02:11:23 -05:00
Putnam
b1b1d7171e hard crit actually 2020-01-03 23:07:34 -08:00
Putnam
e54ec9ec09 shh 2020-01-03 23:03:45 -08:00
Hatterhat
e65583c403 set_AFTFT verb, tweaking shit 2020-01-04 00:44:01 -06:00
r4d6
8b760f5f3a Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into radsuit 2020-01-03 21:01:31 -05:00
Ghommie
f5b251db66 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit490 2020-01-03 18:24:39 +01:00
MrJWhit
44b96f01ea Make radiation collectors move faster
Words
2020-01-03 06:04:10 -05:00
Seris02
519d379cdf Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into atmosfirelock 2020-01-03 17:42:53 +08:00
r4d6
221cb980d6 forgot a / 2020-01-03 03:25:53 -05:00
r4d6
880db10033 Forgot some more mats 2020-01-03 03:22:18 -05:00
r4d6
aedf634355 Fix mats. 2020-01-03 03:15:30 -05:00
r4d6
94cd2ea108 Merge branch 'RCD-Updates' of https://github.com/r4d6/Citadel-Station-13 into RCD-Updates 2020-01-03 03:13:21 -05:00
r4d6
3f5d4ad835 remove a duplicate comment 2020-01-03 03:13:03 -05:00
r4d6
7347cb0ba6 Merge branch 'master' into RCD-Updates 2020-01-03 03:09:11 -05:00
kevinz000
38c4060bfc compile 2020-01-03 00:04:58 -08:00
kevinz000
aac1b42b8f nightshift improvements 2020-01-03 00:01:48 -08:00
kevinz000
8e1affa1f5 nightshift changes 2020-01-02 23:56:40 -08:00
r4d6
58a986696f Add RCD and RPD to Engie's protolathe
Half-port with bonus : https://github.com/tgstation/tgstation/pull/47289
2020-01-03 02:46:25 -05:00
r4d6
5c94e02eac Add simple RCD Circuits
Port : https://github.com/tgstation/tgstation/pull/45357
2020-01-03 02:32:43 -05:00
Putnam
adf87c7595 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into dojo-ghostrole 2020-01-02 22:52:24 -08:00
CameronWoof
0c70fc9234 The Great Citadel De-Pissening of 2020 2020-01-02 21:24:03 -08:00
nik707
8054b08dc3 reduces light power of soapstone engravings 2020-01-02 23:11:40 -06:00
nik707
0f9c3350cd Merge pull request #10189 from Putnam3145/storytellers
n word
2020-01-02 22:01:19 -06:00
Trilbyspaceclone
2931cb6757 Merge branch 'master' into glassware 2020-01-02 20:30:20 -05:00
Lin
f7b91f9b65 Merge pull request #10238 from Ghommie/Ghommie-cit478
Brings in some mapping code updates.
2020-01-03 00:01:54 +00:00
Lin
b1ccd512db Merge pull request #10215 from Ghommie/Ghommie-cit473
Ports "Fixes ChangeTurf CHANGETURF_INHERIT_AIR flag and add it to all calls."
2020-01-03 00:00:51 +00:00
Lin
4b7e6ec2a5 Merge pull request #10270 from Ghommie/Ghommie-cit489
randomized recipes fallback fix.
2020-01-02 23:56:43 +00:00
Lin
5d667a3540 Merge pull request #10388 from CameronWoof/ez-valids
Adds the "View Crew Manifest" verb to Robots
2020-01-02 23:54:14 +00:00
CameronWoof
7e7a11a5c8 lizard tails for humans and anthromorphs 2020-01-02 13:07:05 -08:00
kevinz000
b793bceffc A 2020-01-02 10:51:06 -08:00
kevinz000
b580d1dc32 Merge pull request #10390 from deathride58/orangespleasestopforcepushing
[s] removes fun
2020-01-02 08:56:49 -08:00
Ghommie
4d06d231f8 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit490 2020-01-02 17:49:01 +01:00
Unknown
0b02439b08 Puts an end to the Christmas Menace 2020-01-02 03:53:04 -07:00
BlackMajor
dd68be6d31 IM NOT TRYING TO EDIT CARBON.DM GITHUB, PLEASE. 2020-01-02 22:20:54 +13:00
BlackMajor
8e5b7c1cba Get outta here 2020-01-02 22:17:56 +13:00
BlackMajor
08d042901c thank you github 2020-01-02 22:16:47 +13:00