Commit Graph

1242 Commits

Author SHA1 Message Date
kevinz000 e210f7d535 Merge pull request #11391 from Ghommie/Ghommie-cit612
Porting "Further update_icon splitup"
2020-03-10 05:58:17 -07:00
kevinz000 bfb75eb26b Merge pull request #11396 from Ghommie/Ghommie-cit613
Ports "Switches out the three billion args of electrocute act for flags"
2020-03-10 05:56:28 -07:00
Ghommie ee1eea8874 Ports "Switches out the three billion args of electrocute act for flags" 2020-03-09 04:01:23 +01:00
Ghommie 59b1a223a3 Ok, done. 2020-03-08 22:51:36 +01:00
keronshb 228012c718 Blob refactor (#43872)
Ports over Blob Refactor from TG
2020-03-06 15:58:17 -05:00
kevinz000 6354b48659 fix 2020-03-03 20:58:06 -07:00
Ghom 0b5481f9b9 Merge pull request #11237 from kevinz000/reagent_logging_3
reagent logging pr attempt 3 but it works
2020-03-03 21:27:17 +01:00
kevinz000 1e99cd0bfe Merge remote-tracking branch 'citadel/master' into mobility_flags 2020-03-03 03:08:41 -07:00
Ghom 9375113426 Merge pull request #11041 from Arturlang/kills_blood_tomatoe_succ
Bloodsucker external blood gain rebalancing
2020-03-02 16:36:22 +01:00
Arturlang 97c5aa1e24 Maintainer suggestions
Co-Authored-By: Ghom <42542238+Ghommie@users.noreply.github.com>
2020-03-01 16:48:49 +02:00
Ghom 295cd2991d Merge pull request #11227 from Putnam3145/salbut-jitter
Gave jittering to salbutamol
2020-02-29 20:42:03 +01:00
Artur b536c061fb Reviewer suggestion and co 2020-02-26 16:26:57 +02:00
kevinz000 bbcc9cf4e5 never ever webeditor 2020-02-24 15:15:21 -07:00
kevinz000 672da86c51 NEVERWEBEDITORGUYS 2020-02-24 15:08:08 -07:00
kevinz000 526471510f Merge remote-tracking branch 'citadel/kevinz000-patch-17-1' into kevinz000-patch-17 2020-02-24 15:03:02 -07:00
kevinz000 306b711ab1 Update reagents.dm 2020-02-24 14:30:50 -07:00
kevinz000 2b3e8a64f7 Update holder.dm 2020-02-24 14:23:44 -07:00
Putnam feaadffd93 Gave jittering to salbutamol. 2020-02-24 11:23:51 -08:00
kevinz000 a784a74ccb Merge remote-tracking branch 'citadel/master' into mobility_flags 2020-02-21 13:35:26 -07:00
kevinz000 ca777c6c8b Merge pull request #11153 from Ghommie/Ghommie-cit587
Fixing addiction moodlets not going away and secret sauce recipe paper.
2020-02-20 06:17:33 -07:00
kevinz000 c7273c03be Merge remote-tracking branch 'citadel/master' into mobility_flags 2020-02-19 19:12:27 -07:00
kevinz000 8567346501 Merge pull request #10953 from Ghommie/Ghommie-cit564
The awesome adventures of the missing spurdo line replacement file.
2020-02-19 19:00:53 -07:00
kevinz000 b983aa75ea Merge pull request #11145 from Ghommie/Ghommie-cit586
Something about pAIs and silicon access priviledges.
2020-02-19 18:59:10 -07:00
Ghommie 37ba75ec12 Fixing addiction moodlets not going away and secret sauce recipe paper. 2020-02-19 14:07:11 +01:00
Artur d635af0caa Conflict Fix 2020-02-19 13:11:33 +02:00
Artur 87d55c5be6 Reworks it 2020-02-19 13:09:09 +02:00
kevinz000 0e4692c63d Merge remote-tracking branch 'citadel/master' into mobility_flags 2020-02-18 18:16:34 -07:00
Ghommie 698f0b8177 Something about pAIs and silicon access priviledges. 2020-02-18 16:20:44 +01:00
kevinz000 d04126226b Merge pull request #11082 from Hatterhat/preservahyde
preservahyde, alt title "what if i didnt die from having shit rng and a single epipen"
2020-02-18 02:21:37 -07:00
kevinz000 c1df5d5313 Merge pull request #11111 from Ghommie/Ghommie-cit582
Virology support for synthetic blood and some blood subtypes removal.
2020-02-18 02:18:03 -07:00
Unknown 3286f43d90 Didnt know I could make it a subtype 2020-02-16 11:17:54 -05:00
Unknown 313f544aee Make it require some heating 2020-02-16 08:34:08 -05:00
Unknown 38f32d28b7 Mixable Synthblood 2020-02-16 08:06:22 -05:00
Unknown f4734e44f0 o ye this should be something else 2020-02-16 07:52:34 -05:00
Unknown f0b3021f5d I miss my powergame 2020-02-16 07:41:26 -05:00
Ghommie 1d9982d00a Virology support for synthetic blood and some blood subtypes removal. 2020-02-16 10:36:16 +01:00
kevinz000 7ee04aa608 Merge pull request #10998 from Ghommie/Ghommie-cit569
Something about the in operator and spaceDMM version update.
2020-02-15 12:17:37 -07:00
Artur f16be3a93f Peak Shitcode. 2020-02-14 22:04:55 +02:00
Ghommie 4a621fb1aa Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit560 2020-02-14 19:39:53 +01:00
Ghom 2f417ef95a Merge pull request #11042 from Arturlang/pandemic_nerfs
Nerfs the pandemics production.
2020-02-14 08:04:16 +01:00
Hatterhat c8d0cacf51 bad recipe 2020-02-13 21:08:38 -06:00
Hatterhat 1276453dc4 initial commit - preservahyde 2020-02-13 21:01:28 -06:00
Artur 7964d768fa Initial Commit 2020-02-13 20:51:52 +02:00
Artur be30ca1642 Tweaks the blood type and volume, plus hopefully fixes the lag exploit. 2020-02-13 15:48:37 +02:00
Winter Flare ac55d1d25d Merge branch 'master' into tinytweaks-2-9-20 2020-02-13 03:34:44 -05:00
Winter Flare f32affdb1c Made Mugs Colorful 2020-02-13 03:26:35 -05:00
kevinz000 eca0e0f2dc Merge remote-tracking branch 'citadel/master' into mobility_flags 2020-02-13 00:39:20 -07:00
kevinz000 c790478a3d Merge pull request #11012 from keronshb/RatvarDrink
Introduces the Ratvarian mixed drink, the CogChamp!
2020-02-12 23:58:14 -07:00
Artur 2bd8499b94 We shallnt want mass production. 2020-02-12 14:28:35 +02:00
Artur 0fdcfc8660 Works now. 2020-02-12 14:02:09 +02:00