diff --git a/_maps/map_files/OmegaStation/OmegaStation.dmm b/_maps/map_files/OmegaStation/OmegaStation.dmm index 5178dbdc8e..43cfcbebd0 100644 --- a/_maps/map_files/OmegaStation/OmegaStation.dmm +++ b/_maps/map_files/OmegaStation/OmegaStation.dmm @@ -7464,6 +7464,9 @@ /obj/item/rcl/pre_loaded, /obj/item/clothing/glasses/meson/gar, /obj/machinery/atmospherics/pipe/simple/orange/visible, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 4 + }, /turf/open/floor/plasteel/dark, /area/command/heads_quarters/ce) "anL" = ( @@ -7495,7 +7498,6 @@ /turf/open/floor/plasteel, /area/command/teleporter) "anO" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /obj/effect/turf_decal/stripes/line{ dir = 8 }, @@ -7504,6 +7506,9 @@ dir = 1 }, /obj/effect/turf_decal/tile/yellow, +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ + dir = 4 + }, /turf/open/floor/plasteel, /area/command/heads_quarters/ce) "anP" = ( @@ -34094,15 +34099,18 @@ /turf/open/floor/circuit/green/telecomms, /area/tcommsat/server) "buK" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on{ - dir = 1 - }, /obj/effect/turf_decal/stripes/line{ dir = 4 }, /obj/effect/turf_decal/stripes/line{ dir = 8 }, +/obj/machinery/atmospherics/components/unary/vent_pump/on{ + dir = 1; + external_pressure_bound = 140; + name = "server vent"; + pressure_checks = 0 + }, /turf/open/floor/plasteel/dark/telecomms, /area/tcommsat/server) "buL" = ( @@ -35931,6 +35939,20 @@ /obj/machinery/atmospherics/miner/carbon_dioxide, /turf/open/floor/engine/co2, /area/engineering/atmos) +"hPC" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/machinery/atmospherics/components/unary/vent_pump/siphon/on{ + dir = 1; + external_pressure_bound = 120; + name = "server vent" + }, +/turf/open/floor/plasteel/dark/telecomms, +/area/tcommsat/server) "hQH" = ( /obj/structure/sign/warning/vacuum, /turf/closed/wall, @@ -37882,6 +37904,9 @@ /turf/open/floor/plasteel, /area/hallway/primary/fore) "qdY" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on{ + dir = 4 + }, /turf/open/floor/plasteel, /area/engineering/gravity_generator) "qeO" = ( @@ -37933,6 +37958,9 @@ /turf/open/floor/plasteel, /area/engineering/atmos) "qpG" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 4 + }, /turf/open/floor/plasteel/dark, /area/engineering/gravity_generator) "qsc" = ( @@ -70305,7 +70333,7 @@ aAg akN cpn alI -aGe +bwY aGe sIu aJj @@ -71091,7 +71119,7 @@ sJP aPG buG buI -buK +hPC sKj buR aMJ diff --git a/code/datums/diseases/transformation.dm b/code/datums/diseases/transformation.dm index 8dca59ea94..ac8e9e93c6 100644 --- a/code/datums/diseases/transformation.dm +++ b/code/datums/diseases/transformation.dm @@ -217,8 +217,8 @@ /datum/disease/transformation/slime name = "Advanced Mutation Transformation" - cure_text = "frost oil" - cures = list(/datum/reagent/consumable/frostoil) + cure_text = "Frost Oil or Mutadone." + cures = list(/datum/reagent/consumable/frostoil, /datum/reagent/medicine/mutadone) cure_chance = 80 agent = "Advanced Mutation Toxin" desc = "This highly concentrated extract converts anything into more of itself." @@ -230,19 +230,15 @@ stage4 = list("You are turning into a slime.") stage5 = list("You have become a slime.") new_form = /mob/living/simple_animal/slime/random + needs_all_cures = FALSE /datum/disease/transformation/slime/stage_act() ..() - switch(stage) - if(1) - if(ishuman(affected_mob) && affected_mob.dna) - if(affected_mob.dna.species.id == SPECIES_SLIME_LUMI || affected_mob.dna.species.id == SPECIES_STARGAZER || affected_mob.dna.species.id == SPECIES_SLIME_LUMI) - stage = 5 - if(3) - if(ishuman(affected_mob)) - var/mob/living/carbon/human/human = affected_mob - if(human.dna.species.id != SPECIES_SLIME_LUMI && affected_mob.dna.species.id != SPECIES_STARGAZER && affected_mob.dna.species.id != SPECIES_SLIME_LUMI) - human.set_species(/datum/species/jelly/slime) + if(stage == 3) + if(ishuman(affected_mob)) + var/mob/living/carbon/human/human = affected_mob + if(!isjellyperson(human)) + human.set_species(/datum/species/jelly/slime) /datum/disease/transformation/corgi name = "The Barkening" diff --git a/code/modules/mob/living/carbon/human/innate_abilities/customization.dm b/code/modules/mob/living/carbon/human/innate_abilities/customization.dm index 463cdfde1e..583577840f 100644 --- a/code/modules/mob/living/carbon/human/innate_abilities/customization.dm +++ b/code/modules/mob/living/carbon/human/innate_abilities/customization.dm @@ -22,7 +22,7 @@ /datum/action/innate/ability/humanoid_customization/proc/change_form() var/mob/living/carbon/human/H = owner - var/select_alteration = input(owner, "Select what part of your form to alter", "Form Alteration", "cancel") in list("Body Color","Hair Style", "Genitals", "Tail", "Snout", "Markings", "Ears", "Taur body", "Penis", "Vagina", "Penis Length", "Breast Size", "Breast Shape", "Cancel") + var/select_alteration = input(owner, "Select what part of your form to alter", "Form Alteration", "cancel") in list("Body Color", "Eye Color","Hair Style", "Genitals", "Tail", "Snout", "Markings", "Ears", "Taur body", "Penis", "Vagina", "Penis Length", "Breast Size", "Breast Shape", "Cancel") if(select_alteration == "Body Color") var/new_color = input(owner, "Choose your skin color:", "Race change","#"+H.dna.features["mcolor"]) as color|null @@ -34,6 +34,27 @@ H.update_hair() else to_chat(H, "Invalid color. Your color is not bright enough.") + else if(select_alteration == "Eye Color") + if(iscultist(H) && HAS_TRAIT(H, TRAIT_CULT_EYES)) + to_chat(H, "\"I do not need you to hide yourself anymore, relish my gift.\"") + return + + var/heterochromia = input(owner, "Do you want to have heterochromia?", "Confirm Multicolors") in list("Yes", "No") + if(heterochromia == "Yes") + var/new_color1 = input(owner, "Choose your left eye color:", "Eye Color Change","#"+H.dna?.features["left_eye_color"]) as color|null + if(new_color1) + H.left_eye_color = sanitize_hexcolor(new_color1, 6) + var/new_color2 = input(owner, "Choose your right eye color:", "Eye Color Change","#"+H.dna?.features["right_eye_color"]) as color|null + if(new_color2) + H.right_eye_color = sanitize_hexcolor(new_color2, 6) + else + var/new_eyes = input(owner, "Choose your eye color:", "Character Preference","#"+H.dna?.features["left_eye_color"]) as color|null + if(new_eyes) + H.left_eye_color = sanitize_hexcolor(new_eyes, 6) + H.right_eye_color = sanitize_hexcolor(new_eyes, 6) + H.dna?.update_ui_block(DNA_LEFT_EYE_COLOR_BLOCK) + H.dna?.update_ui_block(DNA_RIGHT_EYE_COLOR_BLOCK) + H.update_body() else if(select_alteration == "Hair Style") if(H.gender == MALE) var/new_style = input(owner, "Select a facial hair style", "Hair Alterations") as null|anything in GLOB.facial_hair_styles_list diff --git a/html/changelogs/AutoChangeLog-pr-15438.yml b/html/changelogs/AutoChangeLog-pr-15438.yml new file mode 100644 index 0000000000..4c27410d90 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-15438.yml @@ -0,0 +1,4 @@ +author: "LiteralMushroom" +delete-after: True +changes: + - rscadd: "Slimes can now change their eye color." diff --git a/html/changelogs/AutoChangeLog-pr-15497.yml b/html/changelogs/AutoChangeLog-pr-15497.yml new file mode 100644 index 0000000000..6c9b6b78c0 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-15497.yml @@ -0,0 +1,4 @@ +author: "BlueWildrose" +delete-after: True +changes: + - balance: "Xenobiology's Advanced Mutation Toxin has another cure now, which is Mutadone. In addition, it no longer instantly transforms slime subspecies upon contraction." diff --git a/html/changelogs/AutoChangeLog-pr-15566.yml b/html/changelogs/AutoChangeLog-pr-15566.yml deleted file mode 100644 index aef907d505..0000000000 --- a/html/changelogs/AutoChangeLog-pr-15566.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "bunny232" -delete-after: True -changes: - - bugfix: "A wire outside meta station customs has been fixed." diff --git a/html/changelogs/AutoChangeLog-pr-15568.yml b/html/changelogs/AutoChangeLog-pr-15568.yml new file mode 100644 index 0000000000..db784afa9f --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-15568.yml @@ -0,0 +1,5 @@ +author: "TripleShades" +delete-after: True +changes: + - rscadd: "[Omega] Gravity Generator room scrubber +tweak: [Omega] tcomms vents are now passive"