Commit Graph

11826 Commits

Author SHA1 Message Date
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
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
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
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
BlackMajor
da3ab71222 Revert "Revert "Revert "Revert "Merge branch 'master' into Yeehaw""""
This reverts commit 74a646490f.
2020-01-02 22:16:09 +13:00
BlackMajor
74a646490f Revert "Revert "Revert "Merge branch 'master' into Yeehaw"""
This reverts commit 189e1af175.
2020-01-02 22:15:40 +13:00
BlackMajor
189e1af175 Revert "Revert "Merge branch 'master' into Yeehaw""
This reverts commit 1b25996e55.
2020-01-02 22:15:36 +13:00
BlackMajor
1b25996e55 Revert "Merge branch 'master' into Yeehaw"
This reverts commit 490fb3ab61, reversing
changes made to aabb39a364.
2020-01-02 22:15:31 +13:00
BlackMajor
490fb3ab61 Merge branch 'master' into Yeehaw 2020-01-02 22:13:52 +13:00
BlackMajor
aabb39a364 Revert "Merge branch 'master' into Yeehaw"
This reverts commit 30e3edaac1, reversing
changes made to 62c8fce043.
2020-01-02 22:06:31 +13:00
BlackMajor
30e3edaac1 Merge branch 'master' into Yeehaw 2020-01-02 22:03:58 +13:00
BlackMajor
3239acf74d Sync 2020-01-02 22:02:55 +13:00
kevinz000
67d9923ff7 Merge pull request #10371 from kappa-sama/patch-15
call of duty loot boxes
2020-01-01 22:08:20 -08:00
kevinz000
16172f68aa Merge pull request #10366 from Hatterhat/beaker-buff
beaker buff - alt title fuck hypovials and fuck making them free and better alternatives to beakers
2020-01-01 22:07:40 -08:00
nik707
a881231149 Merge pull request #10395 from Hatterhat/shit-and-cum
space cola isnt a reagent idiot, codeside change only
2020-01-01 20:45:33 -06:00
Hatterhat
5b99524e82 Revert "Makes the efficiency of the TEG be dependant on how much gas is actively combusting in the hot pipe" 2020-01-01 20:44:48 -06:00
Hatterhat
1195762f86 space cola isnt a reagent idiot 2020-01-01 20:37:09 -06:00
nik707
1e6a485976 Merge pull request #10368 from Hatterhat/orm-laser-fix-question-mark
ORM lasers actually affect point return
2020-01-01 20:32:48 -06:00
nik707
75d5e324ec Merge pull request #10379 from Hatterhat/tg-47443-shotgunpbs
shotgun pointblanking people actually throws them
2020-01-01 20:32:16 -06:00
nik707
e232b13119 Merge pull request #10369 from Hatterhat/patch-4
crusher trophy drop chance increase
2020-01-01 20:28:35 -06:00
deathride58
8390334d1e mirrors tgstation 48524 2020-01-01 18:59:05 -05:00
CameronWoof
9a54467064 Robots can now view the crew manifest 2020-01-01 14:38:46 -08:00
Ghommie
37ce6e9336 honk 2020-01-01 20:47:36 +01:00
Hatterhat
200de62b8e tweaks transfer amounts, uncucks hypovials 2020-01-01 08:50:15 -06:00