From 087f9d7e0aac9c500724bf1a9d1ff45164158f09 Mon Sep 17 00:00:00 2001 From: boodaliboo <40642354+boodaliboo@users.noreply.github.com> Date: Fri, 22 May 2020 17:18:53 -0700 Subject: [PATCH 1/8] Update other_reagents.dm --- code/modules/reagents/chemistry/reagents/other_reagents.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/reagents/chemistry/reagents/other_reagents.dm b/code/modules/reagents/chemistry/reagents/other_reagents.dm index 708357194546..c0f7d92464c6 100644 --- a/code/modules/reagents/chemistry/reagents/other_reagents.dm +++ b/code/modules/reagents/chemistry/reagents/other_reagents.dm @@ -1081,7 +1081,7 @@ if(method==PATCH || method==INGEST || method==INJECT || (method == VAPOR && prob(min(reac_volume,100)*(1 - touch_protection)))) L.ForceContractDisease(new /datum/disease/tuberculosis(), FALSE, TRUE) -/* YOGS /datum/reagent/snail +/datum/reagent/snail name = "Agent-S" description = "Virological agent that infects the subject with Gastrolosis." color = "#003300" // rgb(0, 51, 0) From fe716bdca8b0f53215da245a20a88cafcfa95d59 Mon Sep 17 00:00:00 2001 From: boodaliboo <40642354+boodaliboo@users.noreply.github.com> Date: Fri, 22 May 2020 17:21:37 -0700 Subject: [PATCH 2/8] Update dna.dm --- code/datums/dna.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/datums/dna.dm b/code/datums/dna.dm index 0d5802401bc4..1bdbbfbc420a 100644 --- a/code/datums/dna.dm +++ b/code/datums/dna.dm @@ -611,9 +611,9 @@ O.forceMove(drop_location()) if(prob(20)) O.animate_atom_living() - /* YOGSif(9 to 10) + if(9 to 10) ForceContractDisease(new/datum/disease/gastrolosis()) - to_chat(src, "Oh, I actually feel quite alright!") YOGS*/ + to_chat(src, "Oh, I actually feel quite alright!") else switch(rand(0,5)) if(0) From c81dbc73a9027cb5095e66b25dbd192d32475a4e Mon Sep 17 00:00:00 2001 From: boodaliboo <40642354+boodaliboo@users.noreply.github.com> Date: Fri, 22 May 2020 17:22:21 -0700 Subject: [PATCH 3/8] Update yogstation.dme --- yogstation.dme | 2 ++ 1 file changed, 2 insertions(+) diff --git a/yogstation.dme b/yogstation.dme index 7416a4f19a77..ce6193c154a1 100644 --- a/yogstation.dme +++ b/yogstation.dme @@ -460,6 +460,7 @@ #include "code\datums\diseases\fake_gbs.dm" #include "code\datums\diseases\flu.dm" #include "code\datums\diseases\fluspanish.dm" +#include "code\datums\diseases\gastrolisis.dm" #include "code\datums\diseases\gbs.dm" #include "code\datums\diseases\heart_failure.dm" #include "code\datums\diseases\magnitis.dm" @@ -2111,6 +2112,7 @@ #include "code\modules\mob\living\carbon\human\species_types\plasmamen.dm" #include "code\modules\mob\living\carbon\human\species_types\shadowpeople.dm" #include "code\modules\mob\living\carbon\human\species_types\skeletons.dm" +#include "code\modules\mob\living\carbon\human\species_types\snail.dm" #include "code\modules\mob\living\carbon\human\species_types\synths.dm" #include "code\modules\mob\living\carbon\human\species_types\vampire.dm" #include "code\modules\mob\living\carbon\human\species_types\zombies.dm" From ffdf1e8e32d4b06445166f520c50f9d6c4aa3d7e Mon Sep 17 00:00:00 2001 From: boodaliboo <40642354+boodaliboo@users.noreply.github.com> Date: Fri, 22 May 2020 17:25:53 -0700 Subject: [PATCH 4/8] Update other_reagents.dm --- code/modules/reagents/chemistry/reagents/other_reagents.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/reagents/chemistry/reagents/other_reagents.dm b/code/modules/reagents/chemistry/reagents/other_reagents.dm index c0f7d92464c6..7d1bc96e6098 100644 --- a/code/modules/reagents/chemistry/reagents/other_reagents.dm +++ b/code/modules/reagents/chemistry/reagents/other_reagents.dm @@ -1090,7 +1090,7 @@ /datum/reagent/snail/reaction_mob(mob/living/L, method=TOUCH, reac_volume, show_message = 1, touch_protection = 0) if(method==PATCH || method==INGEST || method==INJECT || (method == VAPOR && prob(min(reac_volume,100)*(1 - touch_protection)))) - L.ForceContractDisease(new /datum/disease/gastrolosis(), FALSE, TRUE) YOGS */ + L.ForceContractDisease(new /datum/disease/gastrolosis(), FALSE, TRUE) /datum/reagent/fluorosurfactant//foam precursor name = "Fluorosurfactant" From 19c7c3d87ca1053e93a9bb3a9054ab650c7be182 Mon Sep 17 00:00:00 2001 From: boodaliboo <40642354+boodaliboo@users.noreply.github.com> Date: Fri, 22 May 2020 17:34:07 -0700 Subject: [PATCH 5/8] Update snail.dm --- code/modules/mob/living/carbon/human/species_types/snail.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/modules/mob/living/carbon/human/species_types/snail.dm b/code/modules/mob/living/carbon/human/species_types/snail.dm index d2e14898c929..bb571e19443e 100644 --- a/code/modules/mob/living/carbon/human/species_types/snail.dm +++ b/code/modules/mob/living/carbon/human/species_types/snail.dm @@ -14,7 +14,7 @@ siemens_coeff = 2 //snails are mostly water changesource_flags = MIRROR_BADMIN | WABBAJACK | MIRROR_MAGIC | MIRROR_PRIDE | RACE_SWAP sexes = FALSE //snails are hermaphrodites - var/shell_type = /obj/item/storage/backpack/snail + var/shell_type = /obj/item/storage/backpack/snail/species mutanteyes = /obj/item/organ/eyes/snail mutanttongue = /obj/item/organ/tongue/snail @@ -46,7 +46,7 @@ C.doUnEquip(bag, TRUE, no_move = TRUE) qdel(bag) -/obj/item/storage/backpack/snail +/obj/item/storage/backpack/snail/species name = "snail shell" desc = "Worn by snails as armor and storage compartment." icon_state = "snailshell" From aedc40921e4ecb162222e96438677eca7d6b83a0 Mon Sep 17 00:00:00 2001 From: boodaliboo <40642354+boodaliboo@users.noreply.github.com> Date: Fri, 22 May 2020 17:34:18 -0700 Subject: [PATCH 6/8] Update snail.dm --- code/modules/mob/living/carbon/human/species_types/snail.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/mob/living/carbon/human/species_types/snail.dm b/code/modules/mob/living/carbon/human/species_types/snail.dm index bb571e19443e..72a58f6e6cd4 100644 --- a/code/modules/mob/living/carbon/human/species_types/snail.dm +++ b/code/modules/mob/living/carbon/human/species_types/snail.dm @@ -58,5 +58,5 @@ resistance_flags = FIRE_PROOF | ACID_PROOF /obj/item/storage/backpack/snail/Initialize() - . = ..() + . = .() ADD_TRAIT(src, TRAIT_NODROP) From 643b8e8ec7a79bf6c4c10bc1556621c4211f676f Mon Sep 17 00:00:00 2001 From: boodaliboo <40642354+boodaliboo@users.noreply.github.com> Date: Fri, 22 May 2020 17:56:42 -0700 Subject: [PATCH 7/8] Update code/modules/mob/living/carbon/human/species_types/snail.dm Co-authored-by: Hopekz --- code/modules/mob/living/carbon/human/species_types/snail.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/mob/living/carbon/human/species_types/snail.dm b/code/modules/mob/living/carbon/human/species_types/snail.dm index 72a58f6e6cd4..bb571e19443e 100644 --- a/code/modules/mob/living/carbon/human/species_types/snail.dm +++ b/code/modules/mob/living/carbon/human/species_types/snail.dm @@ -58,5 +58,5 @@ resistance_flags = FIRE_PROOF | ACID_PROOF /obj/item/storage/backpack/snail/Initialize() - . = .() + . = ..() ADD_TRAIT(src, TRAIT_NODROP) From be8e03069f14242eec59f168bbd6eb834f31c86b Mon Sep 17 00:00:00 2001 From: boodaliboo <40642354+boodaliboo@users.noreply.github.com> Date: Fri, 22 May 2020 19:09:35 -0700 Subject: [PATCH 8/8] Update snail.dm --- code/modules/mob/living/carbon/human/species_types/snail.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/mob/living/carbon/human/species_types/snail.dm b/code/modules/mob/living/carbon/human/species_types/snail.dm index bb571e19443e..10da903b3ec3 100644 --- a/code/modules/mob/living/carbon/human/species_types/snail.dm +++ b/code/modules/mob/living/carbon/human/species_types/snail.dm @@ -59,4 +59,4 @@ /obj/item/storage/backpack/snail/Initialize() . = ..() - ADD_TRAIT(src, TRAIT_NODROP) + ADD_TRAIT(src, TRAIT_NODROP, CURSED_ITEM_TRAIT)