diff --git a/code/datums/diseases/advance/presets.dm b/code/datums/diseases/advance/presets.dm index 48c76256..db092093 100644 --- a/code/datums/diseases/advance/presets.dm +++ b/code/datums/diseases/advance/presets.dm @@ -41,3 +41,33 @@ name = "Sample #[rand(1,10000)]" ..() + + +// Weight gain - GS13 +/datum/disease/advance/weight_gain + copy_type = /datum/disease/advance + +/datum/disease/advance/weight_gain/New(make_typecache = TRUE) + name = "Weight Gain" + symptoms = list(new/datum/symptom/weight_gain) + ..() + +/obj/item/reagent_containers/glass/bottle/weight_gain + name = "Weight gain virus bottle" + desc = "A small bottle. Contains weight gain virus in synthblood medium." + spawned_disease = /datum/disease/advance/weight_gain + + +// Berry virus - GS13 +/datum/disease/advance/berry_virus + copy_type = /datum/disease/advance + +/datum/disease/advance/berry_virus/New(make_typecache = TRUE) + name = "Blueberry Virus" + symptoms = list(new/datum/symptom/berry) + ..() + +/obj/item/reagent_containers/glass/bottle/berry + name = "Blueberry virus bottle" + desc = "A small bottle. Contains blueberry virus in synthblood medium." + spawned_disease = /datum/disease/advance/berry_virus diff --git a/code/modules/antagonists/disease/disease_abilities.dm b/code/modules/antagonists/disease/disease_abilities.dm index 5df6af2a..80b5aafd 100644 --- a/code/modules/antagonists/disease/disease_abilities.dm +++ b/code/modules/antagonists/disease/disease_abilities.dm @@ -434,6 +434,11 @@ GLOBAL_LIST_INIT(disease_ability_singletons, list( short_desc = "Cause victims to gain weight." long_desc = "Cause victims to gain weight. Boosts stage speed, but weakens all other stats." +/datum/disease_ability/symptom/medium/heal/berry // GS13 + symptoms = list(/datum/symptom/berry) + short_desc = "Cause victims to start filling up with blueberry juice." + long_desc = "Cause victims to fill up with blueberry juice." + /datum/disease_ability/symptom/medium/robotic_adaptation // GS13 symptoms = list(/datum/symptom/robotic_adaptation) short_desc = "Allows to infect robotic races." diff --git a/code/modules/events/disease_outbreak.dm b/code/modules/events/disease_outbreak.dm index 58693097..7abe9b18 100644 --- a/code/modules/events/disease_outbreak.dm +++ b/code/modules/events/disease_outbreak.dm @@ -28,7 +28,7 @@ advanced_virus = TRUE if(!virus_type && !advanced_virus) - virus_type = pick(/datum/disease/dnaspread, /datum/disease/advance/flu, /datum/disease/advance/cold, /datum/disease/brainrot, /datum/disease/magnitis) + virus_type = pick(/datum/disease/dnaspread, /datum/disease/advance/flu, /datum/disease/advance/cold, /datum/disease/magnitis) for(var/mob/living/carbon/human/H in shuffle(GLOB.alive_mob_list)) var/turf/T = get_turf(H) diff --git a/modular_citadel/code/modules/mob/dead/new_player/sprite_accessories.dm b/modular_citadel/code/modules/mob/dead/new_player/sprite_accessories.dm index cc0a6d24..a8c7049b 100644 --- a/modular_citadel/code/modules/mob/dead/new_player/sprite_accessories.dm +++ b/modular_citadel/code/modules/mob/dead/new_player/sprite_accessories.dm @@ -1912,7 +1912,6 @@ datum/sprite_accessory/mam_tails/insect /datum/sprite_accessory/taur/fatdrake //ported from Vorestation name = "Fat Drake" icon_state = "fatdrake" - color_src = MUTCOLORS /datum/sprite_accessory/taur/fatwolf //ported from Vorestation name = "Fat Wolf" icon_state = "fatwolf" diff --git a/modular_citadel/icons/mob/mam_taur.dmi b/modular_citadel/icons/mob/mam_taur.dmi index b2880470..730ea31f 100644 Binary files a/modular_citadel/icons/mob/mam_taur.dmi and b/modular_citadel/icons/mob/mam_taur.dmi differ