Commit Graph

1559 Commits

Author SHA1 Message Date
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
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
5144e45ba9 it works now :D 2020-02-24 15:32:46 -07: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
5ad51758e0 fix 2020-02-24 15:04:25 -07:00
kevinz000
388a804add Merge remote-tracking branch 'citadel/kevinz000-patch-15' into kevinz000-patch-17 2020-02-24 15:03:20 -07:00
kevinz000
c739091285 Merge remote-tracking branch 'citadel/kevinz000-patch-11' into kevinz000-patch-17 2020-02-24 15:03:05 -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
kevinz000
5cece42c1a Update glass.dm 2020-02-24 14:20:40 -07:00
kevinz000
23aa38a381 Update reagent_containers.dm 2020-02-24 14:17:48 -07:00
kevinz000
c6a0418946 Update reagent_containers.dm 2020-02-24 14:10:53 -07:00
kevinz000
3709992b46 Update reagent_containers.dm 2020-02-24 14:07:58 -07:00
kevinz000
77edc602dc Update glass.dm 2020-02-24 13:59:27 -07:00
kevinz000
d4657df9f5 Update glass.dm 2020-02-24 13:58:51 -07:00
kevinz000
1668bc598a Update glass.dm 2020-02-24 13:55:44 -07:00
Putnam
feaadffd93 Gave jittering to salbutamol. 2020-02-24 11:23:51 -08:00
Ghommie
8fbfd07692 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit229 2020-02-22 00:55:32 +01: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
Artur
35aecac620 Disgust mood for bloodsuckers being disgusted, and blood bag inneficency 2020-02-20 12:50:25 +02:00
Ghom
f94f997cc2 Merge pull request #11080 from kevinz000/surubatons
hey someone gave me this idea for stunbatons (and I sort of expanded it) and it's worth a test
2020-02-20 11:09:46 +01:00
kevinz000
49279086b7 Merge pull request #11113 from CameronWoof/biogeneratin'
Adds diethylamine and saltpetre to the biogenerator
2020-02-19 19:03:35 -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
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
Cameron!
a9f103fb34 removes unused bottle, kicks travis? 2020-02-17 15:28:10 -08: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
CameronWoof
14e41e8d68 adds diethylamine and saltpetre to the biogenerator 2020-02-16 03:52:07 -08: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
kevinz000
e8ccf4b6d7 fix 2020-02-13 16:25:43 -07:00