From a0aa7016f7cad5c8b052c0fd049956770ccf31de Mon Sep 17 00:00:00 2001 From: MarcellusPye <29051928+MarcellusPye@users.noreply.github.com> Date: Sat, 20 Jan 2018 09:04:32 +1300 Subject: [PATCH 1/5] Initial pass --- code/modules/reagents/chemistry/reagents/toxins.dm | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/code/modules/reagents/chemistry/reagents/toxins.dm b/code/modules/reagents/chemistry/reagents/toxins.dm index 72014dd1021..099aa045163 100644 --- a/code/modules/reagents/chemistry/reagents/toxins.dm +++ b/code/modules/reagents/chemistry/reagents/toxins.dm @@ -222,6 +222,12 @@ taste_message = "ACID" /datum/reagent/sacid/on_mob_life(mob/living/M) + + if(ishuman(M)) + var/mob/living/carbon/human/H = M + if(H.get_species() == "Grey") + return ..() + M.adjustFireLoss(1) ..() From ae1f4afe1640e8d1c2afa246f01b54f1897a4f0d Mon Sep 17 00:00:00 2001 From: MarcellusPye <29051928+MarcellusPye@users.noreply.github.com> Date: Sat, 20 Jan 2018 14:03:46 +1300 Subject: [PATCH 2/5] Hurray for proper form --- code/modules/mob/living/carbon/human/species/station.dm | 6 ++++++ code/modules/reagents/chemistry/reagents/toxins.dm | 6 ------ 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/code/modules/mob/living/carbon/human/species/station.dm b/code/modules/mob/living/carbon/human/species/station.dm index b895ed0fdd4..d1cac92356f 100644 --- a/code/modules/mob/living/carbon/human/species/station.dm +++ b/code/modules/mob/living/carbon/human/species/station.dm @@ -744,6 +744,12 @@ if(speech_pref) H.mind.speech_span = "wingdings" +/datum/species/grey/handle_reagents(mob/living/carbon/human/H, datum/reagent/R) + if (R.id == "sacid") + H.reagents.del_reagent(R.id) + return 0 + return 1 + /datum/species/diona name = "Diona" name_plural = "Dionaea" diff --git a/code/modules/reagents/chemistry/reagents/toxins.dm b/code/modules/reagents/chemistry/reagents/toxins.dm index 099aa045163..72014dd1021 100644 --- a/code/modules/reagents/chemistry/reagents/toxins.dm +++ b/code/modules/reagents/chemistry/reagents/toxins.dm @@ -222,12 +222,6 @@ taste_message = "ACID" /datum/reagent/sacid/on_mob_life(mob/living/M) - - if(ishuman(M)) - var/mob/living/carbon/human/H = M - if(H.get_species() == "Grey") - return ..() - M.adjustFireLoss(1) ..() From 4a963b796de8c14e02079847b4beef75c9aedc82 Mon Sep 17 00:00:00 2001 From: MarcellusPye <29051928+MarcellusPye@users.noreply.github.com> Date: Thu, 25 Jan 2018 18:42:56 +1300 Subject: [PATCH 3/5] Kills spaces dead --- code/modules/mob/living/carbon/human/species/station.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/mob/living/carbon/human/species/station.dm b/code/modules/mob/living/carbon/human/species/station.dm index d1cac92356f..30ac39de44a 100644 --- a/code/modules/mob/living/carbon/human/species/station.dm +++ b/code/modules/mob/living/carbon/human/species/station.dm @@ -745,7 +745,7 @@ H.mind.speech_span = "wingdings" /datum/species/grey/handle_reagents(mob/living/carbon/human/H, datum/reagent/R) - if (R.id == "sacid") + if(R.id == "sacid") H.reagents.del_reagent(R.id) return 0 return 1 From 8235d8ec898bcf158537056d7421bfa9cae21943 Mon Sep 17 00:00:00 2001 From: MarcellusPye <29051928+MarcellusPye@users.noreply.github.com> Date: Tue, 20 Feb 2018 19:38:55 +1300 Subject: [PATCH 4/5] Calls parent --- code/modules/mob/living/carbon/human/species/species.dm | 1 + code/modules/mob/living/carbon/human/species/station.dm | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/code/modules/mob/living/carbon/human/species/species.dm b/code/modules/mob/living/carbon/human/species/species.dm index b7834d873f1..ee3ddf92c0e 100644 --- a/code/modules/mob/living/carbon/human/species/species.dm +++ b/code/modules/mob/living/carbon/human/species/species.dm @@ -287,6 +287,7 @@ // Do species-specific reagent handling here // Return 1 if it should do normal processing too +// (It's better form to return ..() when processing normally if you're using it as a child proc) - Marcellus // Return 0 if it shouldn't deplete and do its normal effect // Other return values will cause weird badness /datum/species/proc/handle_reagents(mob/living/carbon/human/H, datum/reagent/R) diff --git a/code/modules/mob/living/carbon/human/species/station.dm b/code/modules/mob/living/carbon/human/species/station.dm index 30ac39de44a..5ae71adf6e1 100644 --- a/code/modules/mob/living/carbon/human/species/station.dm +++ b/code/modules/mob/living/carbon/human/species/station.dm @@ -748,7 +748,7 @@ if(R.id == "sacid") H.reagents.del_reagent(R.id) return 0 - return 1 + return ..() /datum/species/diona name = "Diona" From a426b93a7a4a3984ed43c0cacf0021b4178c12bf Mon Sep 17 00:00:00 2001 From: MarcellusPye <29051928+MarcellusPye@users.noreply.github.com> Date: Tue, 20 Feb 2018 19:45:57 +1300 Subject: [PATCH 5/5] Maintainer corrected comments --- code/modules/mob/living/carbon/human/species/species.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/mob/living/carbon/human/species/species.dm b/code/modules/mob/living/carbon/human/species/species.dm index ee3ddf92c0e..d8c80c8b3fe 100644 --- a/code/modules/mob/living/carbon/human/species/species.dm +++ b/code/modules/mob/living/carbon/human/species/species.dm @@ -287,7 +287,7 @@ // Do species-specific reagent handling here // Return 1 if it should do normal processing too -// (It's better form to return ..() when processing normally if you're using it as a child proc) - Marcellus +// Return the parent value if processing does not explicitly stop // Return 0 if it shouldn't deplete and do its normal effect // Other return values will cause weird badness /datum/species/proc/handle_reagents(mob/living/carbon/human/H, datum/reagent/R)