shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
28,107 Commits 5 Branches 0 Tags
20948b66bbd0c0b31d2a25140a90240281d6522b
Commit Graph
11600 Commits
Author SHA1 Message Date
GhomandGitHub 516ec585d2 Merge pull request #10435 from Hatterhat/tg-40394 
biogenerator can print flour sacks and enzyme now, also some boxes idk
 2020-01-05 16:22:44 +01:00
GhomandGitHub 5720afb169 Merge pull request #10430 from Citadel-Station-13/VIBE-CHECK 
VIBE CHECK
 2020-01-05 15:51:32 +01:00
GhomandGitHub 8bf75be8ff Yea no, go away zoomer kevinz 2020-01-05 15:38:23 +01:00
GhomandGitHub 4655815c12 Merge pull request #10396 from Hatterhat/revert-8056-tegnerf 
reverts that one TEG nerf that forced it to require an arbitrary burnmix
 2020-01-05 15:36:02 +01:00
GhomandGitHub 0646a8557b Merge pull request #10428 from Putnam3145/bomb_fix 
Made dev bombs kill through bomb armor again
 2020-01-05 15:33:54 +01:00
GhomandGitHub fdff70b702 Merge pull request #10256 from Putnam3145/alcohol-intolerance 
Adds an alcohol intolerance trait (NOT light drinker)
 2020-01-05 15:19:48 +01:00
GhomandGitHub 0e74c94d8c Merge pull request #10278 from Trilbyspaceclone/patch-248 
Fixes Fermi plushie reaction. Removes carbonation of caramel
 2020-01-05 15:17:14 +01:00
GhomandGitHub 2cbf2a2574 Merge pull request #10429 from Trilbyspaceclone/patch-262 
Corrects MASON Rig's missing flags
 2020-01-05 15:09:05 +01:00
TrilbyspacecloneandGitHub 609f120c28 Update hardsuit.dm 2020-01-04 22:29:42 -05:00
Hatterhat c0e010c612 e 2020-01-04 16:44:11 -06:00
GhomandGitHub ca8d93ad17 Merge branch 'master' into alcohol-intolerance 2020-01-04 23:17:55 +01:00
GhomandGitHub 9e257599ab Merge pull request #10413 from nik707/master 
Reduces engraving light power
 2020-01-04 22:30:37 +01:00
Ghommie 356304f68f Fixes roundstart mushpeople not having MUSH PUUUUUUUUUUUUNCH!! 2020-01-04 20:34:31 +01:00
GhomandGitHub a75b8a387e ok 2020-01-04 18:30:37 +01:00
Hatterhat 92f6fe129a tgstation 40394 port 2020-01-04 07:14:39 -06:00
GhomandGitHub 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
kevinz000andGitHub 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
kevinz000andGitHub 0567dcd6df Update godhand.dm 2020-01-03 23:34:37 -08:00
kevinz000andGitHub 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
TrilbyspacecloneandGitHub 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
MrJWhit 44b96f01ea Make radiation collectors move faster 
Words
 2020-01-03 06:04:10 -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
nik707andGitHub 8054b08dc3 reduces light power of soapstone engravings 2020-01-02 23:11:40 -06:00
nik707andGitHub 0f9c3350cd Merge pull request #10189 from Putnam3145/storytellers 
n word
 2020-01-02 22:01:19 -06:00
LinandGitHub f7b91f9b65 Merge pull request #10238 from Ghommie/Ghommie-cit478 
Brings in some mapping code updates.
 2020-01-03 00:01:54 +00:00
LinandGitHub 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
LinandGitHub 4b7e6ec2a5 Merge pull request #10270 from Ghommie/Ghommie-cit489 
randomized recipes fallback fix.
 2020-01-02 23:56:43 +00:00
LinandGitHub 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
kevinz000andGitHub b580d1dc32 Merge pull request #10390 from deathride58/orangespleasestopforcepushing 
[s] removes fun
 2020-01-02 08:56:49 -08: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
kevinz000andGitHub 67d9923ff7 Merge pull request #10371 from kappa-sama/patch-15 
call of duty loot boxes
 2020-01-01 22:08:20 -08:00
kevinz000andGitHub 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
nik707andGitHub 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
HatterhatandGitHub 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