From e4b12d6c99dd666d954a65ca165572b90b5bc225 Mon Sep 17 00:00:00 2001 From: Shoddd <148718717+Shoddd@users.noreply.github.com> Date: Tue, 25 Mar 2025 19:24:16 -0400 Subject: [PATCH 1/6] depot --- _maps/RandomRuins/SpaceRuins/syndicate_depot.dmm | 1 - 1 file changed, 1 deletion(-) diff --git a/_maps/RandomRuins/SpaceRuins/syndicate_depot.dmm b/_maps/RandomRuins/SpaceRuins/syndicate_depot.dmm index 2f158282cf9e..e99d3ea927be 100644 --- a/_maps/RandomRuins/SpaceRuins/syndicate_depot.dmm +++ b/_maps/RandomRuins/SpaceRuins/syndicate_depot.dmm @@ -1607,7 +1607,6 @@ /obj/effect/mapping_helpers/apc/cell_10k, /obj/structure/safe, /obj/item/stack/telecrystal/five, -/obj/item/stack/telecrystal/twenty, /obj/effect/mapping_helpers/apc/cut_AI_wire, /obj/item/card/id/advanced/chameleon, /obj/item/card/id/advanced/chameleon, From cd60980b77eecb3507f57d783df46110fdf516f6 Mon Sep 17 00:00:00 2001 From: Shoddd <148718717+Shoddd@users.noreply.github.com> Date: Sat, 12 Apr 2025 15:21:35 -0400 Subject: [PATCH 2/6] mandrake --- .../events/space_vines/vine_mutations.dm | 29 +++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/code/modules/events/space_vines/vine_mutations.dm b/code/modules/events/space_vines/vine_mutations.dm index 24145b61e697..412ed5a76cee 100644 --- a/code/modules/events/space_vines/vine_mutations.dm +++ b/code/modules/events/space_vines/vine_mutations.dm @@ -353,3 +353,32 @@ /datum/spacevine_mutation/flowering/on_cross(obj/structure/spacevine/holder, mob/living/crosser) if(prob(25)) holder.entangle(crosser) + +// MONKESTATION ADDITIONS + +/datum/spacevine_mutation/screaming + name = "Screaming" + hue = "#6b6b6b" + quality = NEGATIVE + severity = SEVERITY_AVERAGE // not that bad (on its own) + +/datum/spacevine_mutation/screaming/on_hit(obj/structure/spacevine/holder, mob/hitter, obj/item/item, expected_damage) + var/scream = pick( + 'sound/voice/human/malescream_1.ogg', + 'sound/voice/human/femalescream_1.ogg', + 'sound/voice/lizard/lizard_scream_2.ogg', + ) + playsound(holder, scream, 90, TRUE, frequency = 1.5) + var/mob/living/victim = hitter + + if(iscarbon(victim)) + var/list/reflist = list(1) + SEND_SIGNAL(victim, COMSIG_CARBON_SOUNDBANG, reflist) + var/intensity = reflist[1] + var/ear_safety = victim.get_ear_protection() + var/effect_amount = intensity - ear_safety + if(effect_amount > 0) + victim.soundbang_act(1, 0, 4, 15) + victim.adjust_confusion(7 SECONDS) + to_chat(victim, span_danger("The vines let out a terrible screech, disorienting you.")) + return expected_damage From 0c546b0b95054d5917200b92ace871d2aad4903c Mon Sep 17 00:00:00 2001 From: Shoddd <148718717+Shoddd@users.noreply.github.com> Date: Sat, 12 Apr 2025 15:23:26 -0400 Subject: [PATCH 3/6] oop --- code/modules/events/space_vines/vine_mutations.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/events/space_vines/vine_mutations.dm b/code/modules/events/space_vines/vine_mutations.dm index 412ed5a76cee..886bf82cfc98 100644 --- a/code/modules/events/space_vines/vine_mutations.dm +++ b/code/modules/events/space_vines/vine_mutations.dm @@ -379,6 +379,6 @@ var/effect_amount = intensity - ear_safety if(effect_amount > 0) victim.soundbang_act(1, 0, 4, 15) - victim.adjust_confusion(7 SECONDS) + victim.adjust_confusion(5 SECONDS) to_chat(victim, span_danger("The vines let out a terrible screech, disorienting you.")) return expected_damage From a9f2ed05d0a7763a7967e4e081e2d55446d64245 Mon Sep 17 00:00:00 2001 From: Shoddd <148718717+Shoddd@users.noreply.github.com> Date: Sat, 12 Apr 2025 15:37:30 -0400 Subject: [PATCH 4/6] weeping --- code/modules/events/space_vines/vine_mutations.dm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/code/modules/events/space_vines/vine_mutations.dm b/code/modules/events/space_vines/vine_mutations.dm index 886bf82cfc98..c156fa3ca59d 100644 --- a/code/modules/events/space_vines/vine_mutations.dm +++ b/code/modules/events/space_vines/vine_mutations.dm @@ -356,13 +356,13 @@ // MONKESTATION ADDITIONS -/datum/spacevine_mutation/screaming - name = "Screaming" +/datum/spacevine_mutation/weeping + name = "Weeping" hue = "#6b6b6b" quality = NEGATIVE severity = SEVERITY_AVERAGE // not that bad (on its own) -/datum/spacevine_mutation/screaming/on_hit(obj/structure/spacevine/holder, mob/hitter, obj/item/item, expected_damage) +/datum/spacevine_mutation/weeping/on_hit(obj/structure/spacevine/holder, mob/hitter, obj/item/item, expected_damage) var/scream = pick( 'sound/voice/human/malescream_1.ogg', 'sound/voice/human/femalescream_1.ogg', From f432b10be8792cc795f06f01e77071a452d26d8d Mon Sep 17 00:00:00 2001 From: Shoddd <148718717+Shoddd@users.noreply.github.com> Date: Sun, 20 Apr 2025 14:48:59 -0400 Subject: [PATCH 5/6] heliosfixitiones --- _maps/map_files/Heliostation/Heliostation.dmm | 63 ++++++++++++++----- 1 file changed, 47 insertions(+), 16 deletions(-) diff --git a/_maps/map_files/Heliostation/Heliostation.dmm b/_maps/map_files/Heliostation/Heliostation.dmm index 3108b9f8c2cc..6ffc1a46998f 100644 --- a/_maps/map_files/Heliostation/Heliostation.dmm +++ b/_maps/map_files/Heliostation/Heliostation.dmm @@ -5746,13 +5746,13 @@ /obj/item/clothing/gloves/latex, /obj/item/clothing/gloves/latex, /obj/item/clothing/gloves/latex, -/obj/item/clothing/glasses/science, -/obj/item/clothing/glasses/science, /obj/item/reagent_containers/cup/tube, /obj/item/reagent_containers/cup/tube, /obj/item/reagent_containers/cup/tube, -/obj/item/clothing/glasses/science, /obj/item/reagent_containers/cup/tube, +/obj/item/clothing/glasses/pathology, +/obj/item/clothing/glasses/pathology, +/obj/item/clothing/glasses/pathology, /turf/open/floor/iron/white, /area/station/medical/virology) "aHK" = ( @@ -7131,6 +7131,7 @@ /obj/effect/turf_decal/trimline/blue/filled/line{ dir = 4 }, +/obj/structure/cable, /turf/open/floor/iron/white, /area/station/medical/virology) "aNq" = ( @@ -21443,7 +21444,7 @@ /obj/item/clothing/mask/breath, /obj/item/tank/internals/oxygen, /turf/open/floor/plating, -/area/station/medical/virology) +/area/station/maintenance/department/medical/pathology) "cnu" = ( /obj/effect/spawner/structure/window/reinforced, /obj/structure/cable, @@ -22321,7 +22322,7 @@ /obj/machinery/portable_atmospherics/canister/air, /obj/machinery/atmospherics/components/unary/portables_connector/visible, /turf/open/floor/plating, -/area/station/medical/virology) +/area/station/maintenance/department/medical/pathology) "cwM" = ( /obj/machinery/computer/security/qm{ dir = 4 @@ -22747,7 +22748,7 @@ "cAv" = ( /obj/machinery/atmospherics/components/tank/air, /turf/open/floor/plating, -/area/station/medical/virology) +/area/station/maintenance/department/medical/pathology) "cAw" = ( /obj/structure/table, /obj/item/storage/box{ @@ -28617,6 +28618,11 @@ /obj/effect/turf_decal/delivery, /turf/open/floor/plating, /area/station/maintenance/aft/lesser) +"dNt" = ( +/obj/effect/decal/cleanable/dirt, +/obj/machinery/electroplater, +/turf/open/floor/carpet/grimey, +/area/station/commons/vacant_room/office) "dNH" = ( /obj/machinery/portable_atmospherics/canister/carbon_dioxide, /turf/open/floor/iron/dark/textured_half, @@ -31511,8 +31517,9 @@ dir = 4 }, /obj/effect/mapping_helpers/airlock/access/all/medical/virology, +/obj/structure/cable, /turf/open/floor/iron/white, -/area/station/medical/virology) +/area/station/maintenance/department/medical/pathology) "eXb" = ( /obj/structure/chair/office, /turf/open/floor/carpet/green, @@ -36072,6 +36079,9 @@ /obj/structure/cable, /turf/open/floor/plating, /area/station/cargo/warehouse) +"gTE" = ( +/turf/closed/wall, +/area/station/maintenance/department/medical/pathology) "gTG" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -47188,6 +47198,12 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark, /area/station/engineering/storage_shared) +"ldx" = ( +/obj/docking_port/stationary/laborcamp_home{ + dir = 8 + }, +/turf/open/space/basic, +/area/space) "ldB" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, /turf/open/floor/iron/dark, @@ -52136,6 +52152,11 @@ /obj/effect/decal/cleanable/dirt, /obj/machinery/duct, /obj/machinery/door/firedoor, +/obj/machinery/computer/cryopod/directional/south{ + dir = 1; + pixel_y = -22; + max_integrity = 10000 + }, /turf/open/floor/iron, /area/station/security/prison) "nbZ" = ( @@ -58329,8 +58350,10 @@ /obj/machinery/space_heater, /obj/machinery/light/small/directional/east, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/visible, +/obj/machinery/power/apc/auto_name/directional/east, +/obj/structure/cable, /turf/open/floor/plating, -/area/station/medical/virology) +/area/station/maintenance/department/medical/pathology) "pqf" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/spawner/random/trash/graffiti, @@ -67155,6 +67178,12 @@ }, /turf/open/floor/engine, /area/station/engineering/supermatter/room) +"sPh" = ( +/obj/machinery/cryopod{ + dir = 8 + }, +/turf/open/floor/iron, +/area/station/security/prison) "sPi" = ( /obj/effect/turf_decal/stripes/line{ dir = 5 @@ -67822,8 +67851,9 @@ /area/station/cargo/sorting) "tbK" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/visible, +/obj/structure/cable, /turf/open/floor/plating, -/area/station/medical/virology) +/area/station/maintenance/department/medical/pathology) "tbN" = ( /turf/open/floor/iron, /area/station/security/checkpoint/escape) @@ -78206,8 +78236,9 @@ dir = 4; name = "Virology air supply valve" }, +/obj/structure/cable, /turf/open/floor/plating, -/area/station/medical/virology) +/area/station/maintenance/department/medical/pathology) "xgO" = ( /obj/effect/mapping_helpers/burnt_floor, /obj/effect/turf_decal/box, @@ -101345,7 +101376,7 @@ nbZ ohO lMJ hyj -nRe +dNt uGE nAS kuB @@ -102815,7 +102846,7 @@ fCF fyd fyd jQo -agM +sPh aqB bkM dOP @@ -106403,7 +106434,7 @@ aaa aaa aaa aaa -aaa +ldx aaP aaa aak @@ -130090,7 +130121,7 @@ aKS aJO nSd aEe -aFd +gTE eWM aEe aOG @@ -131118,8 +131149,8 @@ aLy lZF hzF aEe -aFd -aFd +gTE +gTE aEe aOG cXH From 88b9ec42acd9b1cef2888d3b179d64aac8e4c030 Mon Sep 17 00:00:00 2001 From: Shoddd <148718717+Shoddd@users.noreply.github.com> Date: Sun, 20 Apr 2025 18:27:22 -0400 Subject: [PATCH 6/6] oop --- _maps/map_files/Heliostation/Heliostation.dmm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_maps/map_files/Heliostation/Heliostation.dmm b/_maps/map_files/Heliostation/Heliostation.dmm index 6ffc1a46998f..3c1f3e9a1599 100644 --- a/_maps/map_files/Heliostation/Heliostation.dmm +++ b/_maps/map_files/Heliostation/Heliostation.dmm @@ -47200,7 +47200,7 @@ /area/station/engineering/storage_shared) "ldx" = ( /obj/docking_port/stationary/laborcamp_home{ - dir = 8 + dir = 4 }, /turf/open/space/basic, /area/space)