diff --git a/_maps/map_files/Delta/delta.dmm b/_maps/map_files/Delta/delta.dmm index 9ef925992a6..4620c5621a8 100644 --- a/_maps/map_files/Delta/delta.dmm +++ b/_maps/map_files/Delta/delta.dmm @@ -14798,12 +14798,7 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 4 }, -/turf/simulated/floor/plasteel{ - desc = "\"This is a plaque in honour of our comrades on the G4407 Stations. Hopefully TG4407 model can live up to your fame and fortune.\" Scratched in beneath that is a crude image of a meteor and a spaceman. The spaceman is laughing. The meteor is exploding."; - dir = 4; - icon_state = "plaque"; - name = "Comemmorative Plaque" - }, +/turf/simulated/floor/plasteel/goonplaque, /area/hallway/primary/fore) "aTk" = ( /obj/effect/decal/cleanable/dirt, diff --git a/_maps/map_files/MetaStation/MetaStation.dmm b/_maps/map_files/MetaStation/MetaStation.dmm index 5c85dab4708..d0c08322510 100644 --- a/_maps/map_files/MetaStation/MetaStation.dmm +++ b/_maps/map_files/MetaStation/MetaStation.dmm @@ -30429,10 +30429,7 @@ }, /area/gateway) "bQC" = ( -/obj/structure/sign/securearea{ - desc = "Under the painting a plaque reads: 'While the meat grinder may not have spared you, fear not. Not one part of you has gone to waste... You were delicious.'"; - icon_state = "monkey_painting"; - name = "Mr. Deempisi portrait"; +/obj/structure/sign/monkey_paint{ pixel_y = -28 }, /obj/machinery/economy/vending/boozeomat, @@ -31557,9 +31554,7 @@ /turf/simulated/floor/wood, /area/assembly/showroom) "bTN" = ( -/obj/structure/sign/kiddieplaque{ - 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."; - name = "\improper 'Perfect Man' sign"; +/obj/structure/sign/kiddieplaque/perfect_man{ pixel_y = 32 }, /obj/structure/showcase/machinery{ @@ -42754,10 +42749,7 @@ /turf/simulated/floor/plating, /area/maintenance/starboard) "cCs" = ( -/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/remembrance{ pixel_y = 32 }, /obj/machinery/light/small{ @@ -53941,9 +53933,7 @@ /area/toxins/explab) "eQf" = ( /obj/structure/table/wood, -/obj/structure/sign/kiddieplaque{ - 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."; - name = "\improper 'Perfect Drone' sign"; +/obj/structure/sign/kiddieplaque/perfect_drone{ pixel_y = 32 }, /obj/structure/showcase/machinery{ @@ -57715,11 +57705,7 @@ d2 = 2; icon_state = "1-2" }, -/turf/simulated/floor/plasteel{ - desc = "Epsilon Eridani Sector - 'Meta' Class Outpost - Commissioned 11/03/2557 - NSS Cerebron"; - icon_state = "plaque"; - name = "Commission Plaque" - }, +/turf/simulated/floor/plasteel/goonplaque/commission, /area/bridge/hall) "gHu" = ( /obj/structure/table/wood, @@ -69310,9 +69296,7 @@ /turf/simulated/floor/plating, /area/maintenance/aft2) "mik" = ( -/obj/structure/sign/goldenplaque{ - desc = "A golden plaque commemorating excellence in medical care. God only knows how this ended up in this medbay."; - name = "The Hippocratic Award for Excellence in Medicine"; +/obj/structure/sign/goldenplaque/medical{ pixel_x = -32 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, diff --git a/_maps/map_files/cerestation/cerestation.dmm b/_maps/map_files/cerestation/cerestation.dmm index 3c79a95ddde..ef3dbc70380 100644 --- a/_maps/map_files/cerestation/cerestation.dmm +++ b/_maps/map_files/cerestation/cerestation.dmm @@ -80104,10 +80104,7 @@ }, /area/toxins/lab) "tjK" = ( -/obj/structure/sign/securearea{ - desc = "Under the painting a plaque reads: 'While the meat grinder may not have spared you, fear not. Not one part of you has gone to waste... You were delicious.'"; - icon_state = "monkey_painting"; - name = "Mr. Deempisi portrait"; +/obj/structure/sign/monkey_paint{ pixel_x = -28; pixel_y = 4 }, diff --git a/_maps/map_files/cyberiad/cyberiad.dmm b/_maps/map_files/cyberiad/cyberiad.dmm index 3f2d20059a3..d9e3e8593ff 100644 --- a/_maps/map_files/cyberiad/cyberiad.dmm +++ b/_maps/map_files/cyberiad/cyberiad.dmm @@ -25006,12 +25006,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/turf/simulated/floor/plasteel{ - desc = "\"This is a plaque in honour of our comrades on the G4407 Stations. Hopefully TG4407 model can live up to your fame and fortune.\" Scratched in beneath that is a crude image of a meteor and a spaceman. The spaceman is laughing. The meteor is exploding."; - dir = 4; - icon_state = "plaque"; - name = "Comemmorative Plaque" - }, +/turf/simulated/floor/plasteel/goonplaque, /area/hallway/secondary/entry) "blt" = ( /obj/machinery/economy/vending/cigarette, @@ -30807,12 +30802,7 @@ /turf/simulated/floor/plasteel, /area/hallway/primary/starboard/east) "bzd" = ( -/turf/simulated/floor/plasteel{ - desc = "\"This is a plaque in honour of those who died in the great space lube airlock incident.\" Scratched in beneath that is a crude image of a clown and a spaceman. The spaceman is slipping. The clown is laughing."; - dir = 4; - icon_state = "plaque"; - name = "Memorial Plaque" - }, +/turf/simulated/floor/plasteel/goonplaque/memorial, /area/hallway/secondary/exit) "bze" = ( /obj/structure/sign/barsign, @@ -58489,10 +58479,7 @@ "cWo" = ( /obj/structure/table/wood, /obj/machinery/bottler, -/obj/structure/sign/securearea{ - desc = "Under the painting a plaque reads: 'While the meat grinder may not have spared you, fear not. Not one part of you has gone to waste... You were delicious.'"; - icon_state = "monkey_painting"; - name = "Mr. Deempisi portrait"; +/obj/structure/sign/monkey_paint{ pixel_x = -28; pixel_y = 4 }, diff --git a/_maps/map_files/generic/centcomm.dmm b/_maps/map_files/generic/centcomm.dmm index ada08d96f79..6590c60d1c0 100644 --- a/_maps/map_files/generic/centcomm.dmm +++ b/_maps/map_files/generic/centcomm.dmm @@ -7037,10 +7037,7 @@ "Bb" = ( /obj/structure/table/wood/fancy/royalblack, /obj/item/bikehorn/airhorn, -/turf/simulated/floor/plasteel/goonplaque{ - desc = "Nosey little bastard aren't you?"; - name = "Nosey little bastard aren't you?" - }, +/turf/simulated/floor/plasteel/goonplaque/nosey, /area/wizard_station) "Bd" = ( /obj/machinery/light/spot{ @@ -12735,9 +12732,7 @@ /turf/simulated/floor/grass, /area/tdome/tdomeobserve) "XG" = ( -/turf/simulated/floor/plasteel/goonplaque{ - name = "Violence Free Area" - }, +/turf/simulated/floor/plasteel/goonplaque/violence, /area/centcom/evac) "XH" = ( /obj/structure/flora/ausbushes/grassybush, diff --git a/code/game/objects/structures/signs.dm b/code/game/objects/structures/signs.dm index bb282661eaf..48f4bc58607 100644 --- a/code/game/objects/structures/signs.dm +++ b/code/game/objects/structures/signs.dm @@ -104,6 +104,11 @@ desc = "A warning sign which reads 'SECURE AREA'" icon_state = "securearea" +/obj/structure/sign/monkey_paint + name = "Mr. Deempisi portrait" + desc = "Under the painting a plaque reads: 'While the meat grinder may not have spared you, fear not. Not one part of you has gone to waste...You were delicious." + icon_state = "monkey_painting" + /obj/structure/sign/biohazard name = "\improper BIOHAZARD" desc = "A warning sign which reads 'BIOHAZARD'" @@ -186,11 +191,27 @@ 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/medical + name = "The Hippocratic Award for Excellence in Medicine" + desc = "A golden plaque commemorating excellence in medical care. God only knows how this ended up in this medbay." + /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's eyes are crossed, and is drooling. Beneath the image, someone has scratched the word \"PACKETS\"." icon_state = "kiddieplaque" +/obj/structure/sign/kiddieplaque/remembrance + 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/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 ZAS Atmospherics Division plaque" desc = "This plaque commemorates the fall of the Atmos ZAS division. For all the charred, dizzy, and brittle men who have died in its horrible hands." diff --git a/code/game/turfs/simulated/floor/plasteel_floor.dm b/code/game/turfs/simulated/floor/plasteel_floor.dm index 8c937b64fca..96e24e507c0 100644 --- a/code/game/turfs/simulated/floor/plasteel_floor.dm +++ b/code/game/turfs/simulated/floor/plasteel_floor.dm @@ -25,9 +25,25 @@ return /turf/simulated/floor/plasteel/goonplaque - icon_state = "plaque" name = "Commemorative Plaque" desc = "\"This is a plaque in honour of our comrades on the G4407 Stations. Hopefully TG4407 model can live up to your fame and fortune.\" Scratched in beneath that is a crude image of a meteor and a spaceman. The spaceman is laughing. The meteor is exploding." + icon_state = "plaque" + +/turf/simulated/floor/plasteel/goonplaque/memorial + name = "Memorial Plaque" + desc = "\"This is a plaque in honour of those who died in the great space lube airlock incident.\" Scratched in beneath that is a crude image of a clown and a spaceman. The spaceman is slipping. The clown is laughing." + +/turf/simulated/floor/plasteel/goonplaque/commission + name = "Commission Plaque" + desc = "Epsilon Eridani Sector - 'Meta' Class Outpost - Commissioned 11/03/2557 - NSS Cerebron" + +/turf/simulated/floor/plasteel/goonplaque/nosey + name = "Nosey little bastard aren't you?" + desc = "Nosey little bastard aren't you?" + +/turf/simulated/floor/plasteel/goonplaque/violence + name = "Violence Free Area" + desc = "Violence Free Area" //TODO: Make subtypes for all normal turf icons /turf/simulated/floor/plasteel/white