diff --git a/GainStation13/code/datums/diseases/advance/symptoms/berry.dm b/GainStation13/code/datums/diseases/advance/symptoms/berry.dm index 444ccd0b..dbe43e20 100644 --- a/GainStation13/code/datums/diseases/advance/symptoms/berry.dm +++ b/GainStation13/code/datums/diseases/advance/symptoms/berry.dm @@ -91,3 +91,14 @@ /datum/reagent/berry_juice_infection/proc/fat_hide() return (3 * (volume * volume))/50 + + +//extreme variant, for admin or item purposes +/datum/symptom/berry/extreme + name = "Extreme berrification" + stealth = -7 + resistance = 11 + stage_speed = 10 + transmittable = 2 + level = 7 + severity = 5 diff --git a/GainStation13/code/modules/clothing/under/jobs/modcivilian.dm b/GainStation13/code/modules/clothing/under/jobs/modcivilian.dm index 282e9ed8..19a0e1bf 100644 --- a/GainStation13/code/modules/clothing/under/jobs/modcivilian.dm +++ b/GainStation13/code/modules/clothing/under/jobs/modcivilian.dm @@ -151,7 +151,6 @@ name = "grey modular bra" desc = "A tasteful grey bra that reminds you of the good old days. Now adjusts to the match the wearer's size!" icon_location = 'GainStation13/icons/mob/modclothes/graymodular_bra.dmi' - icon = 'GainStation13/icons/mob/modclothes/gray_bra.dmi' icon_state = "grey" - item_state = "defaultsuit" - item_color = "defaultsuit" + item_state = "grey_bra" + item_color = "grey_bra" diff --git a/GainStation13/icons/mob/modclothes/graymodular_bra.dmi b/GainStation13/icons/mob/modclothes/graymodular_bra.dmi index f9f06d62..734c261b 100644 Binary files a/GainStation13/icons/mob/modclothes/graymodular_bra.dmi and b/GainStation13/icons/mob/modclothes/graymodular_bra.dmi differ diff --git a/code/datums/diseases/advance/presets.dm b/code/datums/diseases/advance/presets.dm index db092093..33bc3c55 100644 --- a/code/datums/diseases/advance/presets.dm +++ b/code/datums/diseases/advance/presets.dm @@ -71,3 +71,19 @@ name = "Blueberry virus bottle" desc = "A small bottle. Contains blueberry virus in synthblood medium." spawned_disease = /datum/disease/advance/berry_virus + + +//admin variant of berry virus + +/datum/disease/advance/berry_virus_extreme + copy_type = /datum/disease/advance + +/datum/disease/advance/berry_virus_extreme/New(make_typecache = TRUE) + name = "Blueberry Virus" + symptoms = list(new/datum/symptom/berry/extreme) + ..() + +/obj/item/reagent_containers/glass/bottle/berry_extreme + name = "Blueberry virus bottle" + desc = "A small bottle. Contains blueberry virus in synthblood medium." + spawned_disease = /datum/disease/advance/berry_virus_extreme diff --git a/code/modules/cargo/packs/misc.dm b/code/modules/cargo/packs/misc.dm index b107baaa..7c8e8b1b 100644 --- a/code/modules/cargo/packs/misc.dm +++ b/code/modules/cargo/packs/misc.dm @@ -84,17 +84,17 @@ /obj/item/clothing/shoes/kindleKicks) crate_name = "footie crate" -// /datum/supply_pack/misc/modular_greysuits -// name = "Modular Greysuits Crate" -// desc = "In case of sudden obesity, this stretchable jumpsuit pack can help cover up any exposed bodies!" -// cost = 2000 -// contains = list(/obj/item/clothing/under/color/grey/modular, -// /obj/item/clothing/under/color/grey/modular, -// /obj/item/clothing/under/color/grey/modular, -// /obj/item/clothing/under/color/grey/modular, -// /obj/item/clothing/under/color/grey/modular, -// /obj/item/clothing/under/color/grey/modular) -// crate_name = "modular jumpsuits crate" +/datum/supply_pack/misc/modular_greysuits + name = "Modular Greysuits Crate" + desc = "In case of sudden obesity, this stretchable jumpsuit pack can help cover up any exposed bodies!" + cost = 2000 + contains = list(/obj/item/clothing/under/color/grey/modular, + /obj/item/clothing/under/color/grey/modular, + /obj/item/clothing/under/color/grey/modular, + /obj/item/clothing/under/color/grey/modular, + /obj/item/clothing/under/color/grey/modular, + /obj/item/clothing/under/color/grey/modular) + crate_name = "modular jumpsuits crate" /datum/supply_pack/misc/randombedsheets name = "Bedsheet Crate (R)" diff --git a/icons/mob/uniform.dmi b/icons/mob/uniform.dmi index 787c2e72..afd5f540 100644 Binary files a/icons/mob/uniform.dmi and b/icons/mob/uniform.dmi differ