Commit Graph

1253 Commits

Author SHA1 Message Date
TrilbySpaceClone
17f6304acf hm 2019-09-11 06:54:50 -04:00
Poojawa
6353bd1064 Cult heals do bleed stopping
blood cap raised because honestly there's so much bleed_rate heal available now too
2019-09-11 04:37:22 -05:00
kevinz000
ff0c3ee844 Merge pull request #9147 from Code-Cygnet/The-Art-of-Drunken-Captaining
The art of drunken captaining
2019-09-10 22:06:36 -07:00
Trilbyspaceclone
a751a73113 Apply suggestions from code review
thx Ceb

Co-Authored-By: cebutris <cebutris2000@gmail.com>
2019-09-10 18:52:49 -04:00
Fermi
6da9f1c64c Indent 2019-09-10 21:51:35 +01:00
Thalpy
ce5095321c Merge branch 'master' into FERMICHEMCurTweaks 2019-09-10 20:52:31 +01:00
kevinz000
829a2615c5 Merge pull request #9247 from Thalpy/QuantFix
Partially fixes tiny runaway decimals in reagents.
2019-09-10 10:27:40 -07:00
Trilbyspaceclone
275457001d It didnt save my last change 2019-09-08 21:52:28 -04:00
TrilbySpaceClone
0e12a4f8d1 and swing! 2019-09-08 21:39:32 -04:00
Fermi
816ae638a2 [TO_TEST] 2019-09-05 23:19:53 +01:00
Fermi
29e5c1c10a Still some residual chems kicking about..!! 2019-09-05 23:15:30 +01:00
Trilbyspaceclone
dbdaae83b6 Update medicine_reagents.dm 2019-09-04 13:29:58 -04:00
Fermi
7890ad08d5 what is this 2019-09-03 20:30:21 +01:00
Fermi
a605d2a776 Todo: finish new words and review langauge 2019-09-03 20:16:41 +01:00
TrilbySpaceClone
fd585aa6ea Merge branch 'master' into more_cooking2 2019-09-03 11:22:38 -04:00
Trilbyspaceclone
c616c0e288 Update food_reagents.dm 2019-09-02 20:00:38 -04:00
TrilbySpaceClone
36695d556f Lets have all the ammo and kegs together 2019-08-31 15:38:26 -04:00
Poojawa
b2252a1c74 Medical assistance treats bleed_rate to stop phantom bleeding 2019-08-30 02:46:57 -05:00
Poojawa
dae3e91293 MIGHT HELP IF SYNTHETICS EXISTED, WHOOPS 2019-08-30 00:07:06 -05:00
TrilbySpaceClone
ea7235d089 Merge branch 'master' into fruit 2019-08-29 21:15:18 -04:00
TrilbySpaceClone
d3852ebd56 even more 2019-08-29 19:39:10 -04:00
Fermi
c1d9e3f03b Failing is frustrating 2019-08-29 00:37:18 +01:00
Fermi
5b144ef1c6 Removed unused var 2019-08-29 00:13:24 +01:00
Fermi
124d8503dc Tests and fixes. 2019-08-29 00:12:16 +01:00
Ghommie
24fe7126c4 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit28 2019-08-24 19:05:51 +02:00
Poojawa
d60ba0a207 Fixes missing DNA info for slimes, resolves virology issues 2019-08-24 04:14:47 -05:00
Poojawa
32c7a7c3ee Virology's broken as fuck, damnifino why 2019-08-21 03:36:40 -05:00
Poojawa
23333f6ea5 reverts the majority of clean act because it doesn't work properly otherwise 2019-08-20 23:03:31 -05:00
Poojawa
bda3ac8745 blood dna is fixed, your ERP code is too 2019-08-20 07:41:50 -05:00
Code-Cygnet
167b18d045 Update code/modules/reagents/chemistry/reagents/alcohol_reagents.dm
Error spotted at 2138 and fixed by Sishen, aka Papa Pax!

Co-Authored-By: Sishen1542 <sishen1542@gmail.com>
2019-08-19 15:28:51 -04:00
TrilbySpaceClone
6c6391b4c4 Merge branch 'master' into fruit 2019-08-19 07:37:12 -04:00
Trilbyspaceclone
cce33ec7e5 Update drink_reagents.dm 2019-08-19 07:17:57 -04:00
Poojawa
cede93299e REEEEEEEEEEEEEEEEEEEEEEEEEEEEEEE 2019-08-19 04:48:37 -05:00
Code-Cygnet
5840284e9e Update alcohol_reagents.dm
Edited a typo at line 2144.
2019-08-18 22:14:41 -04:00
Code-Cygnet
975a33aad7 Update alcohol_reagents.dm
Adds commander and chief, starting at line 2125 and ending at 2146.. hopefully.
2019-08-17 19:38:58 -04:00
Trilbyspaceclone
bcf65dc901 Update drink_reagents.dm 2019-08-17 00:58:02 -04:00
Trilbyspaceclone
3851739533 Update other_reagents.dm 2019-08-17 00:06:58 -04:00
Trilbyspaceclone
c81fd8fcd4 Update drink_reagents.dm 2019-08-17 00:02:22 -04:00
Trilbyspaceclone
5225665516 kev fix 2019-08-16 23:48:41 -04:00
Poojawa
264cbf8108 reverts the add_blood back to add_blood_DNA 2019-08-15 12:49:10 -05:00
Poojawa
0290a46ddc Impliments Ghom review, reverts blood list back to component 2019-08-15 12:32:44 -05:00
Poojawa
2073921f4b Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods 2019-08-15 08:39:41 -05:00
Trilbyspaceclone
0056e3eb61 Update other_reagents.dm 2019-08-13 11:49:00 -04:00
Trilbyspaceclone
3224e6ca4a ..() 2019-08-13 11:46:52 -04:00
Fermi
0f4469e59f Re-enables fermiexplosions in grenades. 2019-08-12 01:03:35 +01:00
Fermi
51a6ae96a0 R.data 2019-08-12 00:37:57 +01:00
Fermi
c0bbb099f8 Fixes disappearing chems. 2019-08-12 00:36:45 +01:00
TrilbySpaceClone
821463f59c Nya 2019-08-11 11:47:56 -04:00
Poojawa
dcd682bd59 Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods 2019-08-10 23:48:47 -05:00
Fermi
251ac24e02 [NEED TO TEST] {Preview} Fixes Neurotoxin and adjusts it's reaction. 2019-08-11 00:35:36 +01:00