From d71efa0859ea697e6967c5cb165a8b9ee1dbe561 Mon Sep 17 00:00:00 2001 From: ShizCalev Date: Thu, 14 Sep 2017 12:14:52 -0400 Subject: [PATCH] Cleans up showcase & plaque varedits, updated loyalty implant references (#30698) * Cleans up showcase varedits * drop_location for oldpods * Plaques + more loyalty implant references --- _maps/RandomRuins/SpaceRuins/oldstation.dmm | 4 +- _maps/RandomZLevels/snowdin.dmm | 14 +- _maps/map_files/BoxStation/BoxStation.dmm | 42 +---- .../map_files/Deltastation/DeltaStation2.dmm | 82 ++------- _maps/map_files/MetaStation/MetaStation.dmm | 167 +++--------------- _maps/map_files/OmegaStation/OmegaStation.dmm | 18 +- _maps/map_files/PubbyStation/PubbyStation.dmm | 12 +- _maps/map_files/generic/CentCom.dmm | 11 +- .../objects/structures/ghost_role_spawners.dm | 6 +- code/game/objects/structures/showcase.dm | 58 +++++- code/game/objects/structures/signs.dm | 23 +++ strings/tips.txt | 10 +- 12 files changed, 146 insertions(+), 301 deletions(-) diff --git a/_maps/RandomRuins/SpaceRuins/oldstation.dmm b/_maps/RandomRuins/SpaceRuins/oldstation.dmm index 32ed7321e75..a4daf215aa9 100644 --- a/_maps/RandomRuins/SpaceRuins/oldstation.dmm +++ b/_maps/RandomRuins/SpaceRuins/oldstation.dmm @@ -4238,7 +4238,7 @@ dir = 6 }, /obj/effect/decal/cleanable/dirt, -/obj/structure/showcase/oldpod, +/obj/structure/showcase/machinery/oldpod, /turf/open/floor/plasteel/floorgrime, /area/ruin/space/has_grav/ancientstation) "kq" = ( @@ -4250,7 +4250,7 @@ }, /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/supply/hidden, -/obj/structure/showcase/oldpod, +/obj/structure/showcase/machinery/oldpod, /turf/open/floor/plasteel/floorgrime, /area/ruin/space/has_grav/ancientstation) "kr" = ( diff --git a/_maps/RandomZLevels/snowdin.dmm b/_maps/RandomZLevels/snowdin.dmm index a18c9f18c8e..07f6530dade 100644 --- a/_maps/RandomZLevels/snowdin.dmm +++ b/_maps/RandomZLevels/snowdin.dmm @@ -633,12 +633,7 @@ }, /area/awaymission/snowdin/base) "bC" = ( -/obj/structure/showcase{ - desc = "A strange machine thats supposedly used to help pick up and decrypt wave signals. "; - icon = 'icons/obj/machines/telecomms.dmi'; - icon_state = "processor"; - name = "subsystem signal decrypter" - }, +/obj/structure/showcase/machinery/signal_decrypter, /turf/open/floor/plating{ baseturf = /turf/open/floor/plating/asteroid/snow }, @@ -2498,12 +2493,7 @@ /area/awaymission/snowdin/post) "gL" = ( /obj/machinery/light/small, -/obj/structure/showcase{ - desc = "A strange machine thats supposedly used to help pick up and decrypt wave signals. "; - icon = 'icons/obj/machines/telecomms.dmi'; - icon_state = "processor"; - name = "subsystem signal decrypter" - }, +/obj/structure/showcase/machinery/signal_decrypter, /turf/open/floor/plating{ baseturf = /turf/open/floor/plating/asteroid/snow }, diff --git a/_maps/map_files/BoxStation/BoxStation.dmm b/_maps/map_files/BoxStation/BoxStation.dmm index 2bb8ca68864..99e4f2345f2 100644 --- a/_maps/map_files/BoxStation/BoxStation.dmm +++ b/_maps/map_files/BoxStation/BoxStation.dmm @@ -54591,13 +54591,8 @@ /turf/open/floor/plating, /area/ai_monitored/turret_protected/aisat/atmos) "cup" = ( -/obj/structure/showcase{ - density = 0; - desc = "An old, deactivated cyborg. Whilst once actively used to guard against intruders, it now simply intimidates them with its cold, steely gaze."; +/obj/structure/showcase/cyborg/old{ dir = 8; - icon = 'icons/mob/robots.dmi'; - icon_state = "robot_old"; - name = "Cyborg Statue"; pixel_x = 9; pixel_y = 2 }, @@ -54622,13 +54617,8 @@ }, /area/ai_monitored/turret_protected/aisat/atmos) "cur" = ( -/obj/structure/showcase{ - density = 0; - desc = "An old, deactivated cyborg. Whilst once actively used to guard against intruders, it now simply intimidates them with its cold, steely gaze."; +/obj/structure/showcase/cyborg/old{ dir = 4; - icon = 'icons/mob/robots.dmi'; - icon_state = "robot_old"; - name = "Cyborg Statue"; pixel_x = -9; pixel_y = 2 }, @@ -54637,13 +54627,8 @@ }, /area/ai_monitored/turret_protected/aisat_interior) "cus" = ( -/obj/structure/showcase{ - density = 0; - desc = "An old, deactivated cyborg. Whilst once actively used to guard against intruders, it now simply intimidates them with its cold, steely gaze."; +/obj/structure/showcase/cyborg/old{ dir = 8; - icon = 'icons/mob/robots.dmi'; - icon_state = "robot_old"; - name = "Cyborg Statue"; pixel_x = 9; pixel_y = 2 }, @@ -54680,13 +54665,8 @@ /turf/open/floor/plasteel/black, /area/ai_monitored/turret_protected/aisat_interior) "cuv" = ( -/obj/structure/showcase{ - density = 0; - desc = "An old, deactivated cyborg. Whilst once actively used to guard against intruders, it now simply intimidates them with its cold, steely gaze."; +/obj/structure/showcase/cyborg/old{ dir = 4; - icon = 'icons/mob/robots.dmi'; - icon_state = "robot_old"; - name = "Cyborg Statue"; pixel_x = -9; pixel_y = 2 }, @@ -57581,13 +57561,8 @@ d2 = 2; icon_state = "1-2" }, -/obj/structure/showcase{ - density = 0; - desc = "An old, deactivated cyborg. Whilst once actively used to guard against intruders, it now simply intimidates them with its cold, steely gaze."; +/obj/structure/showcase/cyborg/old{ dir = 8; - icon = 'icons/mob/robots.dmi'; - icon_state = "robot_old"; - name = "Cyborg Statue"; pixel_x = 9; pixel_y = 2 }, @@ -57597,13 +57572,8 @@ /turf/open/floor/plasteel/black, /area/ai_monitored/turret_protected/ai) "cAW" = ( -/obj/structure/showcase{ - density = 0; - desc = "An old, deactivated cyborg. Whilst once actively used to guard against intruders, it now simply intimidates them with its cold, steely gaze."; +/obj/structure/showcase/cyborg/old{ dir = 4; - icon = 'icons/mob/robots.dmi'; - icon_state = "robot_old"; - name = "Cyborg Statue"; pixel_x = -9; pixel_y = 2 }, diff --git a/_maps/map_files/Deltastation/DeltaStation2.dmm b/_maps/map_files/Deltastation/DeltaStation2.dmm index da78c387447..430081ae591 100644 --- a/_maps/map_files/Deltastation/DeltaStation2.dmm +++ b/_maps/map_files/Deltastation/DeltaStation2.dmm @@ -46594,8 +46594,7 @@ /turf/open/floor/wood, /area/crew_quarters/heads/captain) "bMJ" = ( -/obj/structure/sign/goldenplaque{ - name = "The Most Robust Captain Award for Robustness"; +/obj/structure/sign/goldenplaque/captain{ pixel_x = 32 }, /turf/open/floor/wood, @@ -47907,13 +47906,8 @@ }, /area/aisat) "bPb" = ( -/obj/structure/showcase{ - density = 0; - desc = "An old, deactivated cyborg. Whilst once actively used to guard against intruders, it now simply intimidates them with its cold, steely gaze."; +/obj/structure/showcase/cyborg/old{ dir = 4; - icon = 'icons/mob/robots.dmi'; - icon_state = "robot_old"; - name = "Cyborg Statue"; pixel_x = -9; pixel_y = 2 }, @@ -47968,13 +47962,8 @@ /turf/open/floor/plating, /area/ai_monitored/turret_protected/aisat_interior) "bPg" = ( -/obj/structure/showcase{ - density = 0; - desc = "An old, deactivated cyborg. Whilst once actively used to guard against intruders, it now simply intimidates them with its cold, steely gaze."; +/obj/structure/showcase/cyborg/old{ dir = 4; - icon = 'icons/mob/robots.dmi'; - icon_state = "robot_old"; - name = "Cyborg Statue"; pixel_x = -9; pixel_y = 2 }, @@ -48018,13 +48007,8 @@ /turf/open/floor/plasteel/grimy, /area/ai_monitored/turret_protected/aisat_interior) "bPm" = ( -/obj/structure/showcase{ - density = 0; - desc = "An old, deactivated cyborg. Whilst once actively used to guard against intruders, it now simply intimidates them with its cold, steely gaze."; +/obj/structure/showcase/cyborg/old{ dir = 8; - icon = 'icons/mob/robots.dmi'; - icon_state = "robot_old"; - name = "Cyborg Statue"; pixel_x = 9; pixel_y = 2 }, @@ -48078,13 +48062,8 @@ /turf/open/floor/plasteel/vault, /area/ai_monitored/turret_protected/aisat_interior) "bPr" = ( -/obj/structure/showcase{ - density = 0; - desc = "An old, deactivated cyborg. Whilst once actively used to guard against intruders, it now simply intimidates them with its cold, steely gaze."; +/obj/structure/showcase/cyborg/old{ dir = 8; - icon = 'icons/mob/robots.dmi'; - icon_state = "robot_old"; - name = "Cyborg Statue"; pixel_x = 9; pixel_y = 2 }, @@ -50681,13 +50660,8 @@ /turf/closed/wall/r_wall, /area/ai_monitored/turret_protected/aisat_interior) "bTA" = ( -/obj/structure/showcase{ - density = 0; - desc = "An old, deactivated cyborg. Whilst once actively used to guard against intruders, it now simply intimidates them with its cold, steely gaze."; +/obj/structure/showcase/cyborg/old{ dir = 4; - icon = 'icons/mob/robots.dmi'; - icon_state = "robot_old"; - name = "Cyborg Statue"; pixel_x = -9; pixel_y = 2 }, @@ -50737,13 +50711,8 @@ /turf/closed/wall/r_wall, /area/ai_monitored/turret_protected/aisat_interior) "bTF" = ( -/obj/structure/showcase{ - density = 0; - desc = "An old, deactivated cyborg. Whilst once actively used to guard against intruders, it now simply intimidates them with its cold, steely gaze."; +/obj/structure/showcase/cyborg/old{ dir = 4; - icon = 'icons/mob/robots.dmi'; - icon_state = "robot_old"; - name = "Cyborg Statue"; pixel_x = -9; pixel_y = 2 }, @@ -50792,13 +50761,8 @@ /turf/open/floor/plasteel/grimy, /area/ai_monitored/turret_protected/aisat_interior) "bTL" = ( -/obj/structure/showcase{ - density = 0; - desc = "An old, deactivated cyborg. Whilst once actively used to guard against intruders, it now simply intimidates them with its cold, steely gaze."; +/obj/structure/showcase/cyborg/old{ dir = 8; - icon = 'icons/mob/robots.dmi'; - icon_state = "robot_old"; - name = "Cyborg Statue"; pixel_x = 9; pixel_y = 2 }, @@ -54955,9 +54919,7 @@ dir = 8 }, /obj/item/twohanded/required/kirbyplants/random, -/obj/structure/sign/kiddieplaque{ - desc = "A long list of rules to be followed when in the library, extolling the virtues of being quiet at all times and threatening those who would dare eat hot food inside."; - name = "Library Rules Sign"; +/obj/structure/sign/kiddieplaque/library{ pixel_x = -32 }, /turf/open/floor/wood, @@ -54995,9 +54957,7 @@ }, /area/library) "cbD" = ( -/obj/structure/sign/kiddieplaque{ - desc = "A long list of rules to be followed when in the library, extolling the virtues of being quiet at all times and threatening those who would dare eat hot food inside."; - name = "Library Rules Sign"; +/obj/structure/sign/kiddieplaque/library{ pixel_x = -32 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, @@ -64745,9 +64705,7 @@ dir = 8 }, /obj/machinery/disposal/bin, -/obj/structure/sign/kiddieplaque{ - desc = "A long list of rules to be followed when in the library, extolling the virtues of being quiet at all times and threatening those who would dare eat hot food inside."; - name = "Library Rules Sign"; +/obj/structure/sign/kiddieplaque/library{ pixel_x = -32 }, /obj/structure/disposalpipe/trunk{ @@ -65551,12 +65509,7 @@ /obj/structure/window/reinforced{ dir = 4 }, -/obj/structure/showcase{ - desc = "A stand with an empty old Nanotrasen Corporation combat mech bolted to it. It is described as the premier unit used to defend corporate interests and employees."; - icon = 'icons/mecha/mecha.dmi'; - icon_state = "marauder"; - name = "combat mech exhibit" - }, +/obj/structure/showcase/mecha/marauder, /obj/effect/decal/cleanable/dirt, /turf/open/floor/plasteel/grimy, /area/bridge/showroom/corporate) @@ -65623,12 +65576,8 @@ /obj/structure/window/reinforced{ dir = 8 }, -/obj/structure/showcase{ - desc = "A flimsy model of a standard Nanotrasen automated loyalty implant machine. With secure positioning harnesses and a robotic surgical injector, brain damage and other serious medical anomalies are now up to 60% less likely!"; - icon = 'icons/obj/machines/implantchair.dmi'; - icon_state = "implantchair"; +/obj/structure/showcase/machinery/implanter{ layer = 2.7; - name = "Nanotrasen automated loyalty implanter exhibit"; pixel_y = 4 }, /turf/open/floor/plasteel/grimy, @@ -100724,10 +100673,7 @@ /obj/machinery/light{ dir = 1 }, -/obj/structure/sign/atmosplaque{ - desc = "A plaque commemorating the fallen, may they rest in peace, forever asleep amongst the stars. Someone has drawn a picture of a crying badger at the bottom."; - icon_state = "kiddieplaque"; - name = "Remembrance Plaque"; +/obj/structure/sign/kiddieplaque/badger{ pixel_y = 32 }, /turf/open/floor/plasteel/vault{ diff --git a/_maps/map_files/MetaStation/MetaStation.dmm b/_maps/map_files/MetaStation/MetaStation.dmm index f5763a61ee2..3a716b0b0f2 100644 --- a/_maps/map_files/MetaStation/MetaStation.dmm +++ b/_maps/map_files/MetaStation/MetaStation.dmm @@ -8054,9 +8054,7 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 }, -/obj/structure/sign/kiddieplaque{ - desc = "A long list of rules to be followed when in the library, extolling the virtues of being quiet at all times and threatening those who would dare eat hot food inside."; - name = "Library Rules Sign"; +/obj/structure/sign/kiddieplaque/library{ pixel_y = -32 }, /turf/open/floor/plasteel/neutral/corner{ @@ -24572,13 +24570,8 @@ /turf/open/floor/plasteel/black, /area/ai_monitored/turret_protected/ai) "aVn" = ( -/obj/structure/showcase{ - density = 0; - desc = "An old, deactivated cyborg. Whilst once actively used to guard against intruders, it now simply intimidates them with its cold, steely gaze."; +/obj/structure/showcase/cyborg/old{ dir = 2; - icon = 'icons/mob/robots.dmi'; - icon_state = "robot_old"; - name = "Cyborg Statue"; pixel_y = 20 }, /turf/open/floor/plasteel/black, @@ -24589,13 +24582,8 @@ dir = 2; network = list("RD") }, -/obj/structure/showcase{ - density = 0; - desc = "An old, deactivated cyborg. Whilst once actively used to guard against intruders, it now simply intimidates them with its cold, steely gaze."; +/obj/structure/showcase/cyborg/old{ dir = 2; - icon = 'icons/mob/robots.dmi'; - icon_state = "robot_old"; - name = "Cyborg Statue"; pixel_y = 20 }, /obj/structure/cable{ @@ -26249,13 +26237,8 @@ dir = 4; network = list("RD") }, -/obj/structure/showcase{ - density = 0; - desc = "An old, deactivated cyborg. Whilst once actively used to guard against intruders, it now simply intimidates them with its cold, steely gaze."; +/obj/structure/showcase/cyborg/old{ dir = 4; - icon = 'icons/mob/robots.dmi'; - icon_state = "robot_old"; - name = "Cyborg Statue"; pixel_x = -9; pixel_y = 2 }, @@ -26281,13 +26264,8 @@ /turf/open/floor/circuit, /area/ai_monitored/turret_protected/ai) "aYB" = ( -/obj/structure/showcase{ - density = 0; - desc = "An old, deactivated cyborg. Whilst once actively used to guard against intruders, it now simply intimidates them with its cold, steely gaze."; +/obj/structure/showcase/cyborg/old{ dir = 8; - icon = 'icons/mob/robots.dmi'; - icon_state = "robot_old"; - name = "Cyborg Statue"; pixel_x = 9; pixel_y = 2 }, @@ -28117,13 +28095,8 @@ }, /area/security/checkpoint/engineering) "bbF" = ( -/obj/structure/showcase{ - density = 0; - desc = "An old, deactivated cyborg. Whilst once actively used to guard against intruders, it now simply intimidates them with its cold, steely gaze."; +/obj/structure/showcase/cyborg/old{ dir = 4; - icon = 'icons/mob/robots.dmi'; - icon_state = "robot_old"; - name = "Cyborg Statue"; pixel_x = -9; pixel_y = 2 }, @@ -28152,13 +28125,8 @@ dir = 8; network = list("RD") }, -/obj/structure/showcase{ - density = 0; - desc = "An old, deactivated cyborg. Whilst once actively used to guard against intruders, it now simply intimidates them with its cold, steely gaze."; +/obj/structure/showcase/cyborg/old{ dir = 8; - icon = 'icons/mob/robots.dmi'; - icon_state = "robot_old"; - name = "Cyborg Statue"; pixel_x = 9; pixel_y = 2 }, @@ -33363,13 +33331,8 @@ /turf/open/floor/plasteel/black, /area/ai_monitored/turret_protected/ai) "blF" = ( -/obj/structure/showcase{ - density = 0; - desc = "An old, deactivated cyborg. Whilst once actively used to guard against intruders, it now simply intimidates them with its cold, steely gaze."; +/obj/structure/showcase/cyborg/old{ dir = 2; - icon = 'icons/mob/robots.dmi'; - icon_state = "robot_old"; - name = "Cyborg Statue"; pixel_y = 20 }, /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ @@ -33384,13 +33347,8 @@ /turf/open/floor/plasteel/black, /area/ai_monitored/turret_protected/aisat_interior) "blH" = ( -/obj/structure/showcase{ - density = 0; - desc = "An old, deactivated cyborg. Whilst once actively used to guard against intruders, it now simply intimidates them with its cold, steely gaze."; +/obj/structure/showcase/cyborg/old{ dir = 2; - icon = 'icons/mob/robots.dmi'; - icon_state = "robot_old"; - name = "Cyborg Statue"; pixel_y = 20 }, /turf/open/floor/plasteel/darkblue/corner{ @@ -34372,13 +34330,8 @@ dir = 1; pixel_y = 1 }, -/obj/structure/showcase{ - density = 0; - desc = "An old, deactivated cyborg. Whilst once actively used to guard against intruders, it now simply intimidates them with its cold, steely gaze."; +/obj/structure/showcase/cyborg/old{ dir = 8; - icon = 'icons/mob/robots.dmi'; - icon_state = "robot_old"; - name = "Cyborg Statue"; pixel_x = 9; pixel_y = 2 }, @@ -34394,13 +34347,8 @@ /turf/closed/wall/r_wall, /area/aisat) "bnw" = ( -/obj/structure/showcase{ - density = 0; - desc = "An old, deactivated cyborg. Whilst once actively used to guard against intruders, it now simply intimidates them with its cold, steely gaze."; +/obj/structure/showcase/cyborg/old{ dir = 4; - icon = 'icons/mob/robots.dmi'; - icon_state = "robot_old"; - name = "Cyborg Statue"; pixel_x = -9; pixel_y = 2 }, @@ -34565,13 +34513,8 @@ /turf/open/floor/plasteel/black, /area/ai_monitored/storage/satellite) "bnI" = ( -/obj/structure/showcase{ - density = 0; - desc = "An old, deactivated cyborg. Whilst once actively used to guard against intruders, it now simply intimidates them with its cold, steely gaze."; +/obj/structure/showcase/cyborg/old{ dir = 8; - icon = 'icons/mob/robots.dmi'; - icon_state = "robot_old"; - name = "Cyborg Statue"; pixel_x = 9; pixel_y = 2 }, @@ -36941,13 +36884,8 @@ /area/aisat) "brU" = ( /obj/structure/window/reinforced, -/obj/structure/showcase{ - density = 0; - desc = "An old, deactivated cyborg. Whilst once actively used to guard against intruders, it now simply intimidates them with its cold, steely gaze."; +/obj/structure/showcase/cyborg/old{ dir = 8; - icon = 'icons/mob/robots.dmi'; - icon_state = "robot_old"; - name = "Cyborg Statue"; pixel_x = 9; pixel_y = 2 }, @@ -38800,13 +38738,8 @@ /area/engine/break_room) "bvw" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, -/obj/structure/showcase{ - density = 0; - desc = "An old, deactivated cyborg. Whilst once actively used to guard against intruders, it now simply intimidates them with its cold, steely gaze."; +/obj/structure/showcase/cyborg/old{ dir = 2; - icon = 'icons/mob/robots.dmi'; - icon_state = "robot_old"; - name = "Cyborg Statue"; pixel_y = 20 }, /turf/open/floor/plasteel/grimy, @@ -38824,13 +38757,8 @@ /obj/machinery/light_switch{ pixel_y = 28 }, -/obj/structure/showcase{ - density = 0; - desc = "An old, deactivated cyborg. Whilst once actively used to guard against intruders, it now simply intimidates them with its cold, steely gaze."; +/obj/structure/showcase/cyborg/old{ dir = 2; - icon = 'icons/mob/robots.dmi'; - icon_state = "robot_old"; - name = "Cyborg Statue"; pixel_y = 20 }, /turf/open/floor/plasteel/grimy, @@ -43162,13 +43090,8 @@ /turf/open/floor/circuit/green/telecomms/mainframe, /area/tcommsat/server) "bEg" = ( -/obj/structure/showcase{ - density = 0; - desc = "An old, deactivated cyborg. Whilst once actively used to guard against intruders, it now simply intimidates them with its cold, steely gaze."; +/obj/structure/showcase/cyborg/old{ dir = 2; - icon = 'icons/mob/robots.dmi'; - icon_state = "robot_old"; - name = "Cyborg Statue"; pixel_y = 20 }, /turf/open/floor/plasteel/black/telecomms/mainframe, @@ -47751,12 +47674,7 @@ /area/teleporter) "bNa" = ( /obj/structure/window/reinforced, -/obj/structure/showcase{ - desc = "A stand with an retired construction mech bolted to it. The clamps are rated at 9300PSI. It seems to be falling apart."; - icon = 'icons/mecha/mecha.dmi'; - icon_state = "firefighter"; - name = "construction mech exhibit" - }, +/obj/structure/showcase/mecha/ripley, /obj/structure/cable/yellow{ d1 = 1; d2 = 2; @@ -47766,10 +47684,7 @@ /turf/open/floor/carpet, /area/bridge/showroom/corporate) "bNb" = ( -/obj/structure/sign/atmosplaque{ - desc = "A guide to the exhibit, detailing the constructive and destructive applications of modern repair drones, as well as the development of the incorruptible cyborg servants of tomorrow, available today."; - icon_state = "kiddieplaque"; - name = "\improper 'Perfect Drone' sign"; +/obj/structure/sign/kiddieplaque/perfect_drone{ pixel_y = 32 }, /obj/machinery/droneDispenser, @@ -47777,12 +47692,7 @@ /turf/open/floor/carpet, /area/bridge/showroom/corporate) "bNc" = ( -/obj/structure/showcase{ - desc = "A stand with an empty old Nanotrasen Corporation combat mech bolted to it. It is described as the premier unit used to defend corporate interests and employees."; - icon = 'icons/mecha/mecha.dmi'; - icon_state = "marauder"; - name = "combat mech exhibit" - }, +/obj/structure/showcase/mecha/marauder, /obj/structure/window/reinforced{ dir = 4 }, @@ -47872,26 +47782,16 @@ icon_state = "1-2" }, /obj/structure/window/reinforced, -/obj/structure/showcase{ - desc = "Signs describe how cloning pods like these ensure that every Nanotrasen employee can carry out their contracts in full, even in the unlikely event of their catastrophic death. Hopefully they aren't all made of cardboard, like this one."; - icon = 'icons/obj/cloning.dmi'; - icon_state = "pod_0"; +/obj/structure/showcase/machinery/cloning_pod{ layer = 4; - name = "cloning pod exhibit"; pixel_x = 2; pixel_y = 5 }, /turf/open/floor/carpet, /area/bridge/showroom/corporate) "bNj" = ( -/obj/structure/showcase{ - desc = "A stand with a model of the perfect Nanotrasen Employee bolted to it. Signs indicate it is robustly genetically engineered, as well as being ruthlessly loyal."; - name = "'Perfect Man' employee exhibit" - }, -/obj/structure/sign/atmosplaque{ - desc = "A guide to the exhibit, explaining how recent developments in loyalty implant and cloning technologies by Nanotrasen Corporation have led to the development and the effective immortality of the 'perfect man', the loyal Nanotrasen Employee."; - icon_state = "kiddieplaque"; - name = "\improper 'Perfect Man' sign"; +/obj/structure/showcase/perfect_employee, +/obj/structure/sign/kiddieplaque/perfect_man{ pixel_y = 32 }, /obj/structure/window/reinforced, @@ -47905,12 +47805,8 @@ }, /obj/structure/window/reinforced, /obj/effect/decal/cleanable/cobweb/cobweb2, -/obj/structure/showcase{ - desc = "A flimsy model of a standard Nanotrasen automated loyalty implant machine. With secure positioning harnesses and a robotic surgical injector, brain damage and other serious medical anomalies are now up to 60% less likely!"; - icon = 'icons/obj/machines/implantchair.dmi'; - icon_state = "implantchair"; +/obj/structure/showcase/machinery/implanter{ layer = 2.7; - name = "Nanotrasen automated loyalty implanter exhibit"; pixel_y = 4 }, /turf/open/floor/carpet, @@ -49915,12 +49811,8 @@ /turf/open/floor/wood, /area/bridge/showroom/corporate) "bRz" = ( -/obj/structure/showcase{ - desc = "The famous Nanotrasen-brand microwave, the multi-purpose cooking appliance every station needs! This one appears to be drawn onto a cardboard box."; +/obj/structure/showcase/machinery/microwave{ dir = 1; - icon = 'icons/obj/kitchen.dmi'; - icon_state = "mw"; - name = "Nanotrasen-brand microwave"; pixel_y = 2 }, /obj/structure/table/wood, @@ -49998,12 +49890,8 @@ d2 = 8; icon_state = "4-8" }, -/obj/structure/showcase{ - desc = "A slightly battered looking TV. Various Nanotrasen infomercials play on a loop, accompanied by a jaunty tune."; +/obj/structure/showcase/machinery/tv{ dir = 1; - icon = 'icons/obj/computer.dmi'; - icon_state = "television"; - name = "Nanotrasen corporate newsfeed"; pixel_x = 2; pixel_y = 3 }, @@ -76547,10 +76435,7 @@ /turf/open/floor/carpet, /area/chapel/main) "cPE" = ( -/obj/structure/sign/atmosplaque{ - desc = "A plaque commemorating the fallen, may they rest in peace, forever asleep amongst the stars. Someone has drawn a picture of a crying badger at the bottom."; - icon_state = "kiddieplaque"; - name = "Remembrance Plaque"; +/obj/structure/sign/kiddieplaque/badger{ pixel_y = 32 }, /obj/item/reagent_containers/food/snacks/grown/poppy{ diff --git a/_maps/map_files/OmegaStation/OmegaStation.dmm b/_maps/map_files/OmegaStation/OmegaStation.dmm index 29ca30455b0..8747d0a6edb 100644 --- a/_maps/map_files/OmegaStation/OmegaStation.dmm +++ b/_maps/map_files/OmegaStation/OmegaStation.dmm @@ -2145,8 +2145,7 @@ d2 = 8; icon_state = "2-8" }, -/obj/structure/sign/goldenplaque{ - name = "The Most Robust Captain Award for Robustness"; +/obj/structure/sign/goldenplaque/captain{ pixel_x = 32 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, @@ -25832,10 +25831,7 @@ /turf/open/floor/plasteel, /area/library) "aRa" = ( -/obj/structure/sign/kiddieplaque{ - desc = "A long list of rules to be followed when in the library, extolling the virtues of being quiet at all times and threatening those who would dare eat hot food inside."; - name = "Library Rules Sign" - }, +/obj/structure/sign/kiddieplaque/library, /turf/closed/wall, /area/library) "aRb" = ( @@ -33827,10 +33823,7 @@ /area/chapel/main) "bgb" = ( /obj/structure/bookcase, -/obj/structure/sign/atmosplaque{ - desc = "A plaque commemorating the fallen, may they rest in peace, forever asleep amongst the stars. Someone has drawn a picture of a crying badger at the bottom."; - icon_state = "kiddieplaque"; - name = "Remembrance Plaque"; +/obj/structure/sign/kiddieplaque/badger{ pixel_y = 32 }, /obj/machinery/light/small{ @@ -34861,10 +34854,7 @@ /obj/machinery/light/small{ dir = 1 }, -/obj/structure/sign/atmosplaque{ - desc = "A plaque commemorating the fallen, may they rest in peace, forever asleep amongst the stars. Someone has drawn a picture of a crying badger at the bottom."; - icon_state = "kiddieplaque"; - name = "Remembrance Plaque"; +/obj/structure/sign/kiddieplaque/badger{ pixel_y = 32 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ diff --git a/_maps/map_files/PubbyStation/PubbyStation.dmm b/_maps/map_files/PubbyStation/PubbyStation.dmm index 828313f1de3..9ccfea48e0a 100644 --- a/_maps/map_files/PubbyStation/PubbyStation.dmm +++ b/_maps/map_files/PubbyStation/PubbyStation.dmm @@ -3033,13 +3033,8 @@ /area/security/main) "ahh" = ( /obj/structure/lattice/catwalk, -/obj/structure/showcase{ - density = 0; - desc = "An old, deactivated cyborg. Whilst once actively used to guard against intruders, it now simply intimidates them with its cold, steely gaze."; +/obj/structure/showcase/cyborg/old{ dir = 2; - icon = 'icons/mob/robots.dmi'; - icon_state = "robot_old"; - name = "Cyborg Statue"; pixel_y = 20 }, /turf/open/space, @@ -29070,10 +29065,7 @@ /turf/open/floor/engine, /area/science/explab) "blV" = ( -/obj/structure/sign/atmosplaque{ - desc = "A guide to the drone shell dispenser, detailing the constructive and destructive applications of modern repair drones, as well as the development of the incorruptible cyborg servants of tomorrow, available today."; - icon_state = "kiddieplaque"; - name = "\improper 'Perfect Drone' sign"; +/obj/structure/sign/kiddieplaque/perfect_drone{ pixel_y = 32 }, /turf/open/floor/engine, diff --git a/_maps/map_files/generic/CentCom.dmm b/_maps/map_files/generic/CentCom.dmm index 0e8d221aa14..b6c0b13a53d 100644 --- a/_maps/map_files/generic/CentCom.dmm +++ b/_maps/map_files/generic/CentCom.dmm @@ -5499,8 +5499,7 @@ /area/centcom/ferry) "oU" = ( /obj/structure/dresser, -/obj/structure/sign/goldenplaque{ - name = "The Most Robust Captain Award for Robustness"; +/obj/structure/sign/goldenplaque/captain{ pixel_x = 32 }, /turf/open/floor/plasteel/vault{ @@ -10987,9 +10986,7 @@ /area/tdome/tdomeobserve) "CE" = ( /obj/structure/table/wood, -/obj/structure/sign/atmosplaque{ - desc = "This plaque commemorates those who have fallen in glorious combat. For all the charred, dizzy, and beaten men who have died in its hands."; - name = "Thunderdome Plaque"; +/obj/structure/sign/atmosplaque/thunderdome{ pixel_y = -32 }, /obj/item/clothing/accessory/medal/gold{ @@ -11007,9 +11004,7 @@ /area/tdome/tdomeobserve) "CG" = ( /obj/structure/table/wood, -/obj/structure/sign/atmosplaque{ - desc = "This plaque commemorates those who have fallen in glorious combat. For all the charred, dizzy, and beaten men who have died in its hands."; - name = "Thunderdome Plaque"; +/obj/structure/sign/atmosplaque/thunderdome{ pixel_y = -32 }, /obj/item/clothing/accessory/medal{ diff --git a/code/game/objects/structures/ghost_role_spawners.dm b/code/game/objects/structures/ghost_role_spawners.dm index f0160ad1c8c..6e4c56000ce 100644 --- a/code/game/objects/structures/ghost_role_spawners.dm +++ b/code/game/objects/structures/ghost_role_spawners.dm @@ -478,7 +478,7 @@ assignedrole = "Ancient Crew" /obj/effect/mob_spawn/human/oldsec/Destroy() - new/obj/structure/showcase/oldpod/used(get_turf(src)) + new/obj/structure/showcase/machinery/oldpod/used(drop_location()) return ..() /obj/effect/mob_spawn/human/oldeng @@ -502,7 +502,7 @@ assignedrole = "Ancient Crew" /obj/effect/mob_spawn/human/oldeng/Destroy() - new/obj/structure/showcase/oldpod/used(get_turf(src)) + new/obj/structure/showcase/machinery/oldpod/used(drop_location()) return ..() /obj/effect/mob_spawn/human/oldsci @@ -525,5 +525,5 @@ assignedrole = "Ancient Crew" /obj/effect/mob_spawn/human/oldsci/Destroy() - new/obj/structure/showcase/oldpod/used(get_turf(src)) + new/obj/structure/showcase/machinery/oldpod/used(drop_location()) return ..() diff --git a/code/game/objects/structures/showcase.dm b/code/game/objects/structures/showcase.dm index a755b3e88f8..61f4efa8248 100644 --- a/code/game/objects/structures/showcase.dm +++ b/code/game/objects/structures/showcase.dm @@ -39,16 +39,70 @@ icon = 'icons/obj/cloning.dmi' icon_state = "pod_g" -/obj/structure/showcase/oldpod +/obj/structure/showcase/machinery/oldpod name = "damaged cyrogenic pod" desc = "A damaged cyrogenic pod long since lost to time, including its former occupant..." icon = 'icons/obj/cryogenic2.dmi' icon_state = "sleeper-open" -/obj/structure/showcase/oldpod/used +/obj/structure/showcase/machinery/oldpod/used name = "opened cyrogenic pod" desc = "Cyrogenic pod that has recently discharged its occupand. The pod appears non-functional." +/obj/structure/showcase/cyborg/old + name = "Cyborg Statue" + desc = "An old, deactivated cyborg. Whilst once actively used to guard against intruders, it now simply intimidates them with its cold, steely gaze." + icon = 'icons/mob/robots.dmi' + icon_state = "robot_old" + density = FALSE + +/obj/structure/showcase/mecha/marauder + name = "combat mech exhibit" + desc = "A stand with an empty old Nanotrasen Corporation combat mech bolted to it. It is described as the premier unit used to defend corporate interests and employees." + icon = 'icons/mecha/mecha.dmi' + icon_state = "marauder" + +/obj/structure/showcase/mecha/ripley + name = "construction mech exhibit" + desc = "A stand with an retired construction mech bolted to it. The clamps are rated at 9300PSI. It seems to be falling apart." + icon = 'icons/mecha/mecha.dmi' + icon_state = "firefighter" + +/obj/structure/showcase/machinery/implanter + name = "Nanotrasen automated mindshield implanter exhibit" + desc = "A flimsy model of a standard Nanotrasen automated mindshield implant machine. With secure positioning harnesses and a robotic surgical injector, brain damage and other serious medical anomalies are now up to 60% less likely!" + icon = 'icons/obj/machines/implantchair.dmi' + icon_state = "implantchair" + +/obj/structure/showcase/machinery/microwave + name = "Nanotrasen-brand microwave" + desc = "The famous Nanotrasen-brand microwave, the multi-purpose cooking appliance every station needs! This one appears to be drawn onto a cardboard box." + icon = 'icons/obj/kitchen.dmi' + icon_state = "mw" + +/obj/structure/showcase/machinery/cloning_pod + name = "cloning pod exhibit" + desc = "Signs describe how cloning pods like these ensure that every Nanotrasen employee can carry out their contracts in full, even in the unlikely event of their catastrophic death. Hopefully they aren't all made of cardboard, like this one." + icon = 'icons/obj/cloning.dmi' + icon_state = "pod_0" + +/obj/structure/showcase/perfect_employee + name = "'Perfect Man' employee exhibit" + desc = "A stand with a model of the perfect Nanotrasen Employee bolted to it. Signs indicate it is robustly genetically engineered, as well as being ruthlessly loyal." + +/obj/structure/showcase/machinery/tv + name = "Nanotrasen corporate newsfeed" + desc = "A slightly battered looking TV. Various Nanotrasen infomercials play on a loop, accompanied by a jaunty tune." + icon = 'icons/obj/computer.dmi' + icon_state = "television" + +/obj/structure/showcase/machinery/signal_decrypter + name = "subsystem signal decrypter" + desc = "A strange machine thats supposedly used to help pick up and decrypt wave signals. " + icon = 'icons/obj/machines/telecomms.dmi' + icon_state = "processor" + + //Deconstructing //Showcases can be any sprite, so it makes sense that they can't be constructed. diff --git a/code/game/objects/structures/signs.dm b/code/game/objects/structures/signs.dm index b28cb3f88de..c96d70d70bf 100644 --- a/code/game/objects/structures/signs.dm +++ b/code/game/objects/structures/signs.dm @@ -204,16 +204,39 @@ desc = "To be Robust is not an action or a way of life, but a mental state. Only those with the force of Will strong enough to act during a crisis, saving friend from foe, are truly Robust. Stay Robust my friends." icon_state = "goldenplaque" +/obj/structure/sign/goldenplaque/captain + name = "The Most Robust Captain Award for Robustness" + /obj/structure/sign/kiddieplaque name = "AI developers plaque" desc = "Next to the extremely long list of names and job titles, there is a drawing of a little child. The child appears to be retarded. Beneath the image, someone has scratched the word \"PACKETS\"" icon_state = "kiddieplaque" +/obj/structure/sign/kiddieplaque/badger + name = "Remembrance Plaque" + desc = "A plaque commemorating the fallen, may they rest in peace, forever asleep amongst the stars. Someone has drawn a picture of a crying badger at the bottom." + +/obj/structure/sign/kiddieplaque/library + name = "Library Rules Sign" + desc = "A long list of rules to be followed when in the library, extolling the virtues of being quiet at all times and threatening those who would dare eat hot food inside." + +/obj/structure/sign/kiddieplaque/perfect_man + name = "\improper 'Perfect Man' sign" + desc = "A guide to the exhibit, explaining how recent developments in mindshield implant and cloning technologies by Nanotrasen Corporation have led to the development and the effective immortality of the 'perfect man', the loyal Nanotrasen Employee." + +/obj/structure/sign/kiddieplaque/perfect_drone + name = "\improper 'Perfect Drone' sign" + desc = "A guide to the drone shell dispenser, detailing the constructive and destructive applications of modern repair drones, as well as the development of the incorruptible cyborg servants of tomorrow, available today." + /obj/structure/sign/atmosplaque name = "\improper FEA Atmospherics Division plaque" desc = "This plaque commemorates the fall of the Atmos FEA division. For all the charred, dizzy, and brittle men who have died in its hands." icon_state = "atmosplaque" +/obj/structure/sign/atmosplaque/thunderdome + name = "Thunderdome Plaque" + desc = "This plaque commemorates those who have fallen in glorious combat. For all the charred, dizzy, and beaten men who have died in its hands." + /obj/structure/sign/nanotrasen name = "\improper Nanotrasen Logo" desc = "A sign with the Nanotrasen Logo on it. Glory to Nanotrasen!" diff --git a/strings/tips.txt b/strings/tips.txt index 831dc09f7c5..42612f5f496 100644 --- a/strings/tips.txt +++ b/strings/tips.txt @@ -73,8 +73,8 @@ As the Warden, if a prisoner's crimes are heinous enough you can put them in per As the Warden, you can implant criminals you suspect might re-offend with devices that will track their location and allow you to remotely inject them with disabling chemicals. As the Warden, you can use handcuffs on orange prisoner shoes to turn them into cuffed shoes, forcing prisoners to walk and potentially thwarting an escape. As a Security Officer, communicate and coordinate with your fellow officers using the security channel (:s) to avoid confusion. -As a Security Officer, your sechuds or HUDsunglasses can not only see crewmates' job assignments and criminal status, but also if they are loyalty implanted. Use this to your advantage in a revolution to definitively tell who is on your side! -As a Security Officer, loyalty implants can only prevent someone from being turned into a cultist: unlike revolutionaries, it will not de-cult them if they have already been converted. +As a Security Officer, your sechuds or HUDsunglasses can not only see crewmates' job assignments and criminal status, but also if they are mindshield implanted. Use this to your advantage in a revolution to definitively tell who is on your side! +As a Security Officer, mindshield implants can only prevent someone from being turned into a cultist: unlike revolutionaries, it will not de-cult them if they have already been converted. As a Security Officer, examining someone while wearing sechuds or HUDsunglasses will let you set their arrest level, which will cause Beepsky and other security bots to chase after them. As a Security Officer, implanting a gang member the first time will deconvert them, but destroy the implant. You must implant them a second time to protect them from further conversion attempts. Keep in mind that gang members have ways to destroy implants in people! As the Detective, people leave fingerprints everywhere and on everything. With the exception of white latex, gloves will hide them. All is not lost, however, as gloves leave fibers specific to their kind such as black or nitrile, pointing to a general department. @@ -145,8 +145,8 @@ As the Blob, removing strong blobs, resource nodes, factories, and nodes will gi As the Blob, talking will send a message to all other overminds and all Blobbernauts, allowing you to direct attacks and coordinate. As a Blobbernaut, you can communicate with overminds and other Blobbernauts via :b. As a Blobbernaut, your HUD shows your health and the core health of the overmind that created you. -As a Revolutionary, you cannot convert a head of staff or someone who has a loyalty implant, such as a security officer or those they implant. Implants can however be surgically removed, and do not carry over with cloning. Take control of medbay to keep control of conversions! -As a Revolutionary, cargo can be your best friend or your worst nightmare. In the best case scenario you will be able to order a limitless amount of guns and armor, in the worst case scenario security will take control and order a limitless number of loyalty implants to turn your fellow revolutionaries against you. +As a Revolutionary, you cannot convert a head of staff or someone who has a mindshield implant, such as a security officer or those they implant. Implants can however be surgically removed, and do not carry over with cloning. Take control of medbay to keep control of conversions! +As a Revolutionary, cargo can be your best friend or your worst nightmare. In the best case scenario you will be able to order a limitless amount of guns and armor, in the worst case scenario security will take control and order a limitless number of mindshield implants to turn your fellow revolutionaries against you. As a Revolutionary, your main power comes from how quickly you spread. Convert people as fast as you can and overwhelm the heads of staff before security can arm up. As a Changeling, the Extract DNA sting counts for your genome absorb objective, but does not let you respec your powers. As a Changeling, you can absorb someone by strangling them and using the Absorb verb; this gives you the ability to rechoose your powers, the DNA of whoever you absorbed, the memory of the absorbed, and some samples of things the absorbed said. @@ -180,7 +180,7 @@ As a Wizard, the fireball spell performs very poorly at close range, as it can e As a Wizard, summoning guns will turn a large portion of the crew against themselves, but will also give everyone anything from a pea shooter to a BFG 9000. Use at your own risk! As a Wizard, the staff of chaos can fire any type of bolts from the magical wands. This can range from bolts of instant death to healing or reviving someone. As a Wizard, most spells become unusable if you are not wearing your robe, hat, and sandals. -As a Gangster, you can destroy loyalty implants with an implant breaker, letting you reconvert that person. +As a Gangster, you can destroy mindshield implants with an implant breaker, letting you reconvert that person. As a Gangster, your influence is based on how many areas you have tagged and how many people are wearing your gang's outfit; more areas and more people wearing the outfit will give you more influence. As a Gangster, your gang outfits are very robust, giving moderate resistances to most direct damage at the cost of stealth. As a Gang Boss, don't wait too long to promote lieutenants! If you get caught by security or enemy gangsters, hopefully you have a backup.