Skip to content

Commit

Permalink
Merge pull request #48 from KnigTheThrasher/roundstartempfixes
Browse files Browse the repository at this point in the history
Fixes freezers triggering roundstart alarms
  • Loading branch information
SynthTwo authored Aug 10, 2024
2 parents 87bd788 + 5d5419c commit 095409f
Show file tree
Hide file tree
Showing 6 changed files with 121 additions and 83 deletions.
66 changes: 37 additions & 29 deletions _maps/map_files/Deltastation/DeltaStation2.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -8221,7 +8221,10 @@
/obj/effect/turf_decal/stripes/line{
dir = 1
},
/turf/open/floor/iron/freezer,
/obj/machinery/atmospherics/pipe/heat_exchanging/simple{
dir = 6
},
/turf/open/floor/iron/kitchen_coldroom/freezerfloor,
/area/station/service/kitchen/coldroom)
"bWZ" = (
/obj/effect/landmark/start/hangover,
Expand Down Expand Up @@ -18631,7 +18634,7 @@
/obj/effect/decal/cleanable/dirt,
/obj/machinery/duct,
/mob/living/basic/goat/pete,
/turf/open/floor/iron/freezer,
/turf/open/floor/iron/kitchen_coldroom/freezerfloor,
/area/station/service/kitchen/coldroom)
"eFj" = (
/obj/structure/window/reinforced/spawner/directional/west,
Expand Down Expand Up @@ -23440,7 +23443,7 @@
/obj/effect/decal/cleanable/dirt,
/obj/machinery/airalarm/directional/north,
/obj/effect/mapping_helpers/airalarm/tlv_cold_room,
/turf/open/floor/iron/freezer,
/turf/open/floor/iron/kitchen_coldroom/freezerfloor,
/area/station/service/kitchen/coldroom)
"fOz" = (
/obj/structure/disposalpipe/segment{
Expand Down Expand Up @@ -27798,7 +27801,7 @@
/obj/effect/turf_decal/stripes/line{
dir = 4
},
/turf/open/floor/iron/freezer,
/turf/open/floor/iron/kitchen_coldroom/freezerfloor,
/area/station/service/kitchen/coldroom)
"gPt" = (
/obj/effect/landmark/event_spawn,
Expand Down Expand Up @@ -36637,17 +36640,17 @@
/turf/open/floor/iron/white,
/area/station/science/robotics/lab)
"jem" = (
/obj/machinery/atmospherics/pipe/heat_exchanging/simple{
dir = 4
},
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/obj/effect/turf_decal/stripes/line{
dir = 1
},
/obj/effect/turf_decal/siding/white,
/turf/open/floor/iron/freezer,
/obj/machinery/atmospherics/pipe/heat_exchanging/manifold{
dir = 1
},
/turf/open/floor/iron/kitchen_coldroom/freezerfloor,
/area/station/service/kitchen/coldroom)
"jeo" = (
/turf/open/floor/plating,
Expand Down Expand Up @@ -40165,7 +40168,10 @@
dir = 1
},
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/iron/freezer,
/obj/machinery/atmospherics/pipe/heat_exchanging/simple{
dir = 10
},
/turf/open/floor/iron/kitchen_coldroom/freezerfloor,
/area/station/service/kitchen/coldroom)
"jUV" = (
/obj/effect/turf_decal/trimline/neutral/filled/line{
Expand Down Expand Up @@ -58672,11 +58678,9 @@
/turf/open/floor/plating,
/area/station/service/theater/abandoned)
"oLU" = (
/obj/machinery/atmospherics/pipe/heat_exchanging/simple{
dir = 4
},
/obj/effect/turf_decal/stripes/line,
/turf/open/floor/iron/freezer,
/obj/machinery/atmospherics/pipe/heat_exchanging/manifold,
/turf/open/floor/iron/kitchen_coldroom/freezerfloor,
/area/station/service/kitchen/coldroom)
"oLV" = (
/obj/effect/landmark/start/hangover,
Expand Down Expand Up @@ -59329,7 +59333,7 @@
},
/obj/machinery/light/small/directional/east,
/obj/item/radio/intercom/directional/east,
/turf/open/floor/iron/freezer,
/turf/open/floor/iron/kitchen_coldroom/freezerfloor,
/area/station/service/kitchen/coldroom)
"oTC" = (
/obj/effect/decal/cleanable/dirt,
Expand Down Expand Up @@ -71395,7 +71399,7 @@
dir = 4
},
/obj/effect/turf_decal/siding/white/corner,
/turf/open/floor/iron/freezer,
/turf/open/floor/iron/kitchen_coldroom/freezerfloor,
/area/station/service/kitchen/coldroom)
"rQZ" = (
/obj/machinery/modular_computer/preset/id{
Expand Down Expand Up @@ -76698,7 +76702,7 @@
dir = 8
},
/obj/effect/landmark/event_spawn,
/turf/open/floor/iron/freezer,
/turf/open/floor/iron/kitchen_coldroom/freezerfloor,
/area/station/service/kitchen/coldroom)
"thB" = (
/obj/structure/window/reinforced/spawner/directional/west,
Expand Down Expand Up @@ -89456,6 +89460,9 @@
/obj/effect/turf_decal/bot,
/obj/structure/closet/secure_closet/freezer/kitchen,
/obj/item/reagent_containers/condiment/flour,
/obj/machinery/atmospherics/pipe/heat_exchanging/simple{
dir = 5
},
/turf/open/floor/iron/dark,
/area/station/service/kitchen/coldroom)
"wqn" = (
Expand Down Expand Up @@ -92256,6 +92263,9 @@
/obj/item/reagent_containers/condiment/milk,
/obj/item/reagent_containers/condiment/milk,
/obj/item/reagent_containers/condiment/soymilk,
/obj/machinery/atmospherics/pipe/heat_exchanging/simple{
dir = 9
},
/turf/open/floor/iron/dark,
/area/station/service/kitchen/coldroom)
"xcd" = (
Expand Down Expand Up @@ -94279,7 +94289,7 @@
},
/obj/structure/disposalpipe/segment,
/obj/machinery/duct,
/turf/open/floor/iron/freezer,
/turf/open/floor/iron/kitchen_coldroom/freezerfloor,
/area/station/service/kitchen/coldroom)
"xAu" = (
/obj/effect/turf_decal/trimline/neutral/warning{
Expand Down Expand Up @@ -95304,7 +95314,7 @@
/obj/effect/turf_decal/stripes/line{
dir = 4
},
/turf/open/floor/iron/freezer,
/turf/open/floor/iron/kitchen_coldroom/freezerfloor,
/area/station/service/kitchen/coldroom)
"xNv" = (
/obj/item/kirbyplants/random,
Expand Down Expand Up @@ -95417,7 +95427,7 @@
dir = 10;
name = "service camera"
},
/turf/open/floor/iron/freezer,
/turf/open/floor/iron/kitchen_coldroom/freezerfloor,
/area/station/service/kitchen/coldroom)
"xOP" = (
/obj/structure/cable,
Expand Down Expand Up @@ -96064,15 +96074,14 @@
/turf/open/floor/iron,
/area/station/commons/locker)
"xYP" = (
/obj/machinery/atmospherics/pipe/heat_exchanging/simple{
dir = 6
},
/obj/effect/turf_decal/stripes/corner,
/obj/effect/decal/cleanable/dirt,
/obj/machinery/light/small/directional/west,
/obj/machinery/firealarm/directional/west,
/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4,
/turf/open/floor/iron/freezer,
/obj/machinery/atmospherics/pipe/heat_exchanging/manifold{
dir = 8
},
/turf/open/floor/iron/kitchen_coldroom/freezerfloor,
/area/station/service/kitchen/coldroom)
"xYW" = (
/obj/effect/decal/cleanable/dirt,
Expand Down Expand Up @@ -96361,9 +96370,6 @@
/turf/open/floor/iron/cafeteria,
/area/station/service/cafeteria)
"ydg" = (
/obj/machinery/atmospherics/pipe/heat_exchanging/simple{
dir = 9
},
/obj/structure/cable,
/obj/effect/turf_decal/stripes/corner{
dir = 1
Expand All @@ -96372,8 +96378,10 @@
/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
dir = 8
},
/obj/effect/decal/cleanable/food/flour,
/turf/open/floor/iron/freezer,
/obj/machinery/atmospherics/pipe/heat_exchanging/manifold{
dir = 4
},
/turf/open/floor/iron/kitchen_coldroom/freezerfloor,
/area/station/service/kitchen/coldroom)
"ydp" = (
/obj/structure/table,
Expand Down
1 change: 1 addition & 0 deletions _maps/map_files/MetaStation/MetaStation.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -10237,6 +10237,7 @@
/obj/item/food/popsicle/creamsicle_orange,
/obj/machinery/airalarm/directional/north,
/obj/effect/turf_decal/tile/dark_blue/half/contrasted,
/obj/effect/mapping_helpers/airalarm/tlv_cold_room,
/turf/open/floor/iron/kitchen_coldroom,
/area/station/medical/coldroom)
"dLq" = (
Expand Down
16 changes: 8 additions & 8 deletions _maps/map_files/VoidRaptor/VoidRaptor.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -12314,7 +12314,7 @@
/obj/item/clothing/mask/breath/vox,
/obj/item/clothing/mask/breath/vox,
/obj/machinery/atmospherics/pipe/smart/manifold4w/dark/hidden,
/turf/open/floor/iron/showroomfloor,
/turf/open/floor/iron/kitchen_coldroom/freezerfloor,
/area/station/medical/coldroom)
"dGw" = (
/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2,
Expand Down Expand Up @@ -20253,7 +20253,7 @@
/obj/effect/turf_decal/bot,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/structure/closet/crate/freezer/surplus_limbs,
/turf/open/floor/iron/showroomfloor,
/turf/open/floor/iron/kitchen_coldroom/freezerfloor,
/area/station/medical/coldroom)
"fUB" = (
/obj/effect/turf_decal/trimline/red/filled/warning{
Expand Down Expand Up @@ -24405,7 +24405,7 @@
dir = 8
},
/obj/machinery/portable_atmospherics/canister/anesthetic_mix,
/turf/open/floor/iron/showroomfloor,
/turf/open/floor/iron/kitchen_coldroom/freezerfloor,
/area/station/medical/coldroom)
"hbJ" = (
/obj/effect/spawner/structure/window/reinforced,
Expand Down Expand Up @@ -37233,7 +37233,7 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/effect/mapping_helpers/airlock/access/all/medical/general,
/obj/effect/mapping_helpers/airlock/unres{
dir = 4
dir = 8
},
/obj/machinery/door/airlock/medical/glass{
id_tag = "MedbayFoyer";
Expand Down Expand Up @@ -39582,7 +39582,7 @@
/obj/effect/turf_decal/bot,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden,
/obj/structure/rack,
/turf/open/floor/iron/showroomfloor,
/turf/open/floor/iron/kitchen_coldroom/freezerfloor,
/area/station/medical/coldroom)
"liH" = (
/obj/structure/cable,
Expand Down Expand Up @@ -44588,7 +44588,7 @@
"mCM" = (
/obj/effect/mapping_helpers/airlock/access/all/medical/general,
/obj/effect/mapping_helpers/airlock/unres{
dir = 4
dir = 8
},
/obj/machinery/door/airlock/medical/glass{
id_tag = "MedbayFoyer";
Expand Down Expand Up @@ -57997,7 +57997,7 @@
/obj/effect/turf_decal/bot,
/obj/machinery/atmospherics/components/binary/pump/on,
/obj/structure/closet/crate/freezer/blood,
/turf/open/floor/iron/showroomfloor,
/turf/open/floor/iron/kitchen_coldroom/freezerfloor,
/area/station/medical/coldroom)
"qgK" = (
/obj/effect/turf_decal/tile/blue/fourcorners,
Expand Down Expand Up @@ -67455,7 +67455,7 @@
dir = 4
},
/obj/machinery/portable_atmospherics/canister/anesthetic_mix,
/turf/open/floor/iron/showroomfloor,
/turf/open/floor/iron/kitchen_coldroom/freezerfloor,
/area/station/medical/coldroom)
"sNz" = (
/obj/structure/flora/rock/pile/jungle/large,
Expand Down
4 changes: 2 additions & 2 deletions _maps/map_files/biodome/biodome.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -19829,8 +19829,8 @@
/area/station/science/xenobiology)
"gJD" = (
/obj/structure/cable,
/obj/machinery/computer/security/telescreen/ce/directional/west,
/obj/effect/turf_decal/tile/neutral/full,
/obj/machinery/computer/security/telescreen/ce/directional/east,
/turf/open/floor/iron,
/area/station/command/heads_quarters/ce)
"gJS" = (
Expand Down Expand Up @@ -26201,10 +26201,10 @@
/obj/item/stock_parts/power_store/cell/high,
/obj/item/reagent_containers/pill/patch/aiuri,
/obj/machinery/light/directional/north,
/obj/machinery/firealarm/directional/north,
/obj/effect/turf_decal/siding/thinplating_new/light{
dir = 10
},
/obj/machinery/firealarm/directional/east,
/turf/open/floor/iron/dark,
/area/station/command/heads_quarters/ce)
"jcb" = (
Expand Down
Loading

0 comments on commit 095409f

Please sign in to comment.