diff --git a/code/game/objects/structures/signs.dm b/code/game/objects/structures/signs.dm index 4afb514fe7..8befbe1800 100644 --- a/code/game/objects/structures/signs.dm +++ b/code/game/objects/structures/signs.dm @@ -22,7 +22,7 @@ return /obj/structure/sign/attackby(obj/item/tool as obj, mob/user as mob) //deconstruction - if(tool.is_screwdriver() && !istype(src, /obj/structure/sign/double)) + if(tool.is_screwdriver() && !istype(src, /obj/structure/sign/scenery) && !istype(src, /obj/structure/sign/double)) playsound(src, tool.usesound, 50, 1) to_chat(user, "You unfasten the sign with your [tool].") var/obj/item/sign/S = new(src.loc) @@ -64,14 +64,14 @@ qdel(src) else ..() -/obj/structure/sign/double/map +/obj/structure/sign/scenery/map name = "station map" desc = "A framed picture of the station." -/obj/structure/sign/double/map/left +/obj/structure/sign/scenery/map/left icon_state = "map-left" -/obj/structure/sign/double/map/right +/obj/structure/sign/scenery/map/right icon_state = "map-right" /obj/structure/sign/securearea @@ -251,6 +251,10 @@ name = "\improper ACIDIC SURFACE" icon_state = "acid" +/obj/structure/sign/warning/cold + name = "\improper EXTREME COLD ENVIRONMENT" + icon_state = "cold" + /obj/structure/sign/redcross name = "medbay" desc = "The Intergalactic symbol of Medical institutions. You'll probably get help here." @@ -321,6 +325,7 @@ desc = "A warning sign which reads XENOBIOLOGY." icon_state = "xenobio3" + //direction signs presented by the order they appear in the dmi /obj/structure/sign/directions name = "direction sign" @@ -337,221 +342,436 @@ desc = "A direction sign, pointing out the way to \the [src]." */ +//Also floor/level/deck signs in the same vein. Naming conventions! +/obj/structure/sign/levels + name = "level sign" + desc = "A level sign, claiming to know which level to find... Something on?" + icon_state = "level" + icon = 'icons/obj/decals_levels.dmi' + //engineering signs /obj/structure/sign/directions/engineering name = "\improper Engineering Department" desc = "A direction sign, pointing out the way to the Engineering Department." icon_state = "direction_eng" +/obj/structure/sign/levels/engineering + name = "\improper Engineering Department" + desc = "A level sign, stating the level to find the Engineering Department on." + icon_state = "level_eng" + /obj/structure/sign/directions/engineering/reactor name = "\improper Reactor" desc = "A direction sign, pointing out the way to the Reactor." icon_state = "direction_core" +/obj/structure/sign/levels/engineering/reactor + name = "\improper Reactor" + desc = "A level sign, stating the level to find the Reactor on." + icon_state = "level_core" + /obj/structure/sign/directions/engineering/solars name = "\improper Solar Array" desc = "A direction sign, pointing out the way to the nearest Solar Array." icon_state = "direction_solar" +/obj/structure/sign/levels/engineering/solars + name = "\improper Solar Array" + desc = "A level sign, stating the level to find the nearest Solar Array on." + icon_state = "level_solar" + /obj/structure/sign/directions/engineering/atmospherics name = "\improper Atmospherics Department" desc = "A direction sign, pointing out the way to the Atmospherics Department." icon_state = "direction_atmos" +/obj/structure/sign/levels/engineering/atmospherics + name = "\improper Atmospherics Department" + desc = "A level sign, stating the level to find the Atmospherics Department on." + icon_state = "level_atmos" + /obj/structure/sign/directions/engineering/gravgen name = "\improper Gravity Generator" desc = "A direction sign, pointing out the way to the Artificial Gravity Generator." icon_state = "direction_grav" +/obj/structure/sign/levels/engineering/gravgen + name = "\improper Gravity Generator" + desc = "A level sign, stating the level to find the Artificial Gravity Generator on." + icon_state = "level_grav" + /obj/structure/sign/directions/engineering/engeqp name = "\improper Engineering Equipment Storage" desc = "A direction sign, pointing out the way to Engineering Equipment Storage." icon_state = "direction_engeqp" +/obj/structure/sign/levels/engineering/engeqp + name = "\improper Engineering Equipment Storage" + desc = "A level sign, stating the level to find Engineering Equipment Storage on." + icon_state = "level_engeqp" + //security signs /obj/structure/sign/directions/security name = "\improper Security Department" desc = "A direction sign, pointing out the way to the Security Department." icon_state = "direction_sec" +/obj/structure/sign/levels/security + name = "\improper Security Department" + desc = "A level sign, stating the level to find the Security Department on." + icon_state = "direction_sec" + /obj/structure/sign/directions/security/armory name = "\improper Armory" desc = "A direction sign, pointing out the way to the Armory." icon_state = "direction_armory" +/obj/structure/sign/levels/security/armory + name = "\improper Armory" + desc = "A level sign, stating the level to find the Armory on." + icon_state = "direction_armory" + /obj/structure/sign/directions/security/brig name = "\improper Brig" desc = "A direction sign, pointing out the way to the Brig." icon_state = "direction_brig" +/obj/structure/sign/levels/security/brig + name = "\improper Brig" + desc = "A level sign, stating the level to find the Brig on." + icon_state = "level_brig" + /obj/structure/sign/directions/security/seceqp name = "\improper Security Equipment Storage" desc = "A direction sign, pointing out the way to Security Equipment Storage." icon_state = "direction_seceqp" +/obj/structure/sign/levels/security/seceqp + name = "\improper Security Equipment Storage" + desc = "A level sign, stating the level to find Security Equipment Storage on." + icon_state = "level_seceqp" + /obj/structure/sign/directions/security/internal_affairs name = "\improper Internal Affairs Office" desc = "A direction sign, pointing out the way to the Internal Affairs Office." icon_state = "direction_intaff" +/obj/structure/sign/levels/security/internal_affairs + name = "\improper Internal Affairs Office" + desc = "A level sign, stating the level to find the Internal Affairs Office on." + icon_state = "level_intaff" + /obj/structure/sign/directions/security/forensics name = "\improper Forensics Lab" desc = "A direction sign, pointing out the way to the Forensics Lab." icon_state = "direction_forensics" +/obj/structure/sign/levels/security/forensics + name = "\improper Forensics Lab" + desc = "A level sign, stating the level to find the Forensics Lab on." + icon_state = "level_forensics" + /obj/structure/sign/directions/security/forensics/alt icon_state = "direction_lab" +/obj/structure/sign/levels/security/forensics/alt + icon_state = "level_lab" + /obj/structure/sign/directions/security/interrogation name = "\improper Interrogations" desc = "A direction sign, pointing out the way to Interrogations." icon_state = "direction_interrogation" +/obj/structure/sign/levels/security/interrogation + name = "\improper Interrogations" + desc = "A level sign, stating the level to find Interrogations on." + icon_state = "level_interrogation" + //science signs /obj/structure/sign/directions/science name = "\improper Science Department" desc = "A direction sign, pointing out the way to the Science Department." icon_state = "direction_sci" - + +/obj/structure/sign/levels/science + name = "\improper Science Department" + desc = "A level sign, stating the level to find the Science Department on." + icon_state = "level_sci" + /obj/structure/sign/directions/science/rnd name = "\improper Research & Development" desc = "A direction sign, pointing out the way to Research & Development." icon_state = "direction_rnd" +/obj/structure/sign/levels/science/rnd + name = "\improper Research & Development" + desc = "A level sign, stating the level to find Research & Development on." + icon_state = "level_rnd" + /obj/structure/sign/directions/science/toxins name = "\improper Toxins Lab" desc = "A direction sign, pointing out the way to the Toxins Lab." icon_state = "direction_sci" +/obj/structure/sign/levels/science/toxins + name = "\improper Toxins Lab" + desc = "A level sign, stating the level to find the Toxins Lab on." + icon_state = "level_sci" + /obj/structure/sign/directions/science/robotics name = "\improper Robotics Workshop" desc = "A direction sign, pointing out the way to the Robotics Workshop." icon_state = "direction_robotics" +/obj/structure/sign/levels/science/robotics + name = "\improper Robotics Workshop" + desc = "A level sign, stating the level to find the Robotics Workshop on." + icon_state = "level_robotics" + /obj/structure/sign/directions/science/xenoarch name = "\improper Xenoarchaeology Lab" desc = "A direction sign, pointing out the way to the Xenoarchaeology Lab." icon_state = "direction_xenoarch" +/obj/structure/sign/levels/science/xenoarch + name = "\improper Xenoarchaeology Lab" + desc = "A level sign, stating the level to find the Xenoarchaeology Lab on." + icon_state = "level_xenoarch" + /obj/structure/sign/directions/science/xenobiology name = "\improper Xenobiology Lab" desc = "A direction sign, pointing out the way to the Xenobiology Lab." icon_state = "direction_xbio" +/obj/structure/sign/levels/science/xenobiology + name = "\improper Xenobiology Lab" + desc = "A level sign, stating the level to find the Xenobiology Lab on." + icon_state = "level_xbio" + /obj/structure/sign/directions/science/xenoflora name = "\improper Xenoflora Lab" desc = "A direction sign, pointing out the way to the Xenoflora Lab." icon_state = "direction_xflora" +/obj/structure/sign/levels/science/xenoflora + name = "\improper Xenoflora Lab" + desc = "A level sign, stating the level to find the Xenoflora Lab on." + icon_state = "level_xflora" + /obj/structure/sign/directions/science/exploration name = "\improper Exploration Department" desc = "A direction sign, pointing out the way to the Exploration Department." icon_state = "direction_explo" +/obj/structure/sign/levels/science/exploration + name = "\improper Exploration Department" + desc = "A level sign, stating the level to find the Exploration Department on." + icon_state = "level_explo" + //medical signs /obj/structure/sign/directions/medical name = "\improper Medical Bay" desc = "A direction sign, pointing out the way to the Medical Bay." icon_state = "direction_med" +/obj/structure/sign/levels/medical + name = "\improper Medical Bay" + desc = "A level sign, stating the level to find the Medical Bay on." + icon_state = "level_med" + /obj/structure/sign/directions/medical/chemlab name = "\improper Chemistry Lab" desc = "A direction sign, pointing out the way to the Chemistry Lab." icon_state = "direction_med" +/obj/structure/sign/levels/medical/chemlab + name = "\improper Chemistry Lab" + desc = "A level sign, stating the level to find the Chemistry Lab on." + icon_state = "level_med" + /obj/structure/sign/directions/medical/surgery name = "\improper Surgery" desc = "A direction sign, pointing out the way to Surgery." icon_state = "direction_surgery" +/obj/structure/sign/levels/medical/surgery + name = "\improper Surgery" + desc = "A level sign, stating the level to find Surgery on." + icon_state = "level_surgery" + /obj/structure/sign/directions/medical/operating_1 name = "\improper Operating Theatre 1" desc = "A direction sign, pointing out the way to Operating Theatre 1." icon_state = "direction_op1" +/obj/structure/sign/levels/medical/operating_1 + name = "\improper Operating Theatre 1" + desc = "A level sign, stating the level to find Operating Theatre 1 on." + icon_state = "level_op1" + /obj/structure/sign/directions/medical/operating_2 name = "\improper Operating Theatre 2" desc = "A direction sign, pointing out the way to Operating Theatre 2." icon_state = "direction_op2" +/obj/structure/sign/levels/medical/operating_2 + name = "\improper Operating Theatre 2" + desc = "A level sign, stating the level to find Operating Theatre 2 on." + icon_state = "level_op2" + /obj/structure/sign/directions/medical/virology name = "\improper Virology" desc = "A direction sign, pointing out the way to the Virology Lab." icon_state = "direction_viro" +/obj/structure/sign/levels/medical/virology + name = "\improper Virology" + desc = "A level sign, stating the level to find the Virology Lab on." + icon_state = "level_viro" + /obj/structure/sign/directions/medical/medeqp name = "\improper Medical Equipment Storage" desc = "A direction sign, pointing out the way to Medical Equipment Storage." icon_state = "direction_medeqp" +/obj/structure/sign/levels/medical/medeqp + name = "\improper Medical Equipment Storage" + desc = "A level sign, stating the level to find Medical Equipment Storage on." + icon_state = "level_medeqp" + /obj/structure/sign/directions/medical/morgue name = "\improper Morgue" desc = "A direction sign, pointing out the way to the Morgue." icon_state = "direction_morgue" +/obj/structure/sign/levels/medical/morgue + name = "\improper Morgue" + desc = "A level sign, stating the level to find the Morgue on." + icon_state = "level_morgue" + /obj/structure/sign/directions/medical/cloning name = "\improper Cloning Lab" desc = "A direction sign, pointing out the way to the Cloning Lab." icon_state = "direction_cloning" +/obj/structure/sign/levels/medical/cloning + name = "\improper Cloning Lab" + desc = "A level sign, stating the level to find the Cloning Lab on." + icon_state = "level_cloning" + /obj/structure/sign/directions/medical/resleeving name = "\improper Resleeving Lab" desc = "A direction sign, pointing out the way to the Resleeving Lab." icon_state = "direction_resleeve" - + +/obj/structure/sign/levels/medical/resleeving + name = "\improper Resleeving Lab" + desc = "A level sign, stating the level to find the Resleeving Lab on." + icon_state = "level_resleeve" + //special signs /obj/structure/sign/directions/evac name = "\improper Evacuation" desc = "A direction sign, pointing out the way to the Escape Shuttle Dock." icon_state = "direction_evac" +/obj/structure/sign/levels/evac + name = "\improper Evacuation" + desc = "A level sign, stating the level to find the Escape Shuttle Dock on." + icon_state = "level_evac" + /obj/structure/sign/directions/eva name = "\improper Extra-Vehicular Activity" desc = "A direction sign, pointing out the way to the EVA Bay." icon_state = "direction_eva" +/obj/structure/sign/levels/eva + name = "\improper Extra-Vehicular Activity" + desc = "A level sign, stating the level to find the EVA Bay on." + icon_state = "level_eva" + //command signs /obj/structure/sign/directions/ai_core name = "\improper AI Core" desc = "A direction sign, pointing out the way to the AI Core." icon_state = "direction_ai_core" +/obj/structure/sign/levels/ai_core + name = "\improper AI Core" + desc = "A level sign, stating the level to find the AI Core on." + icon_state = "level_ai_core" + /obj/structure/sign/directions/bridge name = "\improper Bridge" desc = "A direction sign, pointing out the way to the Bridge." icon_state = "direction_bridge" +/obj/structure/sign/levels/bridge + name = "\improper Bridge" + desc = "A level sign, stating the level to find the Bridge on." + icon_state = "level_bridge" + /obj/structure/sign/directions/command name = "\improper Command" desc = "A direction sign, pointing out the way to the Command Center." icon_state = "direction_command" +/obj/structure/sign/levels/command + name = "\improper Command" + desc = "A level sign, stating the level to find the Command Center on." + icon_state = "level_command" + /obj/structure/sign/directions/teleporter name = "\improper Teleporter" desc = "A direction sign, pointing out the way to the Teleporter." icon_state = "direction_teleport" +/obj/structure/sign/levels/teleporter + name = "\improper Teleporter" + desc = "A level sign, stating the level to find the Teleporter on." + icon_state = "level_teleport" + /obj/structure/sign/directions/telecomms name = "\improper Telecommunications Hub" desc = "A direction sign, pointing out the way to the Telecommunications Hub." icon_state = "direction_tcomms" - + +/obj/structure/sign/levels/telecomms + name = "\improper Telecommunications Hub" + desc = "A level sign, stating the level to find the Telecommunications Hub on." + icon_state = "level_tcomms" + //cargonia signs /obj/structure/sign/directions/cargo name = "\improper Cargo Department" desc = "A direction sign, pointing out the way to the Cargo Department." icon_state = "direction_crg" +/obj/structure/sign/levels/cargo + name = "\improper Cargo Department" + desc = "A level sign, stating the level to find the Cargo Department on." + icon_state = "level_crg" + /obj/structure/sign/directions/cargo/mining name = "\improper Mining Department" desc = "A direction sign, pointing out the way to the Mining Department." icon_state = "direction_mining" +/obj/structure/sign/levels/cargo/mining + name = "\improper Mining Department" + desc = "A level sign, stating the level to find the Mining Department on." + icon_state = "level_mining" + /obj/structure/sign/directions/cargo/refinery name = "\improper Refinery" desc = "A direction sign, pointing out the way to the Refinery." icon_state = "direction_refinery" +/obj/structure/sign/levels/cargo/refinery + name = "\improper Refinery" + desc = "A level sign, stating the level to find the Refinery on." + icon_state = "level_refinery" + //civilian/misc signs /obj/structure/sign/directions/roomnum name = "room number" @@ -563,66 +783,131 @@ desc = "A direction sign, pointing out the way to Cryogenic Storage." icon_state = "direction_cry" +/obj/structure/sign/levels/cryo + name = "\improper Cryogenic Storage" + desc = "A level sign, stating the level to find Cryogenic Storage on." + icon_state = "level_cry" + /obj/structure/sign/directions/elevator name = "\improper Elevator" desc = "A direction sign, pointing out the way to the nearest elevator." icon_state = "direction_elv" +/obj/structure/sign/levels/elevator + name = "\improper Elevator" + desc = "A level sign, stating the level to find the nearest elevator on." + icon_state = "level_elv" + /obj/structure/sign/directions/bar name = "\improper Bar" desc = "A direction sign, pointing out the way to the nearest watering hole." icon_state = "direction_bar" +/obj/structure/sign/levels/bar + name = "\improper Bar" + desc = "A level sign, stating the level to find the nearest watering hole on." + icon_state = "level_bar" + /obj/structure/sign/directions/kitchen name = "\improper Kitchen" desc = "A pictographic direction sign with a knife, plate, and fork, pointing out the way to the nearest dining establishment." icon_state = "direction_kitchen" +/obj/structure/sign/levels/kitchen + name = "\improper Kitchen" + desc = "A pictographic direction sign with a knife, plate, and fork, stating the level to find the nearest dining establishment on." + icon_state = "level_kitchen" + /obj/structure/sign/directions/tram name = "\improper Public Transit Station" desc = "A direction sign, pointing out the way to the nearest public transit station." icon_state = "direction_tram" +/obj/structure/sign/levels/tram + name = "\improper Public Transit Station" + desc = "A level sign, stating the level to find the nearest public transit station on." + icon_state = "level_tram" + /obj/structure/sign/directions/janitor name = "\improper Custodial Closet" desc = "A direction sign, pointing out the way to the Custodial Closet." icon_state = "direction_janitor" +/obj/structure/sign/levels/janitor + name = "\improper Custodial Closet" + desc = "A level sign, stating the level to find the Custodial Closet on." + icon_state = "level_janitor" + /obj/structure/sign/directions/chapel name = "\improper Chapel" desc = "A direction sign, pointing out the way to the Chapel." icon_state = "direction_chapel" +/obj/structure/sign/levels/chapel + name = "\improper Chapel" + desc = "A level sign, stating the level to find the Chapel on." + icon_state = "level_chapel" + /obj/structure/sign/directions/dorms name = "\improper Dormitories" desc = "A direction sign, pointing out the way to the Dormitories." icon_state = "direction_dorms" +/obj/structure/sign/levels/dorms + name = "\improper Dormitories" + desc = "A level sign, stating the level to find the Dormitories on." + icon_state = "level_dorms" + /obj/structure/sign/directions/library name = "\improper Library" desc = "A direction sign, pointing out the way to the Library." icon_state = "direction_library" +/obj/structure/sign/levels/library + name = "\improper Library" + desc = "A level sign, stating the level to find the Library on." + icon_state = "level_library" + /obj/structure/sign/directions/dock name = "\improper Dock" desc = "A direction sign, pointing out the way to the nearest docking area." icon_state = "direction_dock" +/obj/structure/sign/levels/dock + name = "\improper Dock" + desc = "A level sign, stating the level to find the nearest docking area on." + icon_state = "level_dock" + /obj/structure/sign/directions/gym name = "\improper Gym" desc = "A direction sign, pointing out the way to the Gym." icon_state = "direction_gym" +/obj/structure/sign/levels/gym + name = "\improper Gym" + desc = "A level sign, stating the level to find the Gym on." + icon_state = "level_gym" + /obj/structure/sign/directions/pool name = "\improper Pool" desc = "A direction sign, pointing out the way to the Pool." icon_state = "direction_pool" +/obj/structure/sign/levels/pool + name = "\improper Pool" + desc = "A level sign, stating the level to find the Pool on." + icon_state = "level_pool" + /obj/structure/sign/directions/recreation name = "\improper Recreation Area" desc = "A direction sign, pointing out the way to the nearest Recreation Area." icon_state = "direction_recreation" +/obj/structure/sign/levels/recreation + name = "\improper Recreation Area" + desc = "A level sign, stating the level to find the nearest Recreation Area on." + icon_state = "level_recreation" + /obj/structure/sign/directions/stairwell name = "\improper Stairwell" desc = "A direction sign with stairs and a door, pointing out the way to the nearest stairwell." @@ -1038,6 +1323,48 @@ name = "\improper Fourth Deck" icon_state = "deck-4" +/obj/structure/sign/level/one + name = "\improper Level One" + icon_state = "level-1" + +/obj/structure/sign/level/one/large + icon_state = "level-1-large" + +/obj/structure/sign/level/two + name = "\improper Level Two" + icon_state = "level-2" + +/obj/structure/sign/level/two/large + icon_state = "level-2-large" + +/obj/structure/sign/level/three + name = "\improper Level Three" + icon_state = "level-3" + +/obj/structure/sign/level/three/large + icon_state = "level-3-large" + +/obj/structure/sign/level/fourth + name = "\improper Level Four" + icon_state = "level-4" + +/obj/structure/sign/level/four/large + icon_state = "level-4-large" + +/obj/structure/sign/level/basement + name = "\improper Basement Level" + icon_state = "level-b" + +/obj/structure/sign/level/basement/large + icon_state = "level-b-large" + +/obj/structure/sign/level/ground + name = "\improper Basement Level" + icon_state = "level-g" + +/obj/structure/sign/level/ground/large + icon_state = "level-g-large" + /obj/structure/sign/hangar/one name = "\improper Hangar One" icon_state = "hangar-1" @@ -1078,12 +1405,61 @@ name = "\improper AIR" icon_state = "atmos_air" -/obj/structure/sign/poi/engineleft +/obj/structure/sign/scenery/engineleft name = "I.C.V." desc = "The charred name of a cargo ship of some description." icon_state = "poi_engine1" -/obj/structure/sign/poi/engineright +/obj/structure/sign/scenery/engineright name = "I.C.V." desc = "The charred name of a cargo ship of some description." - icon_state = "poi_engine2" \ No newline at end of file + icon_state = "poi_engine2" + +//Direction/Level sign overlays. Not mechanically functional as noted above, but usable for mapping. +/obj/structure/sign/scenery/overlay + name = "snow covering" + desc = "Frozen snow obscures the view of a sign beneath." + icon_state = "snowy" + icon = 'icons/obj/decals_directions.dmi' + +/obj/structure/sign/scenery/overlay/rust + name = "rust covering" + desc = "Thick rust obscures the view of a sign beneath." + icon_state = "rusted" + +/obj/structure/sign/scenery/overlay/vine + name = "vine covering" + desc = "Thick vines obscure the view of a sign beneath." + icon_state = "vines" + +/obj/structure/sign/scenery/overlay/vine/top + icon_state = "vines_top" + +/obj/structure/sign/scenery/overlay/vine/mid + icon_state = "vines_mid" + +/obj/structure/sign/scenery/overlay/vine/bottom + icon_state = "vines_bottom" + +/obj/structure/sign/bigname + name = "Cynosure Station" + desc = "An aging sign for the Cynosure Xenoarchaeological Research Station." + icon_state = "cyno_1" + +/obj/structure/sign/bigname/seg_2 + icon_state = "cyno_2" + +/obj/structure/sign/bigname/seg_3 + icon_state = "cyno_3" + +/obj/structure/sign/bigname/seg_4 + icon_state = "cyno_4" + +/obj/structure/sign/bigname/seg_5 + icon_state = "cyno_5" + +/obj/structure/sign/bigname/seg_6 + icon_state = "cyno_6" + +/obj/structure/sign/bigname/seg_7 + icon_state = "cyno_7" diff --git a/code/game/turfs/flooring/flooring_decals.dm b/code/game/turfs/flooring/flooring_decals.dm index 7f59c0fb7d..5d5f4ebff3 100644 --- a/code/game/turfs/flooring/flooring_decals.dm +++ b/code/game/turfs/flooring/flooring_decals.dm @@ -16,8 +16,8 @@ var/list/floor_decals = list() color = newcolour ..(newloc) -// TODO: identify what is causing these atoms to be qdeleted in New()/Initialize() -// somewhere in this chain. Alternatively repath to /obj/floor_decal or some other +// TODO: identify what is causing these atoms to be qdeleted in New()/Initialize() +// somewhere in this chain. Alternatively repath to /obj/floor_decal or some other // abstract handler that explicitly doesn't invoke any obj behavior. /obj/effect/floor_decal/Initialize() add_to_turf_decals() @@ -1217,3 +1217,28 @@ var/list/floor_decals = list() /obj/effect/floor_decal/grass_edge/corner name = "grass edge" icon_state = "grass_edge_corner" + +//Multi-part Floor Signs + +/obj/effect/floor_decal/arrivals + name = "arrivals sign" + icon_state = "arrivals_1" + +/obj/effect/floor_decal/arrivals/right + icon_state = "arrivals_2" + +/obj/effect/floor_decal/shuttles + name = "departures sign" + icon_state = "shuttle_1" + +/obj/effect/floor_decal/shuttles/right + icon_state = "shuttle_2" + +/obj/effect/floor_decal/arrow + name = "floor arrow" + icon_state = "arrow_single" + +/obj/effect/floor_decal/arrows + name = "floor arrows" + icon_state = "arrows" + diff --git a/icons/obj/decals_directions.dmi b/icons/obj/decals_directions.dmi index 6b6ddf5283..14a8bd15b2 100644 Binary files a/icons/obj/decals_directions.dmi and b/icons/obj/decals_directions.dmi differ diff --git a/icons/obj/decals_levels.dmi b/icons/obj/decals_levels.dmi new file mode 100644 index 0000000000..5390bf9bcf Binary files /dev/null and b/icons/obj/decals_levels.dmi differ diff --git a/icons/turf/flooring/decals.dmi b/icons/turf/flooring/decals.dmi index acd81e57f1..c98b77736c 100644 Binary files a/icons/turf/flooring/decals.dmi and b/icons/turf/flooring/decals.dmi differ diff --git a/maps/southern_cross/southern_cross-6.dmm b/maps/southern_cross/southern_cross-6.dmm index 0eabfb6624..d7ac6c180d 100644 --- a/maps/southern_cross/southern_cross-6.dmm +++ b/maps/southern_cross/southern_cross-6.dmm @@ -1526,8 +1526,8 @@ "Dr" = (/obj/machinery/embedded_controller/radio/simple_docking_controller{frequency = 1380; id_tag = "centcom_dock"; name = "docking port controller"; pixel_x = 25; pixel_y = 0; req_one_access = list(13); tag_door = "centcom_dock_airlock"},/turf/unsimulated/floor{icon_state = "steel"},/area/centcom/terminal) "Ds" = (/obj/effect/floor_decal/industrial/warning{dir = 10},/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/centcom/terminal) "Dt" = (/obj/machinery/computer/shuttle_control/administration{dir = 8},/turf/simulated/shuttle/floor/red,/area/shuttle/administration/centcom) -"Du" = (/obj/structure/sign/double/map/left{pixel_y = 32},/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/wizard_station) -"Dv" = (/obj/structure/sign/double/map/right{pixel_y = 32},/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/wizard_station) +"Du" = (/obj/structure/sign/scenery/map/left{pixel_y = 32},/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/wizard_station) +"Dv" = (/obj/structure/sign/scenery/map/right{pixel_y = 32},/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/wizard_station) "Dw" = (/obj/machinery/computer/message_monitor,/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/wizard_station) "Dx" = (/obj/structure/frame/computer,/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/wizard_station) "Dy" = (/obj/structure/table/steel_reinforced,/obj/item/stack/telecrystal,/turf/unsimulated/floor{icon_state = "dark"},/area/wizard_station) @@ -1926,8 +1926,8 @@ "Lb" = (/obj/structure/table/rack,/obj/item/clothing/shoes/magboots,/obj/item/clothing/suit/space/void/merc,/obj/item/clothing/mask/gas/syndicate,/obj/item/clothing/head/helmet/space/void/merc,/turf/unsimulated/floor{icon_state = "dark"},/area/syndicate_station) "Lc" = (/obj/structure/table/rack,/obj/item/clothing/shoes/magboots,/obj/item/clothing/suit/space/syndicate/black/green,/obj/item/clothing/mask/breath,/obj/item/clothing/head/helmet/space/syndicate/black/green,/turf/unsimulated/floor{icon_state = "dark"},/area/syndicate_station) "Ld" = (/obj/machinery/computer/crew{dir = 1},/obj/effect/floor_decal/corner/paleblue/full,/turf/unsimulated/floor{icon_state = "white"},/area/centcom/medical) -"Le" = (/obj/structure/sign/double/map/left{pixel_y = 32},/turf/unsimulated/floor{name = "plating"; icon_state = "cult"},/area/syndicate_station) -"Lf" = (/obj/structure/sign/double/map/right{pixel_y = 32},/turf/unsimulated/floor{name = "plating"; icon_state = "cult"},/area/syndicate_station) +"Le" = (/obj/structure/sign/scenery/map/left{pixel_y = 32},/turf/unsimulated/floor{name = "plating"; icon_state = "cult"},/area/syndicate_station) +"Lf" = (/obj/structure/sign/scenery/map/right{pixel_y = 32},/turf/unsimulated/floor{name = "plating"; icon_state = "cult"},/area/syndicate_station) "Lg" = (/turf/unsimulated/floor{name = "plating"; icon_state = "cult"},/area/syndicate_station) "Lh" = (/obj/item/weapon/storage/box/syndie_kit/clerical,/obj/structure/table/standard,/turf/unsimulated/floor{name = "plating"; icon_state = "cult"},/area/syndicate_station) "Li" = (/turf/unsimulated/floor{icon_state = "lino"},/area/syndicate_station) diff --git a/maps/submaps/surface_submaps/wilderness/DecoupledEngine.dmm b/maps/submaps/surface_submaps/wilderness/DecoupledEngine.dmm index 15a2bf604f..74e4b5c824 100644 --- a/maps/submaps/surface_submaps/wilderness/DecoupledEngine.dmm +++ b/maps/submaps/surface_submaps/wilderness/DecoupledEngine.dmm @@ -14,8 +14,8 @@ "ao" = (/obj/structure/lattice,/turf/simulated/floor/outdoors/rocks,/area/submap/DecoupledEngine) "ap" = (/obj/effect/floor_decal/rust,/obj/effect/decal/cleanable/dirt,/turf/simulated/floor,/area/submap/DecoupledEngine) "aq" = (/obj/structure/girder,/turf/simulated/floor,/area/submap/DecoupledEngine) -"ar" = (/obj/structure/sign/poi/engineright{dir = 1},/turf/simulated/wall/r_wall,/area/submap/DecoupledEngine) -"as" = (/obj/structure/sign/poi/engineleft{dir = 1},/turf/simulated/wall/r_wall,/area/submap/DecoupledEngine) +"ar" = (/obj/structure/sign/scenery/engineright{dir = 1},/turf/simulated/wall/r_wall,/area/submap/DecoupledEngine) +"as" = (/obj/structure/sign/scenery/engineleft{dir = 1},/turf/simulated/wall/r_wall,/area/submap/DecoupledEngine) "at" = (/turf/simulated/wall/r_wall,/area/submap/DecoupledEngine) "au" = (/obj/structure/lattice,/turf/template_noop,/area/submap/DecoupledEngine) "av" = (/turf/simulated/wall/durasteel,/area/submap/DecoupledEngine) @@ -68,8 +68,8 @@ "br" = (/obj/structure/grille,/obj/structure/window/phoronreinforced{icon_state = "phoronrwindow"; dir = 1},/obj/structure/window/phoronreinforced{icon_state = "phoronrwindow"; dir = 8},/obj/structure/window/phoronreinforced,/turf/simulated/floor,/area/submap/DecoupledEngine) "bs" = (/obj/structure/grille,/obj/structure/window/phoronreinforced{icon_state = "phoronrwindow"; dir = 1},/obj/structure/window/phoronreinforced,/turf/simulated/floor,/area/submap/DecoupledEngine) "bt" = (/obj/structure/grille,/obj/structure/window/phoronreinforced{icon_state = "phoronrwindow"; dir = 1},/obj/structure/window/phoronreinforced{icon_state = "phoronrwindow"; dir = 4},/obj/structure/window/phoronreinforced,/turf/simulated/floor,/area/submap/DecoupledEngine) -"bu" = (/obj/structure/sign/poi/engineleft,/turf/simulated/wall/durasteel,/area/submap/DecoupledEngine) -"bv" = (/obj/structure/sign/poi/engineright,/turf/simulated/wall/r_wall,/area/submap/DecoupledEngine) +"bu" = (/obj/structure/sign/scenery/engineleft,/turf/simulated/wall/durasteel,/area/submap/DecoupledEngine) +"bv" = (/obj/structure/sign/scenery/engineright,/turf/simulated/wall/r_wall,/area/submap/DecoupledEngine) "bw" = (/obj/structure/girder,/turf/simulated/floor/outdoors/rocks,/area/submap/DecoupledEngine) "bx" = (/obj/structure/girder/displaced,/turf/simulated/floor/outdoors/rocks,/area/submap/DecoupledEngine)