diff --git a/code/ZAS/Debug.dm b/code/ZAS/Debug.dm index 3c6df4368a0..d95314b240a 100644 --- a/code/ZAS/Debug.dm +++ b/code/ZAS/Debug.dm @@ -1,11 +1,11 @@ -var/image/assigned = image('icons/Testing/Zone.dmi', icon_state = "assigned") -var/image/created = image('icons/Testing/Zone.dmi', icon_state = "created") -var/image/merged = image('icons/Testing/Zone.dmi', icon_state = "merged") -var/image/invalid_zone = image('icons/Testing/Zone.dmi', icon_state = "invalid") -var/image/air_blocked = image('icons/Testing/Zone.dmi', icon_state = "block") -var/image/zone_blocked = image('icons/Testing/Zone.dmi', icon_state = "zoneblock") -var/image/blocked = image('icons/Testing/Zone.dmi', icon_state = "fullblock") -var/image/mark = image('icons/Testing/Zone.dmi', icon_state = "mark") +var/image/assigned = image('icons/zone.dmi', icon_state = "assigned") +var/image/created = image('icons/zone.dmi', icon_state = "created") +var/image/merged = image('icons/zone.dmi', icon_state = "merged") +var/image/invalid_zone = image('icons/zone.dmi', icon_state = "invalid") +var/image/air_blocked = image('icons/zone.dmi', icon_state = "block") +var/image/zone_blocked = image('icons/zone.dmi', icon_state = "zoneblock") +var/image/blocked = image('icons/zone.dmi', icon_state = "fullblock") +var/image/mark = image('icons/zone.dmi', icon_state = "mark") /connection_edge/var/dbg_out = 0 @@ -17,4 +17,4 @@ var/image/mark = image('icons/Testing/Zone.dmi', icon_state = "mark") dbg_img = img proc/soft_assert(thing,fail) - if(!thing) message_admins(fail) + if(!thing) message_admins(fail) \ No newline at end of file diff --git a/code/game/objects/items/weapons/policetape.dm b/code/game/objects/items/weapons/policetape.dm index c1a6e35ba60..1c0e15efd09 100644 --- a/code/game/objects/items/weapons/policetape.dm +++ b/code/game/objects/items/weapons/policetape.dm @@ -3,7 +3,7 @@ var/list/tape_roll_applications = list() //Define all tape types in policetape.dm /obj/item/taperoll name = "tape roll" - icon = 'icons/policetape.dmi' + icon = 'icons/obj/policetape.dmi' icon_state = "tape" w_class = ITEMSIZE_SMALL var/static/list/hazard_overlays @@ -23,7 +23,7 @@ var/list/tape_roll_applications = list() /obj/item/tape name = "tape" - icon = 'icons/policetape.dmi' + icon = 'icons/obj/policetape.dmi' anchored = 1 layer = 3.1 // Above closed airlocks. var/lifted = 0 diff --git a/code/game/objects/structures/signs.dm b/code/game/objects/structures/signs.dm index 4fc6aeab277..d7d375b3145 100644 --- a/code/game/objects/structures/signs.dm +++ b/code/game/objects/structures/signs.dm @@ -1,15 +1,21 @@ +// +// Signs +// + /obj/structure/sign - icon = 'icons/obj/decals.dmi' - anchored = 1 - opacity = 0 - density = 0 + name = "sign" + desc = "A sign." + icon = 'icons/obj/signs.dmi' + anchored = TRUE + density = FALSE + opacity = FALSE layer = 3.5 w_class = ITEMSIZE_NORMAL /obj/structure/sign/ex_act(severity) qdel(src) -/obj/structure/sign/attackby(obj/item/tool, mob/user) //deconstruction +/obj/structure/sign/attackby(obj/item/tool, mob/user) // Deconstruction. if(tool.isscrewdriver() && !istype(src, /obj/structure/sign/double)) playsound(get_turf(user), tool.usesound, 50, 1) unfasten(user) @@ -21,19 +27,17 @@ S.name = name S.desc = desc S.icon_state = icon_state - //var/icon/I = icon('icons/obj/decals.dmi', icon_state) - //S.icon = I.Scale(24, 24) S.sign_state = icon_state qdel(src) /obj/item/sign name = "sign" - desc = "" - icon = 'icons/obj/decals.dmi' - w_class = ITEMSIZE_HUGE //big + desc = "A sign." + icon = 'icons/obj/signs.dmi' + w_class = ITEMSIZE_HUGE var/sign_state = "" -/obj/item/sign/attackby(obj/item/tool as obj, mob/user as mob) //construction +/obj/item/sign/attackby(obj/item/tool as obj, mob/user as mob) // Construction. if(tool.isscrewdriver() && isturf(user.loc)) var/direction = input("In which direction?", "Select direction.") in list("North", "East", "South", "West", "Cancel") if(direction == "Cancel") return @@ -55,249 +59,12 @@ qdel(src) else ..() -/obj/structure/sign/double/map - name = "station map" - desc = "A framed picture of the station." +// +// Christmas +// -/obj/structure/sign/double/map/left - icon_state = "map-left" - -/obj/structure/sign/double/map/right - icon_state = "map-right" - -/obj/structure/sign/securearea - name = "\improper SECURE AREA" - desc = "A warning sign which reads 'SECURE AREA'." - icon_state = "securearea" - -/obj/structure/sign/biohazard - name = "\improper BIOHAZARD" - desc = "A warning sign which reads 'BIOHAZARD'." - icon_state = "bio" - -/obj/structure/sign/electricshock - name = "\improper HIGH VOLTAGE" - desc = "A warning sign which reads 'HIGH VOLTAGE'." - icon_state = "shock" - -/obj/structure/sign/examroom - name = "\improper EXAM" - desc = "A guidance sign which reads 'EXAM ROOM'." - icon_state = "examroom" - -/obj/structure/sign/vacuum - name = "\improper HARD VACUUM AHEAD" - desc = "A warning sign which reads 'HARD VACUUM AHEAD'." - icon_state = "space" - -/obj/structure/sign/drop - name = "\improper DANGER! DROP HAZARD" - desc = "A warning sign which reads 'DANGER! DROP HAZARD'." - icon_state = "drop" - -/obj/structure/sign/deathsposal - name = "\improper DISPOSAL LEADS TO SPACE" - desc = "A warning sign which reads 'DISPOSAL LEADS TO SPACE'." - icon_state = "deathsposal" - -/obj/structure/sign/pods - name = "\improper ESCAPE PODS" - desc = "A warning sign which reads 'ESCAPE PODS'." - icon_state = "pods" - -/obj/structure/sign/fire - name = "\improper DANGER: FIRE" - desc = "A warning sign which reads 'DANGER: FIRE'." - icon_state = "fire" - -/obj/structure/sign/nosmoking_1 - name = "\improper NO SMOKING" - desc = "A warning sign which reads 'NO SMOKING'." - icon_state = "nosmoking" - -/obj/structure/sign/nosmoking_2 - name = "\improper NO SMOKING" - desc = "A warning sign which reads 'NO SMOKING'." - icon_state = "nosmoking2" - -/obj/structure/sign/greencross - name = "medbay" - desc = "The Intergalactic symbol of Medical institutions. You'll probably get help here." - icon_state = "greencross" - -/obj/structure/sign/goldenplaque - name = "The Most Robust Men Award for Robustness" - 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/kiddieplaque - name = "\improper AI developers plaque" - desc = "Next to the extremely long list of names and job titles, there is a drawing of a little child. Beneath the image, someone has scratched the word \"PACKETS\"" - icon_state = "kiddieplaque" - -/obj/structure/sign/kiddieplaque/janitor - desc = "A humble wooden plaque. In simple lettering begin the words: \"Primum non sordes\"." - name = "\improper Janitorial Oath" - -/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/double/maltesefalcon //The sign is 64x32, so it needs two tiles. ;3 - name = "The Maltese Falcon" - desc = "The Maltese Falcon, Space Bar and Grill." - -/obj/structure/sign/double/maltesefalcon/left - icon_state = "maltesefalcon-left" - -/obj/structure/sign/double/maltesefalcon/right - icon_state = "maltesefalcon-right" - -/obj/structure/sign/science //These 3 have multiple types, just var-edit the icon_state to whatever one you want on the map - name = "\improper SCIENCE!" - desc = "A warning sign which reads 'SCIENCE!'." - icon_state = "science1" - -/obj/structure/sign/chemistry - name = "\improper CHEMISTRY" - desc = "A warning sign which reads 'CHEMISTRY'." - icon_state = "chemistry1" - -/obj/structure/sign/pharmacy - name = "\improper Pharmacy" - desc = "A warning sign which reads 'PHARMACY'." - icon_state = "pharmacy1" - -/obj/structure/sign/botany - name = "\improper HYDROPONICS" - desc = "A warning sign which reads 'HYDROPONICS'." - icon_state = "hydro1" - -/obj/structure/sign/patients_only - name = "\improper PATIENTS ONLY" - desc = "A big blue sign that reads 'PATIENTS ONLY'. Underneath you can read: 'Authorized personnel only. Tresspassers will be prosecuted by the security department.'" - icon_state = "patients_only" - -/obj/structure/sign/staff_only - name = "\improper STAFF ONLY" - desc = "A big blue sign that reads 'STAFF ONLY'" - icon_state = "staff_only" - -//Location and direction signs -/obj/structure/sign/directions - name = "direction sign" - desc = "A direction sign, claiming to know the way." - icon_state = null - -/obj/structure/sign/directions/science - name = "\improper Science department" - desc = "A direction sign, pointing out which way the Science department is." - icon_state = "direction_sci" - -/obj/structure/sign/directions/engineering - name = "\improper Engineering department" - desc = "A direction sign, pointing out which way the Engineering department is." - icon_state = "direction_eng" - -/obj/structure/sign/directions/security - name = "\improper Security department" - desc = "A direction sign, pointing out which way the Security department is." - icon_state = "direction_sec" - -/obj/structure/sign/directions/medical - name = "\improper Medical Bay" - desc = "A direction sign, pointing out which way the Medical Bay is." - icon_state = "direction_med" - -/obj/structure/sign/directions/evac - name = "\improper Escape Dock" - desc = "A direction sign, pointing out which way the escape shuttle dock is." - icon_state = "direction_evac" - -/obj/structure/sign/directions/cryo - name = "\improper Cryogenics Storage" - desc = "A direction sign, pointing out which way the station's Cryogenics Storage station is." - icon_state = "direction_cryo" - -/obj/structure/sign/directions/dock - name = "\improper Departures/Arrivals Dock" - desc = "A direction sign. It reads: 'Reminder: All personnel are required to make use of the Auto-locker device before heading to the Docking area. Thank you.'" - icon_state = "direction_dock" - -/obj/structure/sign/directions/civ - name = "\improper Civilian department" - desc = "A direction sign, pointing out which way the Civilian sector is." - icon_state = "direction_civ" - -/obj/structure/sign/directions/com - name = "\improper Command department" - desc = "A direction sign, pointing out which way the Command sector is." - icon_state = "direction_com" - -/obj/structure/sign/directions/tcom - name = "\improper Telecommunications" - desc = "A direction sign, pointing out which way Telecommunications is." - icon_state = "direction_tcom" - -/obj/structure/sign/directions/tram - name = "\improper Tram Station" - desc = "A direction sign, pointing out which way the Tram is." - icon_state = "direction_tram" - -/obj/structure/sign/directions/mndl - name = "\improper Mendell Transport Shuttle" - desc = "A direction sign, pointing out which way the Mendell City Transport Shuttle is." - icon_state = "direction_mndl" - -/obj/structure/sign/directions/all - name = "\improper All directions" - desc = "A multi-coloured direction sign, pointing out in which all main departments are located." - icon_state = "direction_all" - -/obj/structure/sign/meeting_point - name = "\improper EMERGENCY MEETING POINT" - desc = "A green sign which depicts a group of people in the middle of the sign, being pointed at by arrows." - icon_state = "meeting_point" - -/obj/structure/sign/emerg_exit - name = "\improper EMERGENCY EXIT" - desc = "A green sign pointing towards an emergency exit." - icon_state = "emerg_exit" - -/obj/structure/sign/emerg_exit/evac - name = "\improper EVACUATION ROUTE sign" - desc = "A green sign pointing towards an evacuation route." - icon_state = "emerg_exit" - -/obj/structure/sign/emerg_exitZ - name = "\improper EMERGENCY LADDER" - desc = "A green sign that depicts a person climbing the ladder towards the arrow's direction, pointing at the emergency exit." - icon_state = "emerg_exitZ" - -/obj/structure/sign/emerg_exitZ/evac - name = "\improper EVACUATION ROUTE sign" - desc = "A green sign that depicts a person climbing a ladder towards an evacuation route." - icon_state = "emerg_exitZ" - -/obj/structure/sign/emerg_exitZ_stairs - name = "\improper STAIRS" - desc = "A green sign that depicts a person using stairs towards the arrow's direction, pointing at the emergency exit." - icon_state = "emerg_exitZ_stairs" - -/obj/structure/sign/emerg_exitZ_stairs/evac - name = "\improper EVACUATION ROUTE sign" - desc = "A green sign that depicts a person using a stairwell, moving towards an evacuation route." - icon_state = "emerg_exitZ_stairs" - -/obj/structure/sign/emerg_pods - name = "\improper EVACUATION POD sign" - desc = "A green sign that depicts an evacuation pod, with the text \"EVACUATION PODS\" under it." - icon_state = "emerg_pods" - -//Christmas /obj/structure/sign/christmas/lights - name = "Christmas lights" + name = "christmas lights" desc = "Flashy." icon = 'icons/obj/christmas.dmi' icon_state = "xmaslights" @@ -310,21 +77,290 @@ icon_state = "doorwreath" layer = 5 -//Flag item +// +// Generic Signs +// + +/obj/structure/sign/double/map + name = "station map" + desc = "A framed picture of the station." + +/obj/structure/sign/double/map/left + icon_state = "map-left" + +/obj/structure/sign/double/map/right + icon_state = "map-right" + +/obj/structure/sign/examroom + name = "\improper EXAM sign" + desc = "A sign which reads 'EXAM ROOM'." + icon_state = "examroom" + +/obj/structure/sign/vacuum + name = "\improper VACUUM AHEAD sign" + desc = "A warning sign which reads 'VACUUM AHEAD'." + icon_state = "space" + +/obj/structure/sign/deathsposal + name = "\improper DISPOSAL LEADS TO SPACE sign" + desc = "A warning sign which reads 'DISPOSAL LEADS TO SPACE'." + icon_state = "deathsposal" + +/obj/structure/sign/pods + name = "\improper ESCAPE PODS sign" + desc = "A warning sign which reads 'ESCAPE PODS'." + icon_state = "pods" + +/obj/structure/sign/nosmoking_1 + name = "\improper NO SMOKING sign" + desc = "A warning sign which reads 'NO SMOKING'." + icon_state = "nosmoking" + +/obj/structure/sign/nosmoking_2 + name = "\improper NO SMOKING sign" + desc = "A warning sign which reads 'NO SMOKING'." + icon_state = "nosmoking2" + +/obj/structure/sign/greencross + name = "\improper MEDICAL sign" + desc = "The Intergalactic symbol of Medical institutions. You'll probably get help here." + icon_state = "greencross" + +/obj/structure/sign/goldenplaque + name = "\improper The Most Robust Men Award for Robustness sign" + 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/kiddieplaque + name = "\improper AI developers plaque sign" + desc = "Next to the extremely long list of names and job titles, there is a drawing of a little child. Beneath the image, someone has scratched the word \"PACKETS\"" + icon_state = "kiddieplaque" + +/obj/structure/sign/kiddieplaque/janitor + name = "\improper Janitorial Oath sign" + desc = "A humble wooden plaque. In simple lettering begin the words: \"Primum non sordes\"." + +/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/science + name = "\improper SCIENCE sign" + desc = "A warning sign which reads 'SCIENCE'." + icon_state = "science1" + +/obj/structure/sign/chemistry + name = "\improper CHEMISTRY sign" + desc = "A warning sign which reads 'CHEMISTRY'." + icon_state = "chemistry1" + +/obj/structure/sign/pharmacy + name = "\improper PHARMACY sign" + desc = "A warning sign which reads 'PHARMACY'." + icon_state = "pharmacy1" + +/obj/structure/sign/botany + name = "\improper HYDROPONICS sign" + desc = "A warning sign which reads 'HYDROPONICS'." + icon_state = "hydro1" + +/obj/structure/sign/patients_only + name = "\improper PATIENTS ONLY sign" + desc = "A big blue sign that reads 'PATIENTS ONLY'. Underneath you can read: 'Authorized personnel only. Tresspassers will be prosecuted by the security department.'" + icon_state = "patients_only" + +/obj/structure/sign/staff_only + name = "\improper STAFF ONLY sign" + desc = "A big blue sign that reads 'STAFF ONLY'" + icon_state = "staff_only" + +// +// Location and Direction Signs +// + +/obj/structure/sign/directions + name = "direction sign" + desc = "A direction sign, claiming to know the way." + icon_state = null + +/obj/structure/sign/directions/science + name = "\improper SCIENCE DEAPRTMENT sign" + desc = "A direction sign, pointing out which way the science department is." + icon_state = "direction_sci" + +/obj/structure/sign/directions/engineering + name = "\improper ENGINEERING DEPARTMENT sign" + desc = "A direction sign, pointing out which way the engineering department is." + icon_state = "direction_eng" + +/obj/structure/sign/directions/security + name = "\improper SECURITY DEPARTMENT sign" + desc = "A direction sign, pointing out which way the security department is." + icon_state = "direction_sec" + +/obj/structure/sign/directions/medical + name = "\improper MEDICAL DEPARTMENT sign" + desc = "A direction sign, pointing out which way the medical department is." + icon_state = "direction_med" + +/obj/structure/sign/directions/evac + name = "\improper ESCAPE DOCK sign" + desc = "A direction sign, pointing out which way the escape dock is." + icon_state = "direction_evac" + +/obj/structure/sign/directions/cryo + name = "\improper CRYOGENICS STORAGE sign" + desc = "A direction sign, pointing out which way the cryogenics storage is." + icon_state = "direction_cryo" + +/obj/structure/sign/directions/dock + name = "arrivals/departures dock sign" + desc = "A direction sign, pointing out which way the arrivals/departures dock is." + icon_state = "direction_dock" + +/obj/structure/sign/directions/civ + name = "\improper CIVILIAN sign" + desc = "A direction sign, pointing out which way the civilian sector is." + icon_state = "direction_civ" + +/obj/structure/sign/directions/com + name = "\improper COMMAND sign" + desc = "A direction sign, pointing out which way the command sector is." + icon_state = "direction_com" + +/obj/structure/sign/directions/tcom + name = "\improper TELECOMMUNICATIONS sign" + desc = "A direction sign, pointing out which way telecommunications is." + icon_state = "direction_tcom" + +/obj/structure/sign/directions/tram + name = "\improper TRAM STATION sign" + desc = "A direction sign, pointing out which way the tram station is." + icon_state = "direction_tram" + +/obj/structure/sign/directions/mndl + name = "\improper Mendell Transport Shuttle sign" + desc = "A direction sign, pointing out which way the Mendell City Transport Shuttle is." + icon_state = "direction_mndl" + +/obj/structure/sign/directions/all + name = "\improper ALL DEPARTMENTS sign" + desc = "A multi-coloured direction sign, pointing out in which all main departments are located." + icon_state = "direction_all" + +// +// Danger, Warning, and Hazard Signs +// + +/obj/structure/sign/securearea + name = "\improper WARNING: SECURE AREA sign" + desc = "A warning sign which reads \"WARNING: SECURE AREA\"." + icon_state = "securearea" + +/obj/structure/sign/biohazard + name = "\improper WARNING: BIOHAZARD sign" + desc = "A warning sign which reads \"WARNING: BIOHAZARD\"." + icon_state = "bio" + +/obj/structure/sign/electricshock + name = "\improper DANGER: HIGH VOLTAGE sign" + desc = "A danger sign which reads \"DANGER: HIGH VOLTAGE\"." + icon_state = "shock" + +/obj/structure/sign/fire + name = "\improper DANGER: FIRE sign" + desc = "A danger sign which reads \"DANGER: FIRE\"." + icon_state = "fire" + +/obj/structure/sign/radiation + name = "\improper RADIATION HAZARD sign" + desc = "A hazard sign which reads \"RADIATION HAZARD\"." + icon_state = "radiation" + +/obj/structure/sign/drop + name = "\improper DANGER: DROP HAZARD sign" + desc = "A danger sign which reads \"DANGER: DROP HAZARD\"." + icon_state = "drop" + +/obj/structure/sign/vacuum + name = "\improper DANGER: VACUUM sign" + desc = "A danger sign which reads \"DANGER: VACUUM\"." + icon_state = "vacuum" + +// +// Emergency Signs +// + +// Emergency (Parent) +/obj/structure/sign/emergency + name = "emergency sign" + desc = "An emergency sign." + icon_state = null + +// Emergency +/obj/structure/sign/emergency/exit + name = "\improper EMERGENCY EXIT sign" + desc = "A green sign pointing towards an emergency exit." + icon_state = "emerg_exit" + +/obj/structure/sign/emergency/exit/ladder + name = "\improper EMERGENCY EXIT LADDER sign" + desc = "A green sign that depicts a person climbing the ladder towards the arrow's direction, pointing at the emergency exit." + icon_state = "emerg_exitZ" + +/obj/structure/sign/emergency/exit/stairs + name = "\improper EMERGENCY EXIT STAIRS sign" + desc = "A green sign that depicts a person using stairs towards the arrow's direction, pointing at the emergency exit." + icon_state = "emerg_exitZ_stairs" + +// Evacuation +/obj/structure/sign/emergency/evacuation + name = "\improper EVACUATION ROUTE sign" + desc = "A green sign pointing towards an evacuation route." + icon_state = "emerg_exit" + +/obj/structure/sign/emergency/evacuation/ladder + name = "\improper EVACUATION ROUTE sign" + desc = "A green sign that depicts a person climbing a ladder towards an evacuation route." + icon_state = "emerg_exitZ" + +/obj/structure/sign/emergency/evacuation/stairs + name = "\improper EVACUATION ROUTE sign" + desc = "A green sign that depicts a person using a stairwell, moving towards an evacuation route." + icon_state = "emerg_exitZ_stairs" + +/obj/structure/sign/emergency/evacuation/pods + name = "\improper EVACUATION PODS sign" + desc = "A green sign that depicts an evacuation pod, with the text \"EVACUATION PODS\" under it." + icon_state = "emerg_pods" + +// Miscellanous +/obj/structure/sign/emergency/meetingpoint + name = "\improper EMERGENCY MEETING POINT sign" + desc = "A green sign which depicts a group of people in the middle of the sign, being pointed at by arrows." + icon_state = "meeting_point" + +// +// Flags +// + +// Flag Item /obj/item/flag name = "boxed flag" desc = "A flag neatly folded into a wooden container." - icon = 'icons/obj/decals.dmi' + icon = 'icons/obj/flags.dmi' icon_state = "flag_boxed" var/flag_path var/flag_size = 0 -//Flag on wall +// Flag on Wall /obj/structure/sign/flag name = "blank flag" desc = "Nothing to see here." + icon = 'icons/obj/flags.dmi' icon_state = "flag" - var/icon/ripped_outline = icon('icons/obj/decals.dmi', "ripped") + var/icon/ripped_outline = icon('icons/obj/flags.dmi', "ripped") var/obj/structure/sign/flag/linked_flag //For double flags var/obj/item/flag/flagtype //For returning your flag var/ripped = FALSE //If we've been torn down @@ -334,7 +370,6 @@ desc = "A blank blue flag." icon_state = "flag" - /obj/item/flag/afterattack(var/atom/A, var/mob/user, var/adjacent, var/clickparams) if (!adjacent) return @@ -396,8 +431,8 @@ qdel(src) /obj/structure/sign/flag/Destroy() - if(linked_flag?.linked_flag == src) //Catches other instances where one half might be destroyed, say by a broken wall, to avoid runtimes. - linked_flag.linked_flag = null //linked_flag + if(linked_flag?.linked_flag == src) // Catches other instances where one half might be destroyed, say by a broken wall, to avoid runtimes. + linked_flag.linked_flag = null // linked_flag . = ..() /obj/structure/sign/flag/ex_act(severity) @@ -420,12 +455,12 @@ else user.visible_message(SPAN_NOTICE("\The [user] unfastens the tattered remnants of \the [src]."), SPAN_NOTICE("You unfasten the tattered remains of \the [src].")) if(linked_flag) - qdel(linked_flag) //otherwise you're going to get weird duping nonsense + qdel(linked_flag) // Otherwise you're going to get weird duping nonsense. qdel(src) /obj/structure/sign/flag/attack_hand(mob/user) if(alert("Do you want to rip \the [src] from its place?","You think...","Yes","No") == "Yes") - if(!Adjacent(user)) //Cannot bring up dialogue and walk away + if(!Adjacent(user)) // Cannot bring up dialogue and walk away. return FALSE if(!do_after(user, 2 SECONDS, act_target = src)) return FALSE @@ -435,15 +470,15 @@ rip() /obj/structure/sign/flag/proc/rip(var/rip_linked = TRUE) - var/icon/I = new('icons/obj/decals.dmi', icon_state) - var/icon/mask = new('icons/obj/decals.dmi', "ripped") + var/icon/I = new('icons/obj/flags.dmi', icon_state) + var/icon/mask = new('icons/obj/flags.dmi', "ripped") I.AddAlphaMask(mask) icon = I name = "ripped flag" desc = "You can't make out anything from the flag's original print. It's ruined." ripped = TRUE if(linked_flag && rip_linked) - linked_flag.rip(FALSE) //Prevents an infinite ripping loop + linked_flag.rip(FALSE) // Prevents an infinite ripping loop. /obj/structure/sign/flag/attackby(obj/item/W, mob/user) ..() diff --git a/html/changelogs/vacuum_sign.yml b/html/changelogs/vacuum_sign.yml new file mode 100644 index 00000000000..3b230ca3327 --- /dev/null +++ b/html/changelogs/vacuum_sign.yml @@ -0,0 +1,7 @@ +author: SleepyGemmy + +delete-after: True + +changes: + - backend: "Cleans up the signs, flags, and decals code- and sprites. Seperates them into their own DMI's. Removes unused sprites. Moves some sprites to a more fitting directory." + - rscadd: "Adds a new vacuum danger sign." \ No newline at end of file diff --git a/icons/48x48/walls48.dmi b/icons/48x48/walls48.dmi deleted file mode 100644 index 7e3dbe8bf67..00000000000 Binary files a/icons/48x48/walls48.dmi and /dev/null differ diff --git a/icons/PSD files/asteroiddustoverlay.psd b/icons/PSD files/asteroiddustoverlay.psd deleted file mode 100644 index a8e8f572b38..00000000000 Binary files a/icons/PSD files/asteroiddustoverlay.psd and /dev/null differ diff --git a/icons/PSD files/door.psd b/icons/PSD files/door.psd deleted file mode 100644 index 44a22a8b9e0..00000000000 Binary files a/icons/PSD files/door.psd and /dev/null differ diff --git a/icons/Testing/air_meter.dmi b/icons/Testing/air_meter.dmi deleted file mode 100644 index 56d1ff18a59..00000000000 Binary files a/icons/Testing/air_meter.dmi and /dev/null differ diff --git a/icons/Testing/atmos_testing.dmi b/icons/Testing/atmos_testing.dmi deleted file mode 100644 index 142bd4cbb1a..00000000000 Binary files a/icons/Testing/atmos_testing.dmi and /dev/null differ diff --git a/icons/Testing/turf_analysis.dmi b/icons/Testing/turf_analysis.dmi deleted file mode 100644 index e3aac1ebd05..00000000000 Binary files a/icons/Testing/turf_analysis.dmi and /dev/null differ diff --git a/icons/VendingMachineBG.png b/icons/VendingMachineBG.png deleted file mode 100644 index 5d7f010d1d7..00000000000 Binary files a/icons/VendingMachineBG.png and /dev/null differ diff --git a/icons/am_engine.dmi b/icons/am_engine.dmi deleted file mode 100644 index bcaa8e49a7f..00000000000 Binary files a/icons/am_engine.dmi and /dev/null differ diff --git a/icons/covershield.dmi b/icons/covershield.dmi deleted file mode 100644 index b3d8b21e8dd..00000000000 Binary files a/icons/covershield.dmi and /dev/null differ diff --git a/icons/debug-blue.dmi b/icons/debug-blue.dmi deleted file mode 100644 index daf21b40071..00000000000 Binary files a/icons/debug-blue.dmi and /dev/null differ diff --git a/icons/debug.dmi b/icons/debug.dmi deleted file mode 100644 index 7d2b5634c1b..00000000000 Binary files a/icons/debug.dmi and /dev/null differ diff --git a/icons/dispensebutton_bg.png b/icons/dispensebutton_bg.png deleted file mode 100644 index 195c02114ea..00000000000 Binary files a/icons/dispensebutton_bg.png and /dev/null differ diff --git a/icons/meteor_turret.dmi b/icons/meteor_turret.dmi deleted file mode 100644 index 3f62c56b1b3..00000000000 Binary files a/icons/meteor_turret.dmi and /dev/null differ diff --git a/icons/minimap.dmi b/icons/minimap.dmi deleted file mode 100644 index 26aecb84b96..00000000000 Binary files a/icons/minimap.dmi and /dev/null differ diff --git a/icons/obj/decal_warning_stripes.dmi b/icons/obj/decal_warning_stripes.dmi deleted file mode 100644 index a0cf5e32447..00000000000 Binary files a/icons/obj/decal_warning_stripes.dmi and /dev/null differ diff --git a/icons/obj/decals.dmi b/icons/obj/decals.dmi index 2776bdbd475..18b94fe87e6 100644 Binary files a/icons/obj/decals.dmi and b/icons/obj/decals.dmi differ diff --git a/icons/obj/flags.dmi b/icons/obj/flags.dmi new file mode 100644 index 00000000000..40f6bf7234b Binary files /dev/null and b/icons/obj/flags.dmi differ diff --git a/icons/obj/gate.dmi b/icons/obj/gate.dmi deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/icons/obj/mediwall.dmi b/icons/obj/mediwall.dmi deleted file mode 100644 index 7e916b3e8fe..00000000000 Binary files a/icons/obj/mediwall.dmi and /dev/null differ diff --git a/icons/policetape.dmi b/icons/obj/policetape.dmi similarity index 100% rename from icons/policetape.dmi rename to icons/obj/policetape.dmi diff --git a/icons/obj/signs.dmi b/icons/obj/signs.dmi new file mode 100644 index 00000000000..049197145f3 Binary files /dev/null and b/icons/obj/signs.dmi differ diff --git a/icons/pda_icons/pda_atmos.png b/icons/pda_icons/pda_atmos.png deleted file mode 100644 index 89a55a0a6cb..00000000000 Binary files a/icons/pda_icons/pda_atmos.png and /dev/null differ diff --git a/icons/pda_icons/pda_back.png b/icons/pda_icons/pda_back.png deleted file mode 100644 index 4708824853f..00000000000 Binary files a/icons/pda_icons/pda_back.png and /dev/null differ diff --git a/icons/pda_icons/pda_bell.png b/icons/pda_icons/pda_bell.png deleted file mode 100644 index 1e989c27473..00000000000 Binary files a/icons/pda_icons/pda_bell.png and /dev/null differ diff --git a/icons/pda_icons/pda_blank.png b/icons/pda_icons/pda_blank.png deleted file mode 100644 index 665861d3c74..00000000000 Binary files a/icons/pda_icons/pda_blank.png and /dev/null differ diff --git a/icons/pda_icons/pda_boom.png b/icons/pda_icons/pda_boom.png deleted file mode 100644 index 70e473c3c4c..00000000000 Binary files a/icons/pda_icons/pda_boom.png and /dev/null differ diff --git a/icons/pda_icons/pda_bucket.png b/icons/pda_icons/pda_bucket.png deleted file mode 100644 index ee030e3a37d..00000000000 Binary files a/icons/pda_icons/pda_bucket.png and /dev/null differ diff --git a/icons/pda_icons/pda_chatroom.png b/icons/pda_icons/pda_chatroom.png deleted file mode 100644 index a00221c4e0d..00000000000 Binary files a/icons/pda_icons/pda_chatroom.png and /dev/null differ diff --git a/icons/pda_icons/pda_crate.png b/icons/pda_icons/pda_crate.png deleted file mode 100644 index e1e076e2790..00000000000 Binary files a/icons/pda_icons/pda_crate.png and /dev/null differ diff --git a/icons/pda_icons/pda_cuffs.png b/icons/pda_icons/pda_cuffs.png deleted file mode 100644 index 71958c8abc4..00000000000 Binary files a/icons/pda_icons/pda_cuffs.png and /dev/null differ diff --git a/icons/pda_icons/pda_eject.png b/icons/pda_icons/pda_eject.png deleted file mode 100644 index 4168be03f6a..00000000000 Binary files a/icons/pda_icons/pda_eject.png and /dev/null differ diff --git a/icons/pda_icons/pda_exit.png b/icons/pda_icons/pda_exit.png deleted file mode 100644 index cd983a4a9ab..00000000000 Binary files a/icons/pda_icons/pda_exit.png and /dev/null differ diff --git a/icons/pda_icons/pda_flashlight.png b/icons/pda_icons/pda_flashlight.png deleted file mode 100644 index 3476727930b..00000000000 Binary files a/icons/pda_icons/pda_flashlight.png and /dev/null differ diff --git a/icons/pda_icons/pda_honk.png b/icons/pda_icons/pda_honk.png deleted file mode 100644 index 55632bf40bc..00000000000 Binary files a/icons/pda_icons/pda_honk.png and /dev/null differ diff --git a/icons/pda_icons/pda_locked.PNG b/icons/pda_icons/pda_locked.PNG deleted file mode 100644 index 79fe5829162..00000000000 Binary files a/icons/pda_icons/pda_locked.PNG and /dev/null differ diff --git a/icons/pda_icons/pda_mail.png b/icons/pda_icons/pda_mail.png deleted file mode 100644 index 6bfb1e8cd7b..00000000000 Binary files a/icons/pda_icons/pda_mail.png and /dev/null differ diff --git a/icons/pda_icons/pda_medical.png b/icons/pda_icons/pda_medical.png deleted file mode 100644 index 448063ecf52..00000000000 Binary files a/icons/pda_icons/pda_medical.png and /dev/null differ diff --git a/icons/pda_icons/pda_menu.png b/icons/pda_icons/pda_menu.png deleted file mode 100644 index abd6ccb2257..00000000000 Binary files a/icons/pda_icons/pda_menu.png and /dev/null differ diff --git a/icons/pda_icons/pda_mule.png b/icons/pda_icons/pda_mule.png deleted file mode 100644 index b8c1b636f5e..00000000000 Binary files a/icons/pda_icons/pda_mule.png and /dev/null differ diff --git a/icons/pda_icons/pda_notes.png b/icons/pda_icons/pda_notes.png deleted file mode 100644 index eb076d3ca33..00000000000 Binary files a/icons/pda_icons/pda_notes.png and /dev/null differ diff --git a/icons/pda_icons/pda_power.png b/icons/pda_icons/pda_power.png deleted file mode 100644 index 04175e7c835..00000000000 Binary files a/icons/pda_icons/pda_power.png and /dev/null differ diff --git a/icons/pda_icons/pda_rdoor.png b/icons/pda_icons/pda_rdoor.png deleted file mode 100644 index 6eab5a8817d..00000000000 Binary files a/icons/pda_icons/pda_rdoor.png and /dev/null differ diff --git a/icons/pda_icons/pda_reagent.png b/icons/pda_icons/pda_reagent.png deleted file mode 100644 index b900af5ae66..00000000000 Binary files a/icons/pda_icons/pda_reagent.png and /dev/null differ diff --git a/icons/pda_icons/pda_refresh.png b/icons/pda_icons/pda_refresh.png deleted file mode 100644 index 08439c6bca3..00000000000 Binary files a/icons/pda_icons/pda_refresh.png and /dev/null differ diff --git a/icons/pda_icons/pda_scanner.png b/icons/pda_icons/pda_scanner.png deleted file mode 100644 index eabdc511cde..00000000000 Binary files a/icons/pda_icons/pda_scanner.png and /dev/null differ diff --git a/icons/pda_icons/pda_signaler.png b/icons/pda_icons/pda_signaler.png deleted file mode 100644 index f71398f70d2..00000000000 Binary files a/icons/pda_icons/pda_signaler.png and /dev/null differ diff --git a/icons/pda_icons/pda_status.png b/icons/pda_icons/pda_status.png deleted file mode 100644 index fe955e66a61..00000000000 Binary files a/icons/pda_icons/pda_status.png and /dev/null differ diff --git a/icons/reagentname_bg.png b/icons/reagentname_bg.png deleted file mode 100644 index 879179edd81..00000000000 Binary files a/icons/reagentname_bg.png and /dev/null differ diff --git a/icons/spideros_icons/sos_1.png b/icons/spideros_icons/sos_1.png deleted file mode 100644 index 079f548fde1..00000000000 Binary files a/icons/spideros_icons/sos_1.png and /dev/null differ diff --git a/icons/spideros_icons/sos_10.png b/icons/spideros_icons/sos_10.png deleted file mode 100644 index 5f962d60f45..00000000000 Binary files a/icons/spideros_icons/sos_10.png and /dev/null differ diff --git a/icons/spideros_icons/sos_11.png b/icons/spideros_icons/sos_11.png deleted file mode 100644 index fd68c8a4ac2..00000000000 Binary files a/icons/spideros_icons/sos_11.png and /dev/null differ diff --git a/icons/spideros_icons/sos_12.png b/icons/spideros_icons/sos_12.png deleted file mode 100644 index ff3a064c036..00000000000 Binary files a/icons/spideros_icons/sos_12.png and /dev/null differ diff --git a/icons/spideros_icons/sos_13.png b/icons/spideros_icons/sos_13.png deleted file mode 100644 index c396182cfed..00000000000 Binary files a/icons/spideros_icons/sos_13.png and /dev/null differ diff --git a/icons/spideros_icons/sos_14.png b/icons/spideros_icons/sos_14.png deleted file mode 100644 index 9d90684d8c6..00000000000 Binary files a/icons/spideros_icons/sos_14.png and /dev/null differ diff --git a/icons/spideros_icons/sos_2.png b/icons/spideros_icons/sos_2.png deleted file mode 100644 index 40009fe5622..00000000000 Binary files a/icons/spideros_icons/sos_2.png and /dev/null differ diff --git a/icons/spideros_icons/sos_3.png b/icons/spideros_icons/sos_3.png deleted file mode 100644 index 138b110b025..00000000000 Binary files a/icons/spideros_icons/sos_3.png and /dev/null differ diff --git a/icons/spideros_icons/sos_4.png b/icons/spideros_icons/sos_4.png deleted file mode 100644 index 4d5d23149c0..00000000000 Binary files a/icons/spideros_icons/sos_4.png and /dev/null differ diff --git a/icons/spideros_icons/sos_5.png b/icons/spideros_icons/sos_5.png deleted file mode 100644 index 7e43c9d8a46..00000000000 Binary files a/icons/spideros_icons/sos_5.png and /dev/null differ diff --git a/icons/spideros_icons/sos_6.png b/icons/spideros_icons/sos_6.png deleted file mode 100644 index ea6494a9128..00000000000 Binary files a/icons/spideros_icons/sos_6.png and /dev/null differ diff --git a/icons/spideros_icons/sos_7.png b/icons/spideros_icons/sos_7.png deleted file mode 100644 index d93d2b13fec..00000000000 Binary files a/icons/spideros_icons/sos_7.png and /dev/null differ diff --git a/icons/spideros_icons/sos_8.png b/icons/spideros_icons/sos_8.png deleted file mode 100644 index fd540cb3a82..00000000000 Binary files a/icons/spideros_icons/sos_8.png and /dev/null differ diff --git a/icons/spideros_icons/sos_9.png b/icons/spideros_icons/sos_9.png deleted file mode 100644 index 05d36c3e6fc..00000000000 Binary files a/icons/spideros_icons/sos_9.png and /dev/null differ diff --git a/icons/turf/flooring/decals.dmi b/icons/turf/flooring/decals.dmi index ae2f50ebd22..ec843cfe60f 100644 Binary files a/icons/turf/flooring/decals.dmi and b/icons/turf/flooring/decals.dmi differ diff --git a/icons/vending_icons/vendingslot_bg.png b/icons/vending_icons/vendingslot_bg.png deleted file mode 100644 index 6fb6fdcf8b9..00000000000 Binary files a/icons/vending_icons/vendingslot_bg.png and /dev/null differ diff --git a/icons/Testing/Zone.dmi b/icons/zone.dmi similarity index 100% rename from icons/Testing/Zone.dmi rename to icons/zone.dmi diff --git a/maps/aurora/aurora-1_centcomm.dmm b/maps/aurora/aurora-1_centcomm.dmm index 8dfd9f9ddb6..e6fbc911d2d 100644 --- a/maps/aurora/aurora-1_centcomm.dmm +++ b/maps/aurora/aurora-1_centcomm.dmm @@ -15963,7 +15963,7 @@ name = "mechanical supply crate"; pixel_x = 1 }, -/obj/structure/sign/emerg_exitZ{ +/obj/structure/sign/emergency/exit/ladder{ dir = 1; pixel_x = -9; pixel_y = 30 @@ -18729,7 +18729,7 @@ /turf/simulated/floor/wood, /area/centcom/shared_dream) "idk" = ( -/obj/structure/sign/emerg_exit{ +/obj/structure/sign/emergency/exit{ dir = 8; pixel_y = 32 }, diff --git a/maps/aurora/aurora-3_sublevel.dmm b/maps/aurora/aurora-3_sublevel.dmm index d362aca3833..4159addb872 100644 --- a/maps/aurora/aurora-3_sublevel.dmm +++ b/maps/aurora/aurora-3_sublevel.dmm @@ -12384,7 +12384,7 @@ "awi" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/floor_decal/industrial/outline/yellow, -/obj/structure/sign/emerg_exitZ{ +/obj/structure/sign/emergency/exit/ladder{ dir = 1; pixel_x = -32 }, diff --git a/maps/aurora/aurora-4_mainlevel.dmm b/maps/aurora/aurora-4_mainlevel.dmm index cf7dde2daa6..dc5da8b0424 100644 --- a/maps/aurora/aurora-4_mainlevel.dmm +++ b/maps/aurora/aurora-4_mainlevel.dmm @@ -39693,7 +39693,7 @@ /obj/effect/floor_decal/corner/paleblue{ dir = 5 }, -/obj/structure/sign/meeting_point{ +/obj/structure/sign/emergency/meetingpoint{ pixel_y = 32 }, /turf/simulated/floor/tiled, diff --git a/maps/aurora/aurora-5_interstitial.dmm b/maps/aurora/aurora-5_interstitial.dmm index 8cda2c6d5f8..4396981bebc 100644 --- a/maps/aurora/aurora-5_interstitial.dmm +++ b/maps/aurora/aurora-5_interstitial.dmm @@ -989,7 +989,7 @@ /obj/structure/ladder/up{ pixel_y = 16 }, -/obj/structure/sign/emerg_exitZ{ +/obj/structure/sign/emergency/exit/ladder{ dir = 1; pixel_x = 32; tag = "icon-emerg_exitZ (NORTH)" @@ -3654,7 +3654,7 @@ d2 = 4; icon_state = "2-4" }, -/obj/structure/sign/emerg_exit{ +/obj/structure/sign/emergency/exit{ pixel_x = -32 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, diff --git a/maps/away/ships/militia_ship.dmm b/maps/away/ships/militia_ship.dmm index 7c9b62f3b47..4724653675b 100644 --- a/maps/away/ships/militia_ship.dmm +++ b/maps/away/ships/militia_ship.dmm @@ -144,7 +144,7 @@ /turf/simulated/floor, /area/ship/militia_ship) "aPh" = ( -/obj/structure/sign/meeting_point{ +/obj/structure/sign/emergency/meetingpoint{ pixel_x = 32 }, /turf/simulated/floor/tiled/dark, diff --git a/maps/event/odin_departure/odin_depature-1.dmm b/maps/event/odin_departure/odin_depature-1.dmm index 24bc186b6e6..0560dbb0a81 100644 --- a/maps/event/odin_departure/odin_depature-1.dmm +++ b/maps/event/odin_departure/odin_depature-1.dmm @@ -16257,7 +16257,7 @@ name = "mechanical supply crate"; pixel_x = 1 }, -/obj/structure/sign/emerg_exitZ{ +/obj/structure/sign/emergency/exit/ladder{ dir = 1; pixel_x = -9; pixel_y = 30 @@ -19094,7 +19094,7 @@ /turf/simulated/floor/wood, /area/centcom/shared_dream) "idk" = ( -/obj/structure/sign/emerg_exit{ +/obj/structure/sign/emergency/exit{ dir = 8; pixel_y = 32 }, diff --git a/maps/sccv_horizon/backup/placeholder-4_centcomm.dmm b/maps/sccv_horizon/backup/placeholder-4_centcomm.dmm index 165405df503..3fb64d6a452 100644 --- a/maps/sccv_horizon/backup/placeholder-4_centcomm.dmm +++ b/maps/sccv_horizon/backup/placeholder-4_centcomm.dmm @@ -21990,7 +21990,7 @@ icon_state = "corner_white_full"; dir = 8 }, -/obj/structure/sign/emerg_exit{ +/obj/structure/sign/emergency/exit{ dir = 8; icon_state = "emerg_exit"; pixel_y = 32 @@ -22625,7 +22625,7 @@ icon_state = "corner_white"; dir = 5 }, -/obj/structure/sign/emerg_exit{ +/obj/structure/sign/emergency/exit{ dir = 8; icon_state = "emerg_exit"; pixel_x = -1; @@ -25935,7 +25935,7 @@ icon_state = "tube1"; dir = 1 }, -/obj/structure/sign/emerg_exit{ +/obj/structure/sign/emergency/exit{ dir = 8; icon_state = "emerg_exit"; pixel_x = -1; @@ -26468,7 +26468,7 @@ pixel_x = 1; pixel_y = 0 }, -/obj/structure/sign/emerg_exitZ{ +/obj/structure/sign/emergency/exit/ladder{ dir = 1; icon_state = "emerg_exitZ"; pixel_x = -9; diff --git a/maps/sccv_horizon/sccv_horizon-1_deck_1.dmm b/maps/sccv_horizon/sccv_horizon-1_deck_1.dmm index aeaa2efaddc..672953dabc9 100644 --- a/maps/sccv_horizon/sccv_horizon-1_deck_1.dmm +++ b/maps/sccv_horizon/sccv_horizon-1_deck_1.dmm @@ -1449,7 +1449,7 @@ /obj/machinery/light{ dir = 4 }, -/obj/structure/sign/emerg_exit/evac{ +/obj/structure/sign/emergency/evacuation{ dir = 4; pixel_x = 32 }, @@ -1919,7 +1919,7 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 1 }, -/obj/structure/sign/emerg_exit/evac{ +/obj/structure/sign/emergency/evacuation{ dir = 4 }, /turf/simulated/floor/tiled/dark, @@ -3584,7 +3584,7 @@ /obj/machinery/light/spot/weak{ dir = 4 }, -/obj/structure/sign/emerg_pods{ +/obj/structure/sign/emergency/evacuation/pods{ pixel_x = 32 }, /turf/simulated/floor/tiled, @@ -6471,7 +6471,7 @@ /obj/effect/floor_decal/corner/black{ dir = 9 }, -/obj/structure/sign/emerg_exit/evac{ +/obj/structure/sign/emergency/evacuation{ pixel_x = -32 }, /turf/simulated/floor/tiled, @@ -7343,7 +7343,7 @@ /obj/machinery/light{ dir = 4 }, -/obj/structure/sign/emerg_exit/evac{ +/obj/structure/sign/emergency/evacuation{ dir = 4; pixel_x = 32 }, @@ -7957,7 +7957,7 @@ /area/shuttle/escape_pod/pod1) "glb" = ( /obj/structure/railing/mapped, -/obj/structure/sign/emerg_exit/evac{ +/obj/structure/sign/emergency/evacuation{ dir = 8; layer = 2.1 }, @@ -10798,7 +10798,7 @@ "iFL" = ( /obj/machinery/door/airlock/freezer_maint{ name = "Morgue Maintenance"; - req_access = list(6) + req_access = list(5) }, /obj/machinery/door/firedoor, /turf/simulated/floor/tiled, @@ -11227,14 +11227,15 @@ /obj/effect/floor_decal/corner/brown{ dir = 10 }, -/obj/structure/sign/securearea{ - desc = "A danger sign which reads 'DANGER: THE MINING SHUTTLE HANGAR IS A DEPRESSURIZED AREA'."; - name = "\improper DANGER: DEPRESSURIZED AREA sign"; - pixel_y = -32 - }, /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/structure/sign/vacuum{ + pixel_y = -32 + }, +/obj/effect/floor_decal/industrial/warning/corner{ + dir = 8 + }, /turf/simulated/floor/tiled, /area/hangar/operations) "jbr" = ( @@ -11754,7 +11755,7 @@ /obj/machinery/door/firedoor, /obj/machinery/door/airlock/maintenance{ name = "Maintenance Passthrough"; - req_access = list(12) + req_one_access = list(12,26,31,48,67) }, /turf/simulated/floor/tiled, /area/horizon/stairwell/central) @@ -12423,7 +12424,7 @@ /obj/effect/floor_decal/corner/black{ dir = 9 }, -/obj/structure/sign/emerg_exit/evac{ +/obj/structure/sign/emergency/evacuation{ dir = 8; pixel_x = -32 }, @@ -13099,7 +13100,7 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/manifold/hidden/supply, -/obj/structure/sign/emerg_exit/evac{ +/obj/structure/sign/emergency/evacuation{ dir = 4; pixel_y = -32 }, @@ -13889,7 +13890,7 @@ /obj/machinery/door/firedoor, /obj/machinery/door/airlock/freezer_maint{ name = "Morgue Maintenance"; - req_access = list(6) + req_access = list(5) }, /turf/simulated/floor/tiled, /area/medical/emergency_storage) @@ -15583,7 +15584,7 @@ /turf/simulated/floor/tiled, /area/hangar/auxiliary) "mFO" = ( -/obj/structure/sign/emerg_exit/evac{ +/obj/structure/sign/emergency/evacuation{ dir = 8; layer = 2.1 }, @@ -15888,7 +15889,7 @@ c_tag = "First Deck - Hangar 13"; dir = 8 }, -/obj/structure/sign/emerg_exit/evac{ +/obj/structure/sign/emergency/evacuation{ dir = 4; pixel_x = 32 }, @@ -15956,7 +15957,7 @@ icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/structure/sign/emerg_exit/evac{ +/obj/structure/sign/emergency/evacuation{ dir = 4; pixel_x = 32 }, @@ -17623,7 +17624,7 @@ /obj/effect/floor_decal/corner/green{ dir = 10 }, -/obj/structure/sign/emerg_exit/evac{ +/obj/structure/sign/emergency/evacuation{ dir = 8; layer = 2.1 }, @@ -17769,6 +17770,7 @@ dir = 2; icon_state = "pipe-c" }, +/obj/effect/floor_decal/industrial/warning, /turf/simulated/floor/tiled, /area/hangar/operations) "ovh" = ( @@ -18211,6 +18213,7 @@ dir = 4; icon_state = "pipe-c" }, +/obj/effect/floor_decal/industrial/warning, /turf/simulated/floor/tiled, /area/hangar/operations) "oYp" = ( @@ -18362,7 +18365,7 @@ /area/horizon/hydroponics/lower) "pep" = ( /obj/effect/floor_decal/corner/green/full, -/obj/structure/sign/emerg_exit{ +/obj/structure/sign/emergency/exit{ pixel_y = -32 }, /obj/machinery/firealarm/west, @@ -20179,7 +20182,7 @@ /obj/effect/floor_decal/corner/black{ dir = 6 }, -/obj/structure/sign/emerg_exit/evac{ +/obj/structure/sign/emergency/evacuation{ dir = 8; pixel_x = -32 }, @@ -20969,11 +20972,10 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/structure/sign/securearea{ - desc = "A danger sign which reads 'DANGER: THE MINING SHUTTLE HANGAR IS A DEPRESSURIZED AREA'."; - name = "\improper DANGER: DEPRESSURIZED AREA sign"; +/obj/structure/sign/vacuum{ pixel_y = -32 }, +/obj/effect/floor_decal/industrial/warning/corner, /turf/simulated/floor/tiled, /area/hangar/operations) "rcA" = ( @@ -24547,7 +24549,7 @@ c_tag = "Operations - Hangar Starboard Fore"; dir = 4 }, -/obj/structure/sign/emerg_exit/evac{ +/obj/structure/sign/emergency/evacuation{ dir = 8; pixel_x = -32 }, @@ -24958,7 +24960,7 @@ /obj/machinery/light/spot/weak{ dir = 8 }, -/obj/structure/sign/emerg_pods{ +/obj/structure/sign/emergency/evacuation/pods{ pixel_x = -32 }, /turf/simulated/floor/tiled, @@ -24988,7 +24990,7 @@ c_tag = "Operations - Hangar Starboard Aft"; dir = 4 }, -/obj/structure/sign/emerg_exit/evac{ +/obj/structure/sign/emergency/evacuation{ dir = 8; pixel_x = -32 }, @@ -28572,6 +28574,7 @@ /obj/effect/floor_decal/corner/brown{ dir = 10 }, +/obj/effect/floor_decal/industrial/warning/corner, /turf/simulated/floor/tiled, /area/hangar/operations) "xol" = ( diff --git a/maps/sccv_horizon/sccv_horizon-2_deck_2.dmm b/maps/sccv_horizon/sccv_horizon-2_deck_2.dmm index 54e189a3525..73a71a8bec2 100644 --- a/maps/sccv_horizon/sccv_horizon-2_deck_2.dmm +++ b/maps/sccv_horizon/sccv_horizon-2_deck_2.dmm @@ -407,7 +407,7 @@ /obj/effect/floor_decal/corner/green{ dir = 5 }, -/obj/structure/sign/emerg_exitZ_stairs/evac{ +/obj/structure/sign/emergency/evacuation/stairs{ layer = 2.1 }, /obj/effect/floor_decal/industrial/outline/yellow, @@ -1483,6 +1483,13 @@ /obj/effect/floor_decal/industrial/warning/corner{ dir = 8 }, +/obj/machinery/embedded_controller/radio/airlock/access_controller{ + id_tag = "engine_airlock_control"; + name = "Engine Access Console"; + pixel_y = -36; + tag_exterior_door = "engine_airlock_exterior"; + tag_interior_door = "engine_airlock_interior" + }, /turf/simulated/floor/plating, /area/engineering/engine_room) "aJp" = ( @@ -1848,13 +1855,6 @@ dir = 8 }, /obj/effect/floor_decal/industrial/warning/corner, -/obj/machinery/embedded_controller/radio/airlock/access_controller{ - id_tag = "engine_airlock_control"; - name = "Engine Access Console"; - pixel_y = -36; - tag_exterior_door = "engine_airlock_exterior"; - tag_interior_door = "engine_airlock_interior" - }, /turf/simulated/floor/plating, /area/engineering/engine_room) "aST" = ( @@ -2662,7 +2662,7 @@ /area/rnd/hallway) "bmH" = ( /obj/effect/floor_decal/industrial/warning, -/obj/structure/sign/emerg_exitZ, +/obj/structure/sign/emergency/exit/ladder, /turf/simulated/floor/reinforced/airless, /area/horizon/exterior) "bmM" = ( @@ -2823,6 +2823,9 @@ /obj/structure/cable/green{ icon_state = "4-8" }, +/obj/structure/sign/radiation{ + pixel_y = 32 + }, /turf/simulated/floor/tiled/dark, /area/hallway/engineering) "brZ" = ( @@ -6604,6 +6607,13 @@ /turf/template_noop, /area/template_noop) "dAN" = ( +/obj/effect/floor_decal/industrial/hatch/red, +/obj/effect/floor_decal/industrial/warning{ + dir = 8 + }, +/obj/effect/floor_decal/industrial/warning{ + dir = 4 + }, /turf/simulated/floor/airless, /area/engineering/engine_room) "dAX" = ( @@ -12959,11 +12969,18 @@ /area/operations/office) "gWf" = ( /obj/machinery/door/blast/regular{ - dir = 2; + dir = 4; id = "EngineVent"; is_critical = 1; name = "Reactor Vent" }, +/obj/effect/floor_decal/industrial/hatch/red, +/obj/effect/floor_decal/industrial/warning{ + dir = 8 + }, +/obj/effect/floor_decal/industrial/warning{ + dir = 4 + }, /turf/simulated/floor/airless, /area/engineering/engine_room) "gWW" = ( @@ -12993,11 +13010,6 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/tiled, /area/horizon/hydroponics/garden) -"gXh" = ( -/obj/effect/floor_decal/corner/red/diagonal, -/obj/machinery/light/small, -/turf/simulated/floor/tiled, -/area/storage/primary) "gXu" = ( /obj/machinery/atmospherics/pipe/simple/visible/cyan, /turf/simulated/floor/plating, @@ -13529,7 +13541,7 @@ c_tag = "Second Deck - Dinner Entrance 1"; dir = 4 }, -/obj/structure/sign/emerg_exit/evac{ +/obj/structure/sign/emergency/evacuation{ dir = 8; pixel_x = -32 }, @@ -17420,7 +17432,7 @@ frequency = 1379; master_tag = "engine_airlock_control"; name = "Engine Access Button"; - pixel_x = -24; + pixel_x = 24; pixel_y = 5; req_one_access = list(11,24) }, @@ -19667,6 +19679,9 @@ c_tag = "Engineering - SMES Room"; dir = 4 }, +/obj/structure/sign/radiation{ + pixel_y = 32 + }, /turf/simulated/floor/plating, /area/engineering/smes) "kOE" = ( @@ -20200,7 +20215,7 @@ dir = 10 }, /obj/machinery/light, -/obj/structure/sign/emerg_exit/evac{ +/obj/structure/sign/emergency/evacuation{ pixel_y = -32 }, /turf/simulated/floor/tiled/dark, @@ -20953,6 +20968,9 @@ /area/horizon/hydroponics/garden) "lBV" = ( /obj/machinery/atmospherics/pipe/simple/heat_exchanging/junction, +/obj/structure/sign/radiation{ + pixel_x = -32 + }, /turf/simulated/open/airless, /area/horizon/exterior) "lBW" = ( @@ -22038,11 +22056,13 @@ /area/hallway/primary/central_two) "mdU" = ( /obj/machinery/door/blast/regular{ - dir = 2; + dir = 4; id = "EngineVent"; is_critical = 1; name = "Reactor Vent" }, +/obj/effect/floor_decal/industrial/hatch/red, +/obj/effect/floor_decal/industrial/warning/cee, /turf/simulated/floor/plating, /area/engineering/engine_room) "mep" = ( @@ -26350,13 +26370,13 @@ dir = 9 }, /obj/structure/closet/radiation, -/obj/machinery/alarm{ - pixel_y = 28 - }, /obj/machinery/camera/network/engine{ c_tag = "Engineering - Engine Access"; dir = 4 }, +/obj/structure/sign/radiation{ + pixel_y = 32 + }, /turf/simulated/floor/tiled, /area/engineering/engine_airlock) "oxb" = ( @@ -32105,11 +32125,15 @@ /turf/simulated/floor/tiled, /area/engineering/engine_room) "rwn" = ( -/obj/structure/sign/securearea{ - icon_state = "radiation" +/obj/machinery/atmospherics/pipe/simple/heat_exchanging{ + dir = 4 }, -/turf/simulated/wall/r_wall, -/area/engineering/engine_airlock) +/obj/structure/lattice, +/obj/structure/sign/radiation{ + pixel_y = -32 + }, +/turf/simulated/open/airless, +/area/horizon/exterior) "rwW" = ( /obj/structure/cable/orange{ icon_state = "1-2" @@ -32630,11 +32654,11 @@ /turf/simulated/floor/tiled/white, /area/operations/break_room) "rMf" = ( -/obj/structure/sign/securearea{ - icon_state = "radiation" +/obj/structure/sign/radiation{ + pixel_y = 32 }, -/turf/simulated/wall/r_wall, -/area/engineering/engine_monitoring) +/turf/simulated/floor/tiled, +/area/hallway/engineering) "rMw" = ( /obj/machinery/atmospherics/pipe/simple/heat_exchanging{ dir = 10 @@ -34000,12 +34024,6 @@ }, /turf/simulated/floor/tiled/white, /area/rnd/research) -"syf" = ( -/obj/structure/sign/securearea{ - icon_state = "radiation" - }, -/turf/simulated/wall/r_wall, -/area/engineering/smes) "sAT" = ( /obj/effect/floor_decal/corner/red/diagonal, /obj/structure/closet/walllocker/firecloset{ @@ -35778,10 +35796,10 @@ "tCG" = ( /obj/machinery/portable_atmospherics/powered/pump/filled, /obj/effect/floor_decal/corner/red/diagonal, -/obj/effect/floor_decal/industrial/outline/yellow, /obj/machinery/alarm{ pixel_y = 28 }, +/obj/effect/floor_decal/industrial/outline/blue, /turf/simulated/floor/tiled, /area/storage/primary) "tCP" = ( @@ -38798,6 +38816,10 @@ /turf/simulated/wall, /area/maintenance/substation/wing_starboard) "vcM" = ( +/obj/effect/floor_decal/industrial/hatch/red, +/obj/effect/floor_decal/industrial/warning/cee{ + dir = 1 + }, /turf/simulated/floor/airless, /area/horizon/exterior) "vdy" = ( @@ -41720,16 +41742,13 @@ "wAT" = ( /turf/simulated/floor/wood, /area/crew_quarters/heads/chief) -"wBf" = ( -/obj/structure/sign/securearea{ - icon_state = "radiation" - }, -/turf/simulated/wall/r_wall, -/area/engineering/engine_waste) "wBh" = ( -/obj/structure/reagent_dispensers/extinguisher, +/obj/machinery/light/small, +/obj/machinery/camera/network/second_deck{ + c_tag = "Second Deck - Starboard Emergency Supplies Closet"; + dir = 1 + }, /obj/effect/floor_decal/corner/red/diagonal, -/obj/effect/floor_decal/industrial/outline/yellow, /turf/simulated/floor/tiled, /area/storage/primary) "wBq" = ( @@ -44487,6 +44506,10 @@ /obj/machinery/shower{ dir = 4 }, +/obj/machinery/alarm{ + dir = 4; + pixel_x = -28 + }, /turf/simulated/floor/tiled, /area/engineering/engine_airlock) "xXi" = ( @@ -55335,10 +55358,10 @@ wRu lWB ydh bQd -rCR -rCR -rCR -tSl +fzh +fzh +fzh +oeF scx qgN qgN @@ -55741,9 +55764,9 @@ eau kJw hFg ibE -ibE -gXh -oeF +wBh +fzh +vfi scx qgN qgN @@ -55944,8 +55967,8 @@ aTa fzh tCG ibE -wBh -dGz +fzh +rSP whe qgN qgN @@ -59737,7 +59760,7 @@ uYK owY xWV xnG -rwn +uYK bqW opt hal @@ -60137,7 +60160,7 @@ rTZ pfb ngC aIP -rwn +uYK lkO vPf ruz @@ -60545,7 +60568,7 @@ ggd ioF tjk bFN -rMf +tYj jVn iGY aDI @@ -61130,7 +61153,7 @@ qgN avu bxp oSQ -oSQ +rwn wcr wcr qjm @@ -61353,7 +61376,7 @@ ggd vSJ dcF ewD -rMf +tYj jVn iGY mKJ @@ -61753,7 +61776,7 @@ avy dPM tZz pgF -syf +gsT kOt kWz rgk @@ -62763,8 +62786,8 @@ cfI wYS ioS tPW -wBf -hdG +gsz +rMf tXt pSI sgQ @@ -63167,7 +63190,7 @@ dvN roP nkb eGx -wBf +gsz hdG hpG nTS diff --git a/maps/sccv_horizon/sccv_horizon-3_deck_3.dmm b/maps/sccv_horizon/sccv_horizon-3_deck_3.dmm index b4d5b757ade..1bb2ee86558 100644 --- a/maps/sccv_horizon/sccv_horizon-3_deck_3.dmm +++ b/maps/sccv_horizon/sccv_horizon-3_deck_3.dmm @@ -3469,7 +3469,7 @@ "gv" = ( /obj/machinery/door/airlock/medical{ name = "Staff Facilities"; - req_access = list(66) + req_access = list(5) }, /obj/structure/disposalpipe/segment, /obj/machinery/door/firedoor, @@ -5341,7 +5341,7 @@ /obj/machinery/door/airlock/medical{ id_tag = "deck2_medicaltoilet"; name = "Staff Hygiene Facilities"; - req_access = list(66) + req_access = list(5) }, /obj/machinery/door/firedoor, /turf/simulated/floor/tiled/white, @@ -5666,7 +5666,8 @@ icon_state = "4-8" }, /obj/machinery/door/airlock/medical{ - name = "Recovery" + name = "Recovery"; + req_access = list(5) }, /turf/simulated/floor/tiled/white, /area/medical/ward) @@ -5795,7 +5796,7 @@ /obj/effect/floor_decal/corner/blue{ dir = 5 }, -/obj/structure/sign/meeting_point{ +/obj/structure/sign/emergency/meetingpoint{ pixel_y = 32 }, /turf/simulated/floor/tiled/dark, @@ -9066,7 +9067,7 @@ c_tag = "Third Deck - Central Stairwell"; dir = 4 }, -/obj/structure/sign/emerg_exitZ_stairs/evac{ +/obj/structure/sign/emergency/evacuation/stairs{ layer = 2.1 }, /obj/effect/floor_decal/industrial/outline/yellow, @@ -9636,7 +9637,7 @@ /area/horizon/crew_quarters/fitness/showers) "rF" = ( /obj/machinery/door/airlock/maintenance{ - req_access = list(66) + req_access = list(5) }, /obj/machinery/door/firedoor, /turf/simulated/floor, @@ -9816,7 +9817,7 @@ }, /obj/machinery/door/airlock/medical{ name = "Staff Facilities"; - req_access = list(66) + req_access = list(5) }, /obj/machinery/door/firedoor, /obj/machinery/door/blast/shutters{ @@ -12531,7 +12532,7 @@ /area/horizon/hallway/deck_three/primary/starboard) "wS" = ( /obj/machinery/door/airlock/maintenance{ - req_access = list(12) + req_one_access = list(5,12) }, /obj/machinery/door/firedoor, /obj/structure/cable/green{ @@ -15824,7 +15825,7 @@ "De" = ( /obj/machinery/door/airlock/maintenance{ name = "Cryogenics Maintenance"; - req_access = list(12) + req_one_access = list(5,12) }, /obj/structure/cable/green{ icon_state = "4-8" @@ -16404,7 +16405,7 @@ c_tag = "Bridge - Deck 3- Bunker Escape Route"; network = list("Command","Bunker") }, -/obj/structure/sign/emerg_exitZ{ +/obj/structure/sign/emergency/exit/ladder{ pixel_x = -32 }, /obj/machinery/light/small{ @@ -16455,7 +16456,7 @@ }, /obj/machinery/door/airlock/medical{ name = "Staff Showers"; - req_access = list(66) + req_access = list(5) }, /obj/machinery/door/firedoor, /turf/simulated/floor/tiled/white, @@ -19783,12 +19784,8 @@ /turf/simulated/floor/grass/alt, /area/horizon/deck_three/nature_showcase) "Kl" = ( -/obj/structure/sign/emerg_exit{ - dir = 1; - pixel_x = 32 - }, /obj/structure/lattice, -/obj/structure/sign/emerg_exitZ{ +/obj/structure/sign/emergency/exit/ladder{ pixel_x = -32 }, /obj/structure/grille, @@ -19802,6 +19799,10 @@ pixel_y = 25; req_access = list(20) }, +/obj/structure/sign/emergency/exit{ + dir = 1; + pixel_x = 32 + }, /turf/simulated/open, /area/crew_quarters/captain) "Km" = ( @@ -19813,7 +19814,7 @@ /area/journalistoffice) "Kn" = ( /obj/machinery/door/airlock/maintenance{ - req_access = list(12) + req_one_access = list(5,12) }, /obj/machinery/door/firedoor, /obj/structure/cable/green{ @@ -23555,7 +23556,7 @@ /obj/effect/floor_decal/corner/green/full{ dir = 8 }, -/obj/structure/sign/emerg_exit{ +/obj/structure/sign/emergency/exit{ dir = 4; pixel_y = 37 }, @@ -23565,7 +23566,7 @@ /turf/simulated/floor/tiled/white, /area/horizon/crew_quarters/cryo) "QR" = ( -/obj/structure/sign/emerg_exit{ +/obj/structure/sign/emergency/exit{ dir = 8; pixel_x = -32 }, @@ -26167,7 +26168,7 @@ }, /obj/machinery/door/airlock/medical{ name = "Staff Facilities"; - req_access = list(66) + req_access = list(5) }, /obj/machinery/door/firedoor, /turf/simulated/floor/tiled/dark, @@ -26509,7 +26510,7 @@ /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 1 }, -/obj/structure/sign/emerg_exit/evac{ +/obj/structure/sign/emergency/evacuation{ pixel_y = -32 }, /turf/simulated/floor/tiled, diff --git a/maps/sccv_horizon/sccv_horizon-4_centcomm.dmm b/maps/sccv_horizon/sccv_horizon-4_centcomm.dmm index 7e20381bd1f..954a083cb51 100644 --- a/maps/sccv_horizon/sccv_horizon-4_centcomm.dmm +++ b/maps/sccv_horizon/sccv_horizon-4_centcomm.dmm @@ -20183,7 +20183,7 @@ name = "mechanical supply crate"; pixel_x = 1 }, -/obj/structure/sign/emerg_exitZ{ +/obj/structure/sign/emergency/exit/ladder{ dir = 1; pixel_x = -9; pixel_y = 30 @@ -20656,7 +20656,7 @@ /turf/unsimulated/floor/plating, /area/centcom/legion) "aYn" = ( -/obj/structure/sign/emerg_exit{ +/obj/structure/sign/emergency/exit{ dir = 8; pixel_y = 32 },