shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #9656 from Ghommie/Ghommie-cit290

Browse Source 
Purging a lot of space indention in favor of tabs.
This commit is contained in:
kevinz000
2019-11-14 15:55:04 -07:00
committed by GitHub
parent d128be6c38 e977ba6729
commit 2f4562a63b
103 changed files with 1407 additions and 1405 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/reagents/chemistry/reagents/food_reagents.dm
+6 -6
View File
@@ -608,12 +608,12 @@
..()
/datum/reagent/consumable/honey/reaction_mob(mob/living/M, method=TOUCH, reac_volume)
if(iscarbon(M) && (method in list(TOUCH, VAPOR, PATCH)))
var/mob/living/carbon/C = M
for(var/s in C.surgeries)
var/datum/surgery/S = s
S.success_multiplier = max(0.6, S.success_multiplier) // +60% success probability on each step, compared to bacchus' blessing's ~46%
..()
if(iscarbon(M) && (method in list(TOUCH, VAPOR, PATCH)))
var/mob/living/carbon/C = M
for(var/s in C.surgeries)
var/datum/surgery/S = s
S.success_multiplier = max(0.6, S.success_multiplier) // +60% success probability on each step, compared to bacchus' blessing's ~46%
..()
/datum/reagent/consumable/mayonnaise
name = "Mayonnaise"
code/modules/reagents/chemistry/reagents/impure_reagents.dm
+1 -1
View File
@@ -3,7 +3,7 @@
//Invert = Whole conversion
/datum/reagent/impure
chemical_flags = REAGENT_INVISIBLE | REAGENT_SNEAKYNAME //by default, it will stay hidden on splitting, but take the name of the source on inverting
chemical_flags = REAGENT_INVISIBLE | REAGENT_SNEAKYNAME //by default, it will stay hidden on splitting, but take the name of the source on inverting
/datum/reagent/impure/fermiTox
code/modules/reagents/chemistry/reagents/medicine_reagents.dm
+11 -11
View File
@@ -1192,19 +1192,19 @@ datum/reagent/medicine/styptic_powder/overdose_start(mob/living/M)
pH = 11.8
/datum/reagent/medicine/neo_jelly/on_mob_life(mob/living/carbon/M)
M.adjustBruteLoss(-1.5*REM, 0)
M.adjustFireLoss(-1.5*REM, 0)
M.adjustOxyLoss(-1.5*REM, 0)
M.adjustToxLoss(-1.5*REM, 0, TRUE) //heals TOXINLOVERs
. = 1
..()
M.adjustBruteLoss(-1.5*REM, 0)
M.adjustFireLoss(-1.5*REM, 0)
M.adjustOxyLoss(-1.5*REM, 0)
M.adjustToxLoss(-1.5*REM, 0, TRUE) //heals TOXINLOVERs
. = 1
..()
/datum/reagent/medicine/neo_jelly/overdose_process(mob/living/M)
M.adjustOxyLoss(2.6*REM, 0)
M.adjustBruteLoss(3.5*REM, 0)
M.adjustFireLoss(3.5*REM, 0)
..()
. = 1
M.adjustOxyLoss(2.6*REM, 0)
M.adjustBruteLoss(3.5*REM, 0)
M.adjustFireLoss(3.5*REM, 0)
..()
. = 1
/datum/reagent/medicine/earthsblood //Created by ambrosia gaia plants
name = "Earthsblood"