From 240d90903ef23705f1c0236620d744d304943dcc Mon Sep 17 00:00:00 2001 From: nmajask Date: Fri, 17 Jun 2022 08:16:49 -0400 Subject: [PATCH 1/3] prot old baycode is pain --- code/game/machinery/buttons.dm | 5 ++++ code/game/machinery/holosign.dm | 35 +++++++++++++++++++++++++++ code/modules/assembly/doorcontrol.dm | 15 ++++++++++++ icons/obj/holosign.dmi | Bin 0 -> 7938 bytes yogstation.dme | 1 + 5 files changed, 56 insertions(+) create mode 100644 code/game/machinery/holosign.dm create mode 100644 icons/obj/holosign.dmi diff --git a/code/game/machinery/buttons.dm b/code/game/machinery/buttons.dm index 53931fd84e3f..fd9d50c1d6f1 100644 --- a/code/game/machinery/buttons.dm +++ b/code/game/machinery/buttons.dm @@ -302,6 +302,11 @@ /obj/machinery/button/crematorium/indestructible resistance_flags = INDESTRUCTIBLE | LAVA_PROOF | FIRE_PROOF | UNACIDABLE | ACID_PROOF +/obj/machinery/button/holosign + name = "holosign button" + desc = "A remote control switch for a holosign." + device_type = /obj/item/assembly/control/holosign + /obj/item/wallframe/button name = "button frame" desc = "Used for building buttons." diff --git a/code/game/machinery/holosign.dm b/code/game/machinery/holosign.dm new file mode 100644 index 000000000000..70b15d62e138 --- /dev/null +++ b/code/game/machinery/holosign.dm @@ -0,0 +1,35 @@ +////////////////////HOLOSIGN/////////////////////////////////////// +/obj/machinery/holosign + name = "holosign" + desc = "Small wall-mounted holographic projector" + icon = 'icons/obj/holosign.dmi' + icon_state = "sign_off" + layer = 4 + var/lit = FALSE + var/id = null + var/on_icon = "sign_on" + +/obj/machinery/holosign/proc/toggle() + if(!is_operational()) + lit = FALSE + else + lit = !lit + update_icon() + +/obj/machinery/holosign/update_icon() + if(!lit) + icon_state = initial(icon_state) + set_light(0) + else + icon_state = on_icon + set_light(1, 0.5, l_color = COLOR_BLUE_LIGHT) + +/obj/machinery/holosign/power_change() + if(!is_operational()) + lit = FALSE + update_icon() + +/obj/machinery/holosign/surgery + name = "surgery holosign" + desc = "Small wall-mounted holographic projector. This one reads SURGERY." + on_icon = "surgery" diff --git a/code/modules/assembly/doorcontrol.dm b/code/modules/assembly/doorcontrol.dm index e578faa77e43..e81809f9f350 100644 --- a/code/modules/assembly/doorcontrol.dm +++ b/code/modules/assembly/doorcontrol.dm @@ -145,3 +145,18 @@ C.cremate(usr) addtimer(VARSET_CALLBACK(src, cooldown, FALSE), 50) + + +/obj/item/assembly/control/holosign + name = "holosign controller" + desc = "A remote controller for a holosign." + +/obj/item/assembly/control/crematorium/activate() + if(cooldown) + return + cooldown = TRUE + for(var/obj/machinery/holosign/H in GLOB.machines) + if(H.id == id) + H.toggle() + + addtimer(VARSET_CALLBACK(src, cooldown, FALSE), 50) diff --git a/icons/obj/holosign.dmi b/icons/obj/holosign.dmi new file mode 100644 index 0000000000000000000000000000000000000000..16236419a38d11b83d1eead4dba7cc8b7ec1d06e GIT binary patch literal 7938 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 fPY-B7^DtH7y(fOxNhkla literal 0 HcmV?d00001 diff --git a/yogstation.dme b/yogstation.dme index 1b56b2bf3fa7..7d5126d2f699 100644 --- a/yogstation.dme +++ b/yogstation.dme @@ -744,6 +744,7 @@ #include "code\game\machinery\gulag_teleporter.dm" #include "code\game\machinery\harvester.dm" #include "code\game\machinery\hologram.dm" +#include "code\game\machinery\holosign.dm" #include "code\game\machinery\igniter.dm" #include "code\game\machinery\iv_drip.dm" #include "code\game\machinery\launch_pad.dm" From 1e150f276653625c53767c93cadd19ff0115826c Mon Sep 17 00:00:00 2001 From: nmajask Date: Fri, 17 Jun 2022 08:22:42 -0400 Subject: [PATCH 2/3] mapping --- _maps/map_files/YogStation/YogStation.dmm | 182 ++++++++++++---------- 1 file changed, 97 insertions(+), 85 deletions(-) diff --git a/_maps/map_files/YogStation/YogStation.dmm b/_maps/map_files/YogStation/YogStation.dmm index 9e968be2484b..1a63f6e988f0 100644 --- a/_maps/map_files/YogStation/YogStation.dmm +++ b/_maps/map_files/YogStation/YogStation.dmm @@ -21633,6 +21633,36 @@ }, /turf/open/floor/plasteel, /area/security/checkpoint/engineering) +"bUA" = ( +/obj/effect/turf_decal/trimline/blue/filled/line, +/obj/effect/turf_decal/trimline/blue/filled/line{ + dir = 1 + }, +/obj/machinery/door/firedoor/border_only{ + dir = 4 + }, +/obj/machinery/door/firedoor/border_only{ + dir = 8 + }, +/obj/machinery/door/airlock/medical{ + name = "Operating Theatre"; + req_access_txt = "45" + }, +/obj/effect/mapping_helpers/airlock/unres{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/machinery/holosign/surgery, +/turf/open/floor/plasteel/white, +/area/medical/surgery) "bVa" = ( /obj/machinery/door/firedoor/border_only{ dir = 4 @@ -26746,6 +26776,26 @@ }, /turf/open/floor/plasteel, /area/hallway/primary/central) +"dDo" = ( +/obj/effect/turf_decal/trimline/blue/filled/line{ + dir = 5 + }, +/obj/machinery/button/door{ + id = "surgery_shutters"; + name = "Surgery shutters"; + pixel_x = 26; + pixel_y = 6; + req_access_txt = "45"; + req_one_access_txt = null + }, +/obj/machinery/computer/operating, +/obj/machinery/button/holosign{ + id = "surgery"; + pixel_x = 26; + pixel_y = -4 + }, +/turf/open/floor/plasteel/white, +/area/medical/surgery) "dDp" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/portable_atmospherics/canister/water_vapor, @@ -32595,21 +32645,6 @@ /obj/item/pen/red, /turf/open/floor/wood, /area/vacant_room) -"gKi" = ( -/obj/effect/turf_decal/trimline/blue/filled/line{ - dir = 5 - }, -/obj/machinery/button/door{ - id = "surgery_shutters"; - name = "Surgery shutters"; - pixel_x = 26; - pixel_y = 6; - req_access_txt = "45"; - req_one_access_txt = null - }, -/obj/machinery/computer/operating, -/turf/open/floor/plasteel/white, -/area/medical/surgery) "gKy" = ( /obj/effect/turf_decal/stripes/line{ dir = 8 @@ -45552,6 +45587,26 @@ }, /turf/open/floor/plating, /area/hallway/secondary/exit) +"mYj" = ( +/obj/effect/turf_decal/trimline/blue/filled/line{ + dir = 8 + }, +/obj/effect/turf_decal/trimline/blue/filled/line{ + dir = 4 + }, +/obj/machinery/door/firedoor/border_only{ + dir = 1 + }, +/obj/machinery/door/firedoor/border_only, +/obj/machinery/door/airlock/medical{ + name = "Operating Theatre"; + req_access_txt = "45" + }, +/obj/machinery/holosign/surgery{ + id = "surgery" + }, +/turf/open/floor/plasteel/white, +/area/medical/surgery) "mYS" = ( /obj/machinery/camera{ c_tag = "Atmospherics South West"; @@ -56967,26 +57022,6 @@ }, /turf/open/floor/plasteel, /area/engine/engineering) -"sKm" = ( -/obj/machinery/door/airlock/medical{ - name = "Operating Theatre"; - req_access_txt = "45" - }, -/obj/machinery/door/firedoor/border_only{ - dir = 8 - }, -/obj/machinery/door/firedoor/border_only{ - dir = 4 - }, -/obj/effect/turf_decal/trimline/blue/filled/line{ - dir = 1 - }, -/obj/effect/turf_decal/trimline/blue/filled/line, -/obj/structure/cable{ - icon_state = "4-8" - }, -/turf/open/floor/plasteel/white, -/area/medical/sleeper) "sKs" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ dir = 4 @@ -58814,23 +58849,6 @@ }, /turf/open/floor/plasteel/dark, /area/storage/tech) -"tEa" = ( -/obj/effect/turf_decal/trimline/blue/filled/line{ - dir = 8 - }, -/obj/effect/turf_decal/trimline/blue/filled/line{ - dir = 4 - }, -/obj/machinery/door/firedoor/border_only{ - dir = 1 - }, -/obj/machinery/door/firedoor/border_only, -/obj/machinery/door/airlock/medical{ - name = "Operating Theatre"; - req_access_txt = "45" - }, -/turf/open/floor/plasteel/white, -/area/medical/surgery) "tEk" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2, /obj/structure/disposalpipe/segment{ @@ -61908,35 +61926,6 @@ }, /turf/open/floor/plating, /area/crew_quarters/heads/chief) -"vhN" = ( -/obj/effect/turf_decal/trimline/blue/filled/line, -/obj/effect/turf_decal/trimline/blue/filled/line{ - dir = 1 - }, -/obj/machinery/door/firedoor/border_only{ - dir = 4 - }, -/obj/machinery/door/firedoor/border_only{ - dir = 8 - }, -/obj/machinery/door/airlock/medical{ - name = "Operating Theatre"; - req_access_txt = "45" - }, -/obj/effect/mapping_helpers/airlock/unres{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/structure/cable{ - icon_state = "4-8" - }, -/turf/open/floor/plasteel/white, -/area/medical/surgery) "vhP" = ( /obj/structure/sign/poster/contraband/power{ pixel_y = 32 @@ -63806,6 +63795,29 @@ "wkN" = ( /turf/closed/wall, /area/science/nanite) +"wls" = ( +/obj/machinery/door/airlock/medical{ + name = "Operating Theatre"; + req_access_txt = "45" + }, +/obj/machinery/door/firedoor/border_only{ + dir = 8 + }, +/obj/machinery/door/firedoor/border_only{ + dir = 4 + }, +/obj/effect/turf_decal/trimline/blue/filled/line{ + dir = 1 + }, +/obj/effect/turf_decal/trimline/blue/filled/line, +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/machinery/holosign/surgery{ + id = "surgery" + }, +/turf/open/floor/plasteel/white, +/area/medical/sleeper) "wlG" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 6 @@ -106188,7 +106200,7 @@ bvj bvj bvj shz -sKm +wls bvj tDe tVV @@ -106961,7 +106973,7 @@ urv uMu vYV oQs -tEa +mYj tzM ulL oEY @@ -107470,7 +107482,7 @@ hoP kub hLI iYd -gKi +dDo gQe doF hnj @@ -107730,7 +107742,7 @@ adK adK adK adK -vhN +bUA adK adK jrP From cf75f1abd8e1a06d381deefd6b822cba36ad14dc Mon Sep 17 00:00:00 2001 From: nmajask Date: Sun, 19 Jun 2022 06:43:05 -0400 Subject: [PATCH 3/3] forgot to push this --- code/modules/assembly/doorcontrol.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/assembly/doorcontrol.dm b/code/modules/assembly/doorcontrol.dm index e81809f9f350..908c91926919 100644 --- a/code/modules/assembly/doorcontrol.dm +++ b/code/modules/assembly/doorcontrol.dm @@ -151,7 +151,7 @@ name = "holosign controller" desc = "A remote controller for a holosign." -/obj/item/assembly/control/crematorium/activate() +/obj/item/assembly/control/holosign/activate() if(cooldown) return cooldown = TRUE