shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
29,604 Commits 5 Branches 0 Tags
5e1cbd717455cbfda14dbc284e85e5bbc7a8ca7b
Commit Graph

12349 Commits

Author SHA1 Message Date
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
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
Seris02 46da6604a4 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into stunglasses 2020-01-01 19:28:56 +08:00
kevinz000 68bc6dcc2a Update megafauna.dm 2020-01-01 02:43:43 -08:00
Hatterhat 0374870c41 bulldogs knockback too 2020-01-01 02:04:03 -06:00
kevinz000 094d225874 Merge remote-tracking branch 'citadel/master' into michael_labs 2019-12-31 19:54:01 -08:00
Hatterhat 318a6812c3 manually copied tgstation#47443 2019-12-31 21:38:11 -06:00
kevinz000 ec67a38093 Merge pull request #10330 from keronshb/keronnanite 
More nanites from /tg/station
 2019-12-31 19:32:05 -08:00
kevinz000 c222ea0bb3 Merge pull request #10356 from deathride58/sprintprefs 
Adds space to sprint and toggle sprint as preferences
 2019-12-31 19:29:47 -08:00
r4d6 be62bbc96d Lowering price and change description 2019-12-31 18:17:07 -05:00
Lin b651bbcdb3 Merge branch 'master' into Ghommie-cit367 2019-12-31 22:37:59 +00:00
r4d6 7b83ee7d8b Update the description. 2019-12-31 13:35:30 -05:00
r4d6 81a39aa324 Add the space radsuit and the crate 2019-12-31 13:25:09 -05:00