diff --git a/code/game/machinery/air_alarm.dm b/code/game/machinery/air_alarm.dm index 228cf5472f4..a156798544d 100644 --- a/code/game/machinery/air_alarm.dm +++ b/code/game/machinery/air_alarm.dm @@ -92,6 +92,16 @@ /obj/machinery/alarm/alarms_hidden alarms_hidden = TRUE +/obj/machinery/alarm/angled + icon = 'icons/obj/wall_machines_angled.dmi' + +/obj/machinery/alarm/angled/hidden + alarms_hidden = TRUE + +/obj/machinery/alarm/angled/offset_airalarm() + pixel_x = (dir & 3) ? 0 : (dir == 4 ? -21 : 21) + pixel_y = (dir & 3) ? (dir == 1 ? -18 : 20) : 0 + /obj/machinery/alarm/server/Initialize(mapload) . = ..() req_access = list(access_rd, access_atmospherics, access_engine_equip) @@ -105,6 +115,8 @@ /obj/machinery/alarm/Initialize(mapload) . = ..() + if(!pixel_x && !pixel_y) + offset_airalarm() first_run() /obj/machinery/alarm/Destroy() @@ -116,6 +128,10 @@ elect_master(exclude_self = TRUE) return ..() +/obj/machinery/alarm/proc/offset_airalarm() + pixel_x = (dir & 3) ? 0 : (dir == 4 ? -26 : 26) + pixel_y = (dir & 3) ? (dir == 1 ? -26 : 26) : 0 + /obj/machinery/alarm/proc/first_run() alarm_area = get_area(src) area_uid = "\ref[alarm_area]" @@ -134,9 +150,6 @@ TLV["pressure"] = list(ONE_ATMOSPHERE * 0.80, ONE_ATMOSPHERE * 0.90, ONE_ATMOSPHERE * 1.10, ONE_ATMOSPHERE * 1.20) /* kpa */ TLV["temperature"] = list(T0C - 26, T0C, T0C + 40, T0C + 66) // K - pixel_x = (src.dir & 3)? 0 : (src.dir == 4 ? -28 : 28) - pixel_y = (src.dir & 3)? (src.dir ==1 ? -28 : 28) : 0 - update_icon() /obj/machinery/alarm/Initialize() diff --git a/code/game/machinery/doors/airlock_angled.dm b/code/game/machinery/doors/airlock_angled.dm new file mode 100644 index 00000000000..ba39cf8bf20 --- /dev/null +++ b/code/game/machinery/doors/airlock_angled.dm @@ -0,0 +1,464 @@ +#define FILL_NONE 0 +#define FILL_METAL 1 +#define FILL_GLASS 2 +#define FILL_COLOR 3 + +/** + * A fairly rough translation of Bay's airlock icon system into ours, with the + * icons being built at runtime to afford the luxury of not needing to pre-bake + * all the icons like we have in the past, but preventing the overlay thrashing that + * Bay's seem to encounter. All the heavy lifting is just done once at initialization. + * + * The input state names from the various Bay files are: + * preview: Only in base_icon for mapping + * closed: static, when closed + * open: static, when open + * closing: anim, from open to closed transition + * opening: anim, from closed to open transition + * deny: static/anim, when denying a mob access + * + * The output state names to our system are: + * door_closed: closed + * door_locked: closed+bolted lights + * door_deny: deny + * door_open: open + * door_opening: opening+allow lights + * door_closing: closing+allow lights + * o_door_opening: opening+panel + * o_door_closing: closing+panel + * door_opening_stat: opening + * door_closing_stat: closing + * + * These do not include the door icon and are overlays: + * panel_open: bare panel overlay + * welded: bare welded overlay + * sparks_damaged: sparks for partial damage overlay + * sparks_broken: sparks for full damage overlay + * sparks_open: sparks when door is open overlay + */ + + +/obj/machinery/door/airlock/angled + icon_state = "preview" + dir = 2 + + var/fill_type = FILL_NONE + + var/static/list/angled_airlock_icon_cache = list() + /// Mandatory: The base door structure icon, very required. + var/base_icon + + /// Optional: Applied when fill_type is FILL_METAL + var/metal_fill_icon + /// Optional: Applied when fill_type is FILL_GLASS + var/glass_fill_icon + /// Optional: Applied when fill_type is FILL_COLOR + var/color_fill_icon + /// Optional: Used if stripe_color is set to a color value + var/stripe_icon + /// Optional: Used if stripe_color is set to a color value + var/stripe_fill_icon + /// Optional: Used if door_color is set to a color value + var/door_color_icon + + /// Optional: Lights to flash when the door denies access + var/lights_deny_icon + /// Optional: Lights to flash when the door is opening/closing + var/lights_green_icon + /// Optional: Lights to display when the door is closed and locked + var/lights_bolts_icon + /// Optional: Lights and/or sparks to display when the door is being emagged + var/lights_emag_icon + + /// Optional: Icon that contains the panel overlays for the door being worked on + var/panel_icon = 'icons/obj/doors/angled/station/panel.dmi' // bay seems to think these are 'close enough' for default use + /// Optional: Icon that contains the welded overlay + var/welded_icon = 'icons/obj/doors/angled/station/welded.dmi' + /// Optional: Icon that contains the spark animations for the door being partially destroyed + var/spark_damaged_icon = 'icons/obj/doors/angled/station/sparks_damaged.dmi' + /// Optional: Icon that contains the spark animations for the door being fully destroyed + var/spark_broken_icon = 'icons/obj/doors/angled/station/sparks_broken.dmi' + + /// Optional: If fill_value is not FILL_NONE, this color will be applied to the fill of the door + var/fill_color + /// Optional: If stripe_icon is not null, this color will be applied to the stripe on the door + var/stripe_color + /// Optional: If door_color_icon is not null, this color will be applied to the door color overlay + var/door_color + +/obj/machinery/door/airlock/angled/Initialize() + obtain_icon() + . = ..() + +/obj/machinery/door/airlock/angled/proc/obtain_icon() + var/icon/fill_icon + switch(fill_type) + if(FILL_METAL) + fill_icon = metal_fill_icon + glass = FALSE + opacity = TRUE + if(FILL_GLASS) + fill_icon = glass_fill_icon + glass = TRUE + opacity = FALSE + if(FILL_COLOR) + fill_icon = color_fill_icon + glass = FALSE + opacity = TRUE + + // don't care about lights since those will be the same for every base, and panel and welded + var/cache_key = "[base_icon]:[fill_type]:[stripe_color]:[door_color]:[fill_color]" + + var/icon/mine = angled_airlock_icon_cache[cache_key] + if(mine) + icon = mine + update_icon() + return // hooray + + // Base layer - the bare metal - absolutely required sprites + var/icon/door_closed = icon(base_icon, "closed") + var/icon/door_open = icon(base_icon, "open") + var/icon/door_locked = icon(base_icon, "closed") + var/icon/door_deny = icon(base_icon, "deny") + var/icon/door_spark = icon(base_icon, "closed") + var/icon/door_opening = icon(base_icon, "opening") + var/icon/door_closing = icon(base_icon, "closing") + var/icon/door_opening_stat = icon(base_icon, "opening") + var/icon/door_closing_stat = icon(base_icon, "closing") + var/icon/o_door_opening = icon(base_icon, "opening") + var/icon/o_door_closing = icon(base_icon, "closing") + + // Optional icons + var/icon/panel_open + var/icon/welded_closed + var/icon/welded_open + var/icon/sparks_damaged + var/icon/sparks_open + var/icon/sparks_broken + + if(panel_icon) + panel_open = icon(panel_icon, "closed") + else + panel_open = icon('icons/effects/effects.dmi', "nothing") + + if(welded_icon) + welded_closed = icon(welded_icon, "closed") + welded_open = icon(welded_icon, "open") // only used on firedoors far as I can tell + else + welded_closed = icon('icons/effects/effects.dmi', "nothing") + welded_open = icon('icons/effects/effects.dmi', "nothing") + + if(spark_damaged_icon) + sparks_damaged = icon(spark_damaged_icon, "closed") + sparks_open = icon(spark_damaged_icon, "open") + else + sparks_damaged = icon('icons/effects/effects.dmi', "nothing") + sparks_open = icon('icons/effects/effects.dmi', "nothing") + + if(spark_broken_icon) + sparks_broken = icon(spark_broken_icon, "closed") + else + sparks_broken = icon('icons/effects/effects.dmi', "nothing") + + // The filler for the gaps in the door, metal or glass or other + if(fill_icon) + fill_icon = icon(fill_icon) // Yeah, kinda weird huh + if(fill_color) + fill_icon.Blend(fill_color, ICON_MULTIPLY) + door_closed.Blend(icon(fill_icon, "closed"), ICON_OVERLAY) + door_locked.Blend(icon(fill_icon, "closed"), ICON_OVERLAY) + door_spark.Blend(icon(fill_icon, "closed"), ICON_OVERLAY) + door_deny.Blend(icon(fill_icon, "deny"), ICON_OVERLAY) + door_open.Blend(icon(fill_icon, "open"), ICON_OVERLAY) + door_opening.Blend(icon(fill_icon, "opening"), ICON_OVERLAY) + door_closing.Blend(icon(fill_icon, "closing"), ICON_OVERLAY) + o_door_opening.Blend(icon(fill_icon, "opening"), ICON_OVERLAY) + o_door_closing.Blend(icon(fill_icon, "closing"), ICON_OVERLAY) + door_opening_stat.Blend(icon(fill_icon, "opening"), ICON_OVERLAY) + door_closing_stat.Blend(icon(fill_icon, "closing"), ICON_OVERLAY) + + // Paint on the door + if(door_color_icon && door_color) + var/icon/dci = icon(door_color_icon) + dci.Blend(door_color, ICON_MULTIPLY) + door_closed.Blend(icon(dci, "closed"), ICON_OVERLAY) + door_locked.Blend(icon(dci, "closed"), ICON_OVERLAY) + door_spark.Blend(icon(dci, "closed"), ICON_OVERLAY) + door_deny.Blend(icon(dci, "deny"), ICON_OVERLAY) + door_open.Blend(icon(dci, "open"), ICON_OVERLAY) + door_opening.Blend(icon(dci, "opening"), ICON_OVERLAY) + door_closing.Blend(icon(dci, "closing"), ICON_OVERLAY) + o_door_opening.Blend(icon(dci, "opening"), ICON_OVERLAY) + o_door_closing.Blend(icon(dci, "closing"), ICON_OVERLAY) + door_opening_stat.Blend(icon(dci, "opening"), ICON_OVERLAY) + door_closing_stat.Blend(icon(dci, "closing"), ICON_OVERLAY) + + // Paint on top of that paint + if(stripe_icon && stripe_color) + var/icon/si = icon(stripe_icon) + si.Blend(stripe_color, ICON_MULTIPLY) + door_closed.Blend(icon(si, "closed"), ICON_OVERLAY) + door_locked.Blend(icon(si, "closed"), ICON_OVERLAY) + door_spark.Blend(icon(si, "closed"), ICON_OVERLAY) + door_deny.Blend(icon(si, "deny"), ICON_OVERLAY) + door_open.Blend(icon(si, "open"), ICON_OVERLAY) + door_opening.Blend(icon(si, "opening"), ICON_OVERLAY) + door_closing.Blend(icon(si, "closing"), ICON_OVERLAY) + o_door_opening.Blend(icon(si, "opening"), ICON_OVERLAY) + o_door_closing.Blend(icon(si, "closing"), ICON_OVERLAY) + door_opening_stat.Blend(icon(si, "opening"), ICON_OVERLAY) + door_closing_stat.Blend(icon(si, "closing"), ICON_OVERLAY) + + // Filler for gaps left by the filler + if(stripe_fill_icon) + var/icon/sfi = icon(stripe_fill_icon) + sfi.Blend(stripe_color, ICON_MULTIPLY) + door_closed.Blend(icon(sfi, "closed"), ICON_OVERLAY) + door_locked.Blend(icon(sfi, "closed"), ICON_OVERLAY) + door_spark.Blend(icon(sfi, "closed"), ICON_OVERLAY) + door_deny.Blend(icon(sfi, "deny"), ICON_OVERLAY) + door_open.Blend(icon(sfi, "open"), ICON_OVERLAY) + door_opening.Blend(icon(sfi, "opening"), ICON_OVERLAY) + door_closing.Blend(icon(sfi, "closing"), ICON_OVERLAY) + o_door_opening.Blend(icon(sfi, "opening"), ICON_OVERLAY) + o_door_closing.Blend(icon(sfi, "closing"), ICON_OVERLAY) + door_opening_stat.Blend(icon(sfi, "opening"), ICON_OVERLAY) + door_closing_stat.Blend(icon(sfi, "closing"), ICON_OVERLAY) + + // Lights on top of everything + if(lights_green_icon) + door_opening.Blend(icon(lights_green_icon, "opening"), ICON_OVERLAY) + o_door_opening.Blend(icon(lights_green_icon, "opening"), ICON_OVERLAY) + door_closing.Blend(icon(lights_green_icon, "closing"), ICON_OVERLAY) + o_door_closing.Blend(icon(lights_green_icon, "closing"), ICON_OVERLAY) + + if(lights_deny_icon) + door_deny.Blend(icon(lights_deny_icon, "deny"), ICON_OVERLAY) + + if(lights_bolts_icon) + door_locked.Blend(icon(lights_bolts_icon, "closed"), ICON_OVERLAY) + + if(lights_emag_icon) + door_spark.Blend(icon(lights_emag_icon, "deny"), ICON_OVERLAY) + + // Panel while opening/closing + o_door_opening.Blend(icon(panel_icon, "opening"), ICON_OVERLAY) + o_door_closing.Blend(icon(panel_icon, "closing"), ICON_OVERLAY) + + var/icon/final = icon('icons/effects/effects.dmi', "nothing") + if(width > 1) + var/pixel_width = world.icon_size * width + final.Crop(1,1,pixel_width,pixel_width) + final.Insert(door_closed, "door_closed") + final.Insert(door_open, "door_open") + final.Insert(door_locked, "door_locked") + final.Insert(door_deny, "door_deny") + final.Insert(door_opening, "door_opening") + final.Insert(door_closing, "door_closing") + final.Insert(door_spark, "door_spark") + final.Insert(o_door_opening, "o_door_opening") + final.Insert(o_door_closing, "o_door_closing") + final.Insert(door_opening_stat, "door_opening_stat") + final.Insert(door_closing_stat, "door_closing_stat") + final.Insert(panel_open, "panel_open") + final.Insert(welded_closed, "welded") + final.Insert(welded_open, "welded_open") + final.Insert(sparks_damaged, "sparks_damaged") + final.Insert(sparks_broken, "sparks_broken") + final.Insert(sparks_open, "sparks_open") + + angled_airlock_icon_cache[cache_key] = final + icon = final + update_icon() + +/obj/machinery/door/airlock/angled/proc/gimme_icon() + usr << ftp(icon, "[name].dmi") + +/** + * The actual door types you can map in. + * Comments show what you can customize. + */ + +// Fills: Metal, glass, color +// Supports stripe color +// Supports door color +/obj/machinery/door/airlock/angled/standard + icon = 'icons/obj/doors/angled/station/door.dmi' + fill_type = FILL_METAL + + base_icon = 'icons/obj/doors/angled/station/door.dmi' + metal_fill_icon = 'icons/obj/doors/angled/station/fill_steel.dmi' + glass_fill_icon = 'icons/obj/doors/angled/station/fill_glass.dmi' + color_fill_icon = 'icons/obj/doors/angled/station/fill_color.dmi' + stripe_fill_icon = 'icons/obj/doors/angled/station/fill_stripe.dmi' + stripe_icon = 'icons/obj/doors/angled/station/stripe.dmi' + door_color_icon = 'icons/obj/doors/angled/station/color.dmi' + lights_deny_icon = 'icons/obj/doors/angled/station/lights_deny.dmi' + lights_green_icon = 'icons/obj/doors/angled/station/lights_green.dmi' + lights_bolts_icon = 'icons/obj/doors/angled/station/lights_bolts.dmi' + lights_emag_icon = 'icons/obj/doors/angled/station/emag.dmi' + panel_icon = 'icons/obj/doors/angled/station/panel.dmi' + welded_icon = 'icons/obj/doors/angled/station/welded.dmi' +/obj/machinery/door/airlock/angled/standard/glass + icon_state = "preview_glass" + fill_type = FILL_GLASS +/obj/machinery/door/airlock/angled/standard/color + icon_state = "preview_color" + fill_type = FILL_COLOR + +// Fills: Metal +// Supports stripe color +/obj/machinery/door/airlock/angled/hatch + icon = 'icons/obj/doors/angled/hatch/door.dmi' + fill_type = FILL_METAL + + base_icon = 'icons/obj/doors/angled/hatch/door.dmi' + metal_fill_icon = 'icons/obj/doors/angled/hatch/fill_steel.dmi' + stripe_fill_icon = 'icons/obj/doors/angled/hatch/fill_stripe.dmi' + stripe_icon = 'icons/obj/doors/angled/hatch/stripe.dmi' + lights_deny_icon = 'icons/obj/doors/angled/hatch/lights_deny.dmi' + lights_green_icon = 'icons/obj/doors/angled/hatch/lights_green.dmi' + lights_bolts_icon = 'icons/obj/doors/angled/hatch/lights_bolts.dmi' + lights_emag_icon = 'icons/obj/doors/angled/hatch/emag.dmi' + panel_icon = 'icons/obj/doors/angled/hatch/panel.dmi' + welded_icon = 'icons/obj/doors/angled/hatch/welded.dmi' + +// Fills: None +/obj/machinery/door/airlock/angled/ascent + icon = 'icons/obj/doors/angled/ascent/door.dmi' + + base_icon = 'icons/obj/doors/angled/ascent/door.dmi' + lights_deny_icon = 'icons/obj/doors/angled/ascent/lights_deny.dmi' + lights_green_icon = 'icons/obj/doors/angled/ascent/lights_green.dmi' + lights_bolts_icon = 'icons/obj/doors/angled/ascent/lights_bolts.dmi' + lights_emag_icon = 'icons/obj/doors/angled/ascent/emag.dmi' + panel_icon = 'icons/obj/doors/angled/ascent/panel.dmi' + welded_icon = 'icons/obj/doors/angled/ascent/welded.dmi' + spark_damaged_icon = 'icons/obj/doors/angled/ascent/sparks_damaged.dmi' + spark_broken_icon = 'icons/obj/doors/angled/ascent/sparks_broken.dmi' + +// Fills: Metal, glass, color +// Supports door color +/obj/machinery/door/airlock/angled/external + icon = 'icons/obj/doors/angled/external/door.dmi' + fill_type = FILL_METAL + + base_icon = 'icons/obj/doors/angled/external/door.dmi' + metal_fill_icon = 'icons/obj/doors/angled/external/fill_steel.dmi' + glass_fill_icon = 'icons/obj/doors/angled/external/fill_glass.dmi' + color_fill_icon = 'icons/obj/doors/angled/external/fill_color.dmi' + door_color_icon = 'icons/obj/doors/angled/external/color.dmi' + lights_deny_icon = 'icons/obj/doors/angled/external/lights_deny.dmi' + lights_green_icon = 'icons/obj/doors/angled/external/lights_green.dmi' + lights_bolts_icon = 'icons/obj/doors/angled/external/lights_bolts.dmi' + lights_emag_icon = 'icons/obj/doors/angled/external/emag.dmi' +/obj/machinery/door/airlock/angled/external/glass + icon_state = "preview_glass" + fill_type = FILL_GLASS +/obj/machinery/door/airlock/angled/external/color + icon_state = "preview_color" + fill_type = FILL_COLOR + +// Fills: Metal, glass +/obj/machinery/door/airlock/angled/elevator + icon = 'icons/obj/doors/angled/elevator/door.dmi' + fill_type = FILL_METAL + + base_icon = 'icons/obj/doors/angled/elevator/door.dmi' + metal_fill_icon = 'icons/obj/doors/angled/elevator/fill_steel.dmi' + glass_fill_icon = 'icons/obj/doors/angled/elevator/fill_glass.dmi' + lights_deny_icon = 'icons/obj/doors/angled/elevator/lights_deny.dmi' + lights_green_icon = 'icons/obj/doors/angled/elevator/lights_green.dmi' + lights_bolts_icon = 'icons/obj/doors/angled/elevator/lights_bolts.dmi' + welded_icon = 'icons/obj/doors/angled/elevator/welded.dmi' +/obj/machinery/door/airlock/angled/elevator/glass + icon_state = "preview_glass" + fill_type = FILL_GLASS + + +// Very few options on these, basically just static doors. +/obj/machinery/door/airlock/angled/hazard // firedoors + icon = 'icons/obj/doors/angled/hazard/door.dmi' + + base_icon = 'icons/obj/doors/angled/hazard/door.dmi' + panel_icon = 'icons/obj/doors/angled/hazard/panel.dmi' + welded_icon = 'icons/obj/doors/angled/hazard/welded.dmi' + +/obj/machinery/door/airlock/angled/vault + icon = 'icons/obj/doors/angled/vault/door.dmi' + fill_type = FILL_METAL // the only option + + base_icon = 'icons/obj/doors/angled/vault/door.dmi' + metal_fill_icon = 'icons/obj/doors/angled/vault/fill_steel.dmi' + +/obj/machinery/door/airlock/angled/secure + icon = 'icons/obj/doors/angled/secure/door.dmi' + fill_type = FILL_METAL // the only option + + base_icon = 'icons/obj/doors/angled/secure/door.dmi' + metal_fill_icon = 'icons/obj/doors/angled/secure/fill_steel.dmi' + +/obj/machinery/door/airlock/angled/centcomm + icon = 'icons/obj/doors/angled/centcomm/door.dmi' + fill_type = FILL_METAL // the only option + + base_icon = 'icons/obj/doors/angled/centcomm/door.dmi' + metal_fill_icon = 'icons/obj/doors/angled/centcomm/fill_steel.dmi' + +// Double door requires a little code +// Fills: Metal, glass, color +// Supports stripe color +// Supports door color +/obj/machinery/door/airlock/angled/double + width = 2 + appearance_flags = 0 + icon = 'icons/obj/doors/angled/double/door.dmi' + fill_type = FILL_METAL + + base_icon = 'icons/obj/doors/angled/double/door.dmi' + metal_fill_icon = 'icons/obj/doors/angled/double/fill_steel.dmi' + glass_fill_icon = 'icons/obj/doors/angled/double/fill_glass.dmi' + color_fill_icon = 'icons/obj/doors/angled/double/fill_color.dmi' + stripe_fill_icon = 'icons/obj/doors/angled/double/fill_stripe.dmi' + stripe_icon = 'icons/obj/doors/angled/double/stripe.dmi' + door_color_icon = 'icons/obj/doors/angled/double/color.dmi' + lights_deny_icon = 'icons/obj/doors/angled/double/lights_deny.dmi' + lights_green_icon = 'icons/obj/doors/angled/double/lights_green.dmi' + lights_bolts_icon = 'icons/obj/doors/angled/double/lights_bolts.dmi' + lights_emag_icon = 'icons/obj/doors/angled/double/emag.dmi' + panel_icon = 'icons/obj/doors/angled/double/panel.dmi' + welded_icon = 'icons/obj/doors/angled/double/welded.dmi' + spark_damaged_icon = 'icons/obj/doors/angled/double/sparks_damaged.dmi' + spark_broken_icon = 'icons/obj/doors/angled/double/sparks_broken.dmi' +/obj/machinery/door/airlock/angled/double/glass + icon_state = "preview_glass" + fill_type = FILL_GLASS +/obj/machinery/door/airlock/angled/double/color + icon_state = "preview_color" + fill_type = FILL_COLOR + +/obj/machinery/door/airlock/angled/double/Initialize(mapload) + . = ..() + SetBounds() + apply_opacity_to_my_turfs(opacity) + +/obj/machinery/door/airlock/angled/double/set_opacity() + . = ..() + apply_opacity_to_my_turfs(opacity) + +/obj/machinery/door/airlock/angled/double/Moved() + . = ..() + SetBounds() + +/obj/machinery/door/airlock/angled/double/proc/apply_opacity_to_my_turfs(new_opacity) + for(var/turf/T in locs) + T.set_opacity(new_opacity) + update_nearby_tiles() + +/obj/machinery/door/airlock/angled/double/proc/SetBounds() + if(dir & 3) + bound_width = width * world.icon_size + bound_height = world.icon_size + else + bound_width = world.icon_size + bound_height = width * world.icon_size diff --git a/code/game/machinery/fire_alarm.dm b/code/game/machinery/fire_alarm.dm index 879a8ae7a8c..d8d3fde2229 100644 --- a/code/game/machinery/fire_alarm.dm +++ b/code/game/machinery/fire_alarm.dm @@ -28,15 +28,32 @@ FIRE ALARM /obj/machinery/firealarm/alarms_hidden alarms_hidden = TRUE +/obj/machinery/firealarm/angled + icon = 'icons/obj/wall_machines_angled.dmi' + +/obj/machinery/firealarm/angled/hidden + alarms_hidden = TRUE + +/obj/machinery/firealarm/angled/offset_alarm() + pixel_x = (dir & 3) ? 0 : (dir == 4 ? 20 : -20) + pixel_y = (dir & 3) ? (dir == 1 ? -18 : 21) : 0 + /obj/machinery/firealarm/examine() . = ..() . += "Current security level: [seclevel]" /obj/machinery/firealarm/Initialize() . = ..() + if(!pixel_x && !pixel_y) + offset_alarm() + if(z in using_map.contact_levels) set_security_level(security_level ? get_security_level() : "green") +/obj/machinery/firealarm/proc/offset_alarm() + pixel_x = (dir & 3) ? 0 : (dir == 4 ? 26 : -26) + pixel_y = (dir & 3) ? (dir == 1 ? -26 : 26) : 0 + /obj/machinery/firealarm/update_icon() cut_overlays() @@ -73,8 +90,10 @@ FIRE ALARM . += mutable_appearance(icon, fire_state) . += emissive_appearance(icon, fire_state) - . += mutable_appearance(icon, "overlay_[seclevel]") - . += emissive_appearance(icon, "overlay_[seclevel]") + + if(seclevel) + . += mutable_appearance(icon, "overlay_[seclevel]") + . += emissive_appearance(icon, "overlay_[seclevel]") add_overlay(.) diff --git a/code/game/objects/structures/wall_frame.dm b/code/game/objects/structures/low_wall.dm similarity index 95% rename from code/game/objects/structures/wall_frame.dm rename to code/game/objects/structures/low_wall.dm index 962b5be50eb..7776798665b 100644 --- a/code/game/objects/structures/wall_frame.dm +++ b/code/game/objects/structures/low_wall.dm @@ -584,23 +584,22 @@ icon_state = "sp_rphoron" window_type = /obj/structure/window/bay/phoronreinforced -/obj/effect/low_wall_spawner/bay/grille - icon = 'icons/obj/wall_frame_bay.dmi' - icon_state = "sp_glass_g" - low_wall_type = /obj/structure/low_wall/bay +/obj/effect/low_wall_spawner/bay/reinforced + icon_state = "spr_glass_g" + low_wall_type = /obj/structure/low_wall/bay/reinforced grille_type = /obj/structure/grille/bay window_type = /obj/structure/window/bay -/obj/effect/low_wall_spawner/bay/grille/rglass - icon_state = "sp_rglass_g" +/obj/effect/low_wall_spawner/bay/reinforced/rglass + icon_state = "spr_rglass_g" window_type = /obj/structure/window/bay/reinforced -/obj/effect/low_wall_spawner/bay/grille/phoron - icon_state = "sp_phoron_g" +/obj/effect/low_wall_spawner/bay/reinforced/phoron + icon_state = "spr_phoron_g" window_type = /obj/structure/window/bay/phoronbasic -/obj/effect/low_wall_spawner/bay/grille/rphoron - icon_state = "sp_rphoron_g" +/obj/effect/low_wall_spawner/bay/reinforced/rphoron + icon_state = "spr_rphoron_g" window_type = /obj/structure/window/bay/phoronreinforced // Eris types @@ -621,3 +620,20 @@ /obj/effect/low_wall_spawner/eris/rphoron icon_state = "sp_rphoron" window_type = /obj/structure/window/eris/phoronreinforced + +/obj/effect/low_wall_spawner/eris/reinforced + icon_state = "spr_glass" + low_wall_type = /obj/structure/low_wall/eris/reinforced + window_type = /obj/structure/window/eris + +/obj/effect/low_wall_spawner/eris/reinforced/rglass + icon_state = "spr_rglass" + window_type = /obj/structure/window/eris/reinforced + +/obj/effect/low_wall_spawner/eris/reinforced/phoron + icon_state = "spr_phoron" + window_type = /obj/structure/window/eris/phoronbasic + +/obj/effect/low_wall_spawner/eris/reinforced/rphoron + icon_state = "spr_rphoron" + window_type = /obj/structure/window/eris/phoronreinforced \ No newline at end of file diff --git a/code/modules/power/apc.dm b/code/modules/power/apc.dm index a4198a4e033..9a58e4d085d 100644 --- a/code/modules/power/apc.dm +++ b/code/modules/power/apc.dm @@ -75,6 +75,16 @@ GLOBAL_LIST_EMPTY(apcs) /obj/machinery/power/apc/alarms_hidden alarms_hidden = TRUE +/obj/machinery/power/apc/angled + icon = 'icons/obj/wall_machines_angled.dmi' + +/obj/machinery/power/apc/angled/hidden + alarms_hidden = TRUE + +/obj/machinery/power/apc/angled/offset_apc() + pixel_x = (dir & 3) ? 0 : (dir == 4 ? 24 : -24) + pixel_y = (dir & 3) ? (dir == 1 ? 20 : -20) : 0 + /obj/machinery/power/apc name = "area power controller" desc = "A control terminal for the area electrical systems." @@ -185,8 +195,9 @@ GLOBAL_LIST_EMPTY(apcs) if(building) set_dir(ndir) - pixel_x = (dir & 3)? 0 : (dir == 4 ? 26 : -26) //VOREStation Edit -> 24 to 26 - pixel_y = (dir & 3)? (dir ==1 ? 26 : -26) : 0 //VOREStation Edit -> 24 to 26 + if(!pixel_x && !pixel_y) + offset_apc() + if(building) area = get_area(src) area.apc = src @@ -228,11 +239,14 @@ GLOBAL_LIST_EMPTY(apcs) return ..() +/obj/machinery/power/apc/proc/offset_apc() + pixel_x = (dir & 3) ? 0 : (dir == 4 ? 26 : -26) + pixel_y = (dir & 3) ? (dir == 1 ? 26 : -26) : 0 + // APCs are pixel-shifted, so they need to be updated. /obj/machinery/power/apc/set_dir(new_dir) ..() - pixel_x = (dir & 3)? 0 : (dir == 4 ? 24 : -24) - pixel_y = (dir & 3)? (dir ==1 ? 24 : -24) : 0 + offset_apc() if(terminal) terminal.disconnect_from_network() terminal.set_dir(dir) // Terminal has same dir as master diff --git a/icons/obj/doors/angled/ascent/door.dmi b/icons/obj/doors/angled/ascent/door.dmi new file mode 100644 index 00000000000..dcc689e88c3 Binary files /dev/null and b/icons/obj/doors/angled/ascent/door.dmi differ diff --git a/icons/obj/doors/angled/ascent/emag.dmi b/icons/obj/doors/angled/ascent/emag.dmi new file mode 100644 index 00000000000..c81124414b3 Binary files /dev/null and b/icons/obj/doors/angled/ascent/emag.dmi differ diff --git a/icons/obj/doors/angled/ascent/lights_bolts.dmi b/icons/obj/doors/angled/ascent/lights_bolts.dmi new file mode 100644 index 00000000000..d20ed9037fb Binary files /dev/null and b/icons/obj/doors/angled/ascent/lights_bolts.dmi differ diff --git a/icons/obj/doors/angled/ascent/lights_deny.dmi b/icons/obj/doors/angled/ascent/lights_deny.dmi new file mode 100644 index 00000000000..7a5ff1faf7c Binary files /dev/null and b/icons/obj/doors/angled/ascent/lights_deny.dmi differ diff --git a/icons/obj/doors/angled/ascent/lights_green.dmi b/icons/obj/doors/angled/ascent/lights_green.dmi new file mode 100644 index 00000000000..b6d46559d1a Binary files /dev/null and b/icons/obj/doors/angled/ascent/lights_green.dmi differ diff --git a/icons/obj/doors/angled/ascent/panel.dmi b/icons/obj/doors/angled/ascent/panel.dmi new file mode 100644 index 00000000000..8a50130182d Binary files /dev/null and b/icons/obj/doors/angled/ascent/panel.dmi differ diff --git a/icons/obj/doors/angled/ascent/sparks_broken.dmi b/icons/obj/doors/angled/ascent/sparks_broken.dmi new file mode 100644 index 00000000000..c34af0e7250 Binary files /dev/null and b/icons/obj/doors/angled/ascent/sparks_broken.dmi differ diff --git a/icons/obj/doors/angled/ascent/sparks_damaged.dmi b/icons/obj/doors/angled/ascent/sparks_damaged.dmi new file mode 100644 index 00000000000..b21f418a6f3 Binary files /dev/null and b/icons/obj/doors/angled/ascent/sparks_damaged.dmi differ diff --git a/icons/obj/doors/angled/ascent/welded.dmi b/icons/obj/doors/angled/ascent/welded.dmi new file mode 100644 index 00000000000..eae1c9715cf Binary files /dev/null and b/icons/obj/doors/angled/ascent/welded.dmi differ diff --git a/icons/obj/doors/angled/centcomm/door.dmi b/icons/obj/doors/angled/centcomm/door.dmi new file mode 100644 index 00000000000..9926e4c11f6 Binary files /dev/null and b/icons/obj/doors/angled/centcomm/door.dmi differ diff --git a/icons/obj/doors/angled/centcomm/fill_steel.dmi b/icons/obj/doors/angled/centcomm/fill_steel.dmi new file mode 100644 index 00000000000..275b29a785a Binary files /dev/null and b/icons/obj/doors/angled/centcomm/fill_steel.dmi differ diff --git a/icons/obj/doors/angled/double/color.dmi b/icons/obj/doors/angled/double/color.dmi new file mode 100644 index 00000000000..4981fc95e61 Binary files /dev/null and b/icons/obj/doors/angled/double/color.dmi differ diff --git a/icons/obj/doors/angled/double/door.dmi b/icons/obj/doors/angled/double/door.dmi new file mode 100644 index 00000000000..14ba715f8ae Binary files /dev/null and b/icons/obj/doors/angled/double/door.dmi differ diff --git a/icons/obj/doors/angled/double/emag.dmi b/icons/obj/doors/angled/double/emag.dmi new file mode 100644 index 00000000000..ef65451a187 Binary files /dev/null and b/icons/obj/doors/angled/double/emag.dmi differ diff --git a/icons/obj/doors/angled/double/fill_color.dmi b/icons/obj/doors/angled/double/fill_color.dmi new file mode 100644 index 00000000000..d79f005dba8 Binary files /dev/null and b/icons/obj/doors/angled/double/fill_color.dmi differ diff --git a/icons/obj/doors/angled/double/fill_glass.dmi b/icons/obj/doors/angled/double/fill_glass.dmi new file mode 100644 index 00000000000..c0885e342cc Binary files /dev/null and b/icons/obj/doors/angled/double/fill_glass.dmi differ diff --git a/icons/obj/doors/angled/double/fill_steel.dmi b/icons/obj/doors/angled/double/fill_steel.dmi new file mode 100644 index 00000000000..085ba6cc276 Binary files /dev/null and b/icons/obj/doors/angled/double/fill_steel.dmi differ diff --git a/icons/obj/doors/angled/double/fill_stripe.dmi b/icons/obj/doors/angled/double/fill_stripe.dmi new file mode 100644 index 00000000000..1341460eb94 Binary files /dev/null and b/icons/obj/doors/angled/double/fill_stripe.dmi differ diff --git a/icons/obj/doors/angled/double/lights_bolts.dmi b/icons/obj/doors/angled/double/lights_bolts.dmi new file mode 100644 index 00000000000..2446574687d Binary files /dev/null and b/icons/obj/doors/angled/double/lights_bolts.dmi differ diff --git a/icons/obj/doors/angled/double/lights_deny.dmi b/icons/obj/doors/angled/double/lights_deny.dmi new file mode 100644 index 00000000000..46a615d6200 Binary files /dev/null and b/icons/obj/doors/angled/double/lights_deny.dmi differ diff --git a/icons/obj/doors/angled/double/lights_green.dmi b/icons/obj/doors/angled/double/lights_green.dmi new file mode 100644 index 00000000000..aa398415790 Binary files /dev/null and b/icons/obj/doors/angled/double/lights_green.dmi differ diff --git a/icons/obj/doors/angled/double/panel.dmi b/icons/obj/doors/angled/double/panel.dmi new file mode 100644 index 00000000000..1a5cd5f9b2b Binary files /dev/null and b/icons/obj/doors/angled/double/panel.dmi differ diff --git a/icons/obj/doors/angled/double/sparks_broken.dmi b/icons/obj/doors/angled/double/sparks_broken.dmi new file mode 100644 index 00000000000..20d5bd6ba24 Binary files /dev/null and b/icons/obj/doors/angled/double/sparks_broken.dmi differ diff --git a/icons/obj/doors/angled/double/sparks_damaged.dmi b/icons/obj/doors/angled/double/sparks_damaged.dmi new file mode 100644 index 00000000000..dd49c4f65c4 Binary files /dev/null and b/icons/obj/doors/angled/double/sparks_damaged.dmi differ diff --git a/icons/obj/doors/angled/double/stripe.dmi b/icons/obj/doors/angled/double/stripe.dmi new file mode 100644 index 00000000000..1867a15dea6 Binary files /dev/null and b/icons/obj/doors/angled/double/stripe.dmi differ diff --git a/icons/obj/doors/angled/double/welded.dmi b/icons/obj/doors/angled/double/welded.dmi new file mode 100644 index 00000000000..78b40ad64d3 Binary files /dev/null and b/icons/obj/doors/angled/double/welded.dmi differ diff --git a/icons/obj/doors/angled/elevator/door.dmi b/icons/obj/doors/angled/elevator/door.dmi new file mode 100644 index 00000000000..f2b0f1a32b5 Binary files /dev/null and b/icons/obj/doors/angled/elevator/door.dmi differ diff --git a/icons/obj/doors/angled/elevator/fill_glass.dmi b/icons/obj/doors/angled/elevator/fill_glass.dmi new file mode 100644 index 00000000000..97506255faa Binary files /dev/null and b/icons/obj/doors/angled/elevator/fill_glass.dmi differ diff --git a/icons/obj/doors/angled/elevator/fill_steel.dmi b/icons/obj/doors/angled/elevator/fill_steel.dmi new file mode 100644 index 00000000000..2dcb67dce96 Binary files /dev/null and b/icons/obj/doors/angled/elevator/fill_steel.dmi differ diff --git a/icons/obj/doors/angled/elevator/lights_bolts.dmi b/icons/obj/doors/angled/elevator/lights_bolts.dmi new file mode 100644 index 00000000000..682eecd4e9d Binary files /dev/null and b/icons/obj/doors/angled/elevator/lights_bolts.dmi differ diff --git a/icons/obj/doors/angled/elevator/lights_deny.dmi b/icons/obj/doors/angled/elevator/lights_deny.dmi new file mode 100644 index 00000000000..bd9471fd4dc Binary files /dev/null and b/icons/obj/doors/angled/elevator/lights_deny.dmi differ diff --git a/icons/obj/doors/angled/elevator/lights_green.dmi b/icons/obj/doors/angled/elevator/lights_green.dmi new file mode 100644 index 00000000000..faafc7836a0 Binary files /dev/null and b/icons/obj/doors/angled/elevator/lights_green.dmi differ diff --git a/icons/obj/doors/angled/elevator/welded.dmi b/icons/obj/doors/angled/elevator/welded.dmi new file mode 100644 index 00000000000..90af33643b2 Binary files /dev/null and b/icons/obj/doors/angled/elevator/welded.dmi differ diff --git a/icons/obj/doors/angled/external/color.dmi b/icons/obj/doors/angled/external/color.dmi new file mode 100644 index 00000000000..7e3a25c7206 Binary files /dev/null and b/icons/obj/doors/angled/external/color.dmi differ diff --git a/icons/obj/doors/angled/external/door.dmi b/icons/obj/doors/angled/external/door.dmi new file mode 100644 index 00000000000..086f2e944fb Binary files /dev/null and b/icons/obj/doors/angled/external/door.dmi differ diff --git a/icons/obj/doors/angled/external/emag.dmi b/icons/obj/doors/angled/external/emag.dmi new file mode 100644 index 00000000000..ace966c362d Binary files /dev/null and b/icons/obj/doors/angled/external/emag.dmi differ diff --git a/icons/obj/doors/angled/external/fill_color.dmi b/icons/obj/doors/angled/external/fill_color.dmi new file mode 100644 index 00000000000..9af85cbde67 Binary files /dev/null and b/icons/obj/doors/angled/external/fill_color.dmi differ diff --git a/icons/obj/doors/angled/external/fill_glass.dmi b/icons/obj/doors/angled/external/fill_glass.dmi new file mode 100644 index 00000000000..b0a4dbf860d Binary files /dev/null and b/icons/obj/doors/angled/external/fill_glass.dmi differ diff --git a/icons/obj/doors/angled/external/fill_steel.dmi b/icons/obj/doors/angled/external/fill_steel.dmi new file mode 100644 index 00000000000..b0f7327dfb6 Binary files /dev/null and b/icons/obj/doors/angled/external/fill_steel.dmi differ diff --git a/icons/obj/doors/angled/external/lights_bolts.dmi b/icons/obj/doors/angled/external/lights_bolts.dmi new file mode 100644 index 00000000000..3b0afea5081 Binary files /dev/null and b/icons/obj/doors/angled/external/lights_bolts.dmi differ diff --git a/icons/obj/doors/angled/external/lights_deny.dmi b/icons/obj/doors/angled/external/lights_deny.dmi new file mode 100644 index 00000000000..38c652d9f69 Binary files /dev/null and b/icons/obj/doors/angled/external/lights_deny.dmi differ diff --git a/icons/obj/doors/angled/external/lights_green.dmi b/icons/obj/doors/angled/external/lights_green.dmi new file mode 100644 index 00000000000..b296a0925de Binary files /dev/null and b/icons/obj/doors/angled/external/lights_green.dmi differ diff --git a/icons/obj/doors/angled/hatch/door.dmi b/icons/obj/doors/angled/hatch/door.dmi new file mode 100644 index 00000000000..12097241d6e Binary files /dev/null and b/icons/obj/doors/angled/hatch/door.dmi differ diff --git a/icons/obj/doors/angled/hatch/emag.dmi b/icons/obj/doors/angled/hatch/emag.dmi new file mode 100644 index 00000000000..4fd7e141b3c Binary files /dev/null and b/icons/obj/doors/angled/hatch/emag.dmi differ diff --git a/icons/obj/doors/angled/hatch/fill_steel.dmi b/icons/obj/doors/angled/hatch/fill_steel.dmi new file mode 100644 index 00000000000..88130eb0511 Binary files /dev/null and b/icons/obj/doors/angled/hatch/fill_steel.dmi differ diff --git a/icons/obj/doors/angled/hatch/fill_stripe.dmi b/icons/obj/doors/angled/hatch/fill_stripe.dmi new file mode 100644 index 00000000000..7532ae2edfb Binary files /dev/null and b/icons/obj/doors/angled/hatch/fill_stripe.dmi differ diff --git a/icons/obj/doors/angled/hatch/lights_bolts.dmi b/icons/obj/doors/angled/hatch/lights_bolts.dmi new file mode 100644 index 00000000000..1a17f01ca63 Binary files /dev/null and b/icons/obj/doors/angled/hatch/lights_bolts.dmi differ diff --git a/icons/obj/doors/angled/hatch/lights_deny.dmi b/icons/obj/doors/angled/hatch/lights_deny.dmi new file mode 100644 index 00000000000..1fe72d724f9 Binary files /dev/null and b/icons/obj/doors/angled/hatch/lights_deny.dmi differ diff --git a/icons/obj/doors/angled/hatch/lights_green.dmi b/icons/obj/doors/angled/hatch/lights_green.dmi new file mode 100644 index 00000000000..508982d2d89 Binary files /dev/null and b/icons/obj/doors/angled/hatch/lights_green.dmi differ diff --git a/icons/obj/doors/angled/hatch/panel.dmi b/icons/obj/doors/angled/hatch/panel.dmi new file mode 100644 index 00000000000..c204955aaaf Binary files /dev/null and b/icons/obj/doors/angled/hatch/panel.dmi differ diff --git a/icons/obj/doors/angled/hatch/stripe.dmi b/icons/obj/doors/angled/hatch/stripe.dmi new file mode 100644 index 00000000000..859e9c37472 Binary files /dev/null and b/icons/obj/doors/angled/hatch/stripe.dmi differ diff --git a/icons/obj/doors/angled/hatch/welded.dmi b/icons/obj/doors/angled/hatch/welded.dmi new file mode 100644 index 00000000000..a0a5f363442 Binary files /dev/null and b/icons/obj/doors/angled/hatch/welded.dmi differ diff --git a/icons/obj/doors/angled/hazard/door.dmi b/icons/obj/doors/angled/hazard/door.dmi new file mode 100644 index 00000000000..8f8a89d5b10 Binary files /dev/null and b/icons/obj/doors/angled/hazard/door.dmi differ diff --git a/icons/obj/doors/angled/hazard/panel.dmi b/icons/obj/doors/angled/hazard/panel.dmi new file mode 100644 index 00000000000..b9826327859 Binary files /dev/null and b/icons/obj/doors/angled/hazard/panel.dmi differ diff --git a/icons/obj/doors/angled/hazard/welded.dmi b/icons/obj/doors/angled/hazard/welded.dmi new file mode 100644 index 00000000000..7293d4144cc Binary files /dev/null and b/icons/obj/doors/angled/hazard/welded.dmi differ diff --git a/icons/obj/doors/angled/secure/door.dmi b/icons/obj/doors/angled/secure/door.dmi new file mode 100644 index 00000000000..6031fc3c30f Binary files /dev/null and b/icons/obj/doors/angled/secure/door.dmi differ diff --git a/icons/obj/doors/angled/secure/fill_steel.dmi b/icons/obj/doors/angled/secure/fill_steel.dmi new file mode 100644 index 00000000000..dcb42c609ab Binary files /dev/null and b/icons/obj/doors/angled/secure/fill_steel.dmi differ diff --git a/icons/obj/doors/angled/station/color.dmi b/icons/obj/doors/angled/station/color.dmi new file mode 100644 index 00000000000..09e824124ea Binary files /dev/null and b/icons/obj/doors/angled/station/color.dmi differ diff --git a/icons/obj/doors/angled/station/door.dmi b/icons/obj/doors/angled/station/door.dmi new file mode 100644 index 00000000000..356a3fff4c5 Binary files /dev/null and b/icons/obj/doors/angled/station/door.dmi differ diff --git a/icons/obj/doors/angled/station/emag.dmi b/icons/obj/doors/angled/station/emag.dmi new file mode 100644 index 00000000000..90947fe3d04 Binary files /dev/null and b/icons/obj/doors/angled/station/emag.dmi differ diff --git a/icons/obj/doors/angled/station/fill_color.dmi b/icons/obj/doors/angled/station/fill_color.dmi new file mode 100644 index 00000000000..969a399c83e Binary files /dev/null and b/icons/obj/doors/angled/station/fill_color.dmi differ diff --git a/icons/obj/doors/angled/station/fill_glass.dmi b/icons/obj/doors/angled/station/fill_glass.dmi new file mode 100644 index 00000000000..47cf423b5f6 Binary files /dev/null and b/icons/obj/doors/angled/station/fill_glass.dmi differ diff --git a/icons/obj/doors/angled/station/fill_steel.dmi b/icons/obj/doors/angled/station/fill_steel.dmi new file mode 100644 index 00000000000..f228b2d951f Binary files /dev/null and b/icons/obj/doors/angled/station/fill_steel.dmi differ diff --git a/icons/obj/doors/angled/station/fill_stripe.dmi b/icons/obj/doors/angled/station/fill_stripe.dmi new file mode 100644 index 00000000000..63906a766b8 Binary files /dev/null and b/icons/obj/doors/angled/station/fill_stripe.dmi differ diff --git a/icons/obj/doors/angled/station/lights_bolts.dmi b/icons/obj/doors/angled/station/lights_bolts.dmi new file mode 100644 index 00000000000..b8151373f23 Binary files /dev/null and b/icons/obj/doors/angled/station/lights_bolts.dmi differ diff --git a/icons/obj/doors/angled/station/lights_deny.dmi b/icons/obj/doors/angled/station/lights_deny.dmi new file mode 100644 index 00000000000..fff1fd84459 Binary files /dev/null and b/icons/obj/doors/angled/station/lights_deny.dmi differ diff --git a/icons/obj/doors/angled/station/lights_green.dmi b/icons/obj/doors/angled/station/lights_green.dmi new file mode 100644 index 00000000000..7ca2ce39068 Binary files /dev/null and b/icons/obj/doors/angled/station/lights_green.dmi differ diff --git a/icons/obj/doors/angled/station/panel.dmi b/icons/obj/doors/angled/station/panel.dmi new file mode 100644 index 00000000000..08685c08d4a Binary files /dev/null and b/icons/obj/doors/angled/station/panel.dmi differ diff --git a/icons/obj/doors/angled/station/sparks_broken.dmi b/icons/obj/doors/angled/station/sparks_broken.dmi new file mode 100644 index 00000000000..06ad95ef51d Binary files /dev/null and b/icons/obj/doors/angled/station/sparks_broken.dmi differ diff --git a/icons/obj/doors/angled/station/sparks_damaged.dmi b/icons/obj/doors/angled/station/sparks_damaged.dmi new file mode 100644 index 00000000000..64c6f96f55d Binary files /dev/null and b/icons/obj/doors/angled/station/sparks_damaged.dmi differ diff --git a/icons/obj/doors/angled/station/stripe.dmi b/icons/obj/doors/angled/station/stripe.dmi new file mode 100644 index 00000000000..8b5a90fa162 Binary files /dev/null and b/icons/obj/doors/angled/station/stripe.dmi differ diff --git a/icons/obj/doors/angled/station/welded.dmi b/icons/obj/doors/angled/station/welded.dmi new file mode 100644 index 00000000000..e79421af0c2 Binary files /dev/null and b/icons/obj/doors/angled/station/welded.dmi differ diff --git a/icons/obj/doors/angled/vault/door.dmi b/icons/obj/doors/angled/vault/door.dmi new file mode 100644 index 00000000000..8111aeff9f8 Binary files /dev/null and b/icons/obj/doors/angled/vault/door.dmi differ diff --git a/icons/obj/doors/angled/vault/fill_steel.dmi b/icons/obj/doors/angled/vault/fill_steel.dmi new file mode 100644 index 00000000000..dcb42c609ab Binary files /dev/null and b/icons/obj/doors/angled/vault/fill_steel.dmi differ diff --git a/icons/obj/wall_frame_bay.dmi b/icons/obj/wall_frame_bay.dmi index cfe6ee2d564..628a002edb7 100644 Binary files a/icons/obj/wall_frame_bay.dmi and b/icons/obj/wall_frame_bay.dmi differ diff --git a/icons/obj/wall_frame_eris.dmi b/icons/obj/wall_frame_eris.dmi index df4643219ca..147fb502559 100644 Binary files a/icons/obj/wall_frame_eris.dmi and b/icons/obj/wall_frame_eris.dmi differ diff --git a/icons/obj/wall_machines_angled.dmi b/icons/obj/wall_machines_angled.dmi new file mode 100644 index 00000000000..eebbc0828a3 Binary files /dev/null and b/icons/obj/wall_machines_angled.dmi differ diff --git a/maps/offmap_vr/om_ships/aro3.dmm b/maps/offmap_vr/om_ships/aro3.dmm index 06f27750c01..6fb00768fc4 100644 --- a/maps/offmap_vr/om_ships/aro3.dmm +++ b/maps/offmap_vr/om_ships/aro3.dmm @@ -86,6 +86,14 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/tiled/eris/dark/techfloor_grid, /area/aro3/function) +"aG" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/light{ + dir = 4 + }, +/turf/simulated/floor/tiled/eris/dark/techfloor_grid, +/area/aro3/hallway_port) "aH" = ( /obj/machinery/autolathe, /turf/simulated/floor/tiled/eris/dark/danger, @@ -106,12 +114,6 @@ }, /turf/simulated/floor/tiled/eris/steel/bar_dance, /area/aro3/bar) -"aQ" = ( -/obj/machinery/door/airlock{ - name = "Bunk Room 2" - }, -/turf/simulated/floor/tiled/eris/dark/panels, -/area/aro3/bunkrooms) "aR" = ( /obj/structure/cable/cyan{ icon_state = "4-8" @@ -142,13 +144,12 @@ /turf/simulated/floor/water/indoors/surfluid, /area/aro3/workshop) "aZ" = ( -/obj/machinery/power/apc/alarms_hidden{ - dir = 8; - req_access = list() - }, /obj/structure/cable/cyan{ icon_state = "0-4" }, +/obj/machinery/power/apc/angled/hidden{ + dir = 8 + }, /turf/simulated/floor/tiled/eris/steel/bar_dance, /area/aro3/bar) "bc" = ( @@ -172,9 +173,11 @@ /turf/simulated/floor/plating/eris/under, /area/aro3/atmos) "bk" = ( -/obj/machinery/door/airlock{ +/obj/machinery/door/airlock/angled/standard{ + dir = 4; id_tag = "aro3_private1"; - name = "Private Room 1" + name = "private quarters 1"; + stripe_color = "#00AA00 }, /turf/simulated/floor/tiled/eris/dark/panels, /area/aro3/suite_port) @@ -194,6 +197,13 @@ }, /turf/simulated/floor/tiled/eris/dark/gray_perforated, /area/shuttle/aroboat3) +"bv" = ( +/obj/machinery/door/airlock/angled/standard{ + name = "bunkroom 3"; + stripe_color = "#00AA00 + }, +/turf/simulated/floor/tiled/eris/dark/panels, +/area/aro3/bunkrooms) "bC" = ( /obj/structure/cable/cyan{ icon_state = "1-2" @@ -213,6 +223,9 @@ pixel_x = -32; pixel_y = 0 }, +/obj/machinery/firealarm/angled/hidden{ + dir = 1 + }, /turf/simulated/floor/carpet/turcarpet, /area/aro3/suite_port) "bN" = ( @@ -360,10 +373,6 @@ /turf/simulated/floor/tiled/eris/dark/danger, /area/aro3/repair_bay) "cK" = ( -/obj/machinery/power/apc/alarms_hidden{ - dir = 8; - req_access = list() - }, /obj/structure/cable/cyan, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 8 @@ -371,6 +380,9 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 8 }, +/obj/machinery/power/apc/angled/hidden{ + dir = 8 + }, /turf/simulated/floor/tiled/eris/dark/gray_perforated, /area/aro3/atmos) "cL" = ( @@ -482,9 +494,8 @@ /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 4 }, -/obj/machinery/alarm/alarms_hidden{ - dir = 4; - pixel_x = -26 +/obj/machinery/alarm/angled/hidden{ + dir = 4 }, /turf/simulated/floor/wood, /area/aro3/suite_starboard) @@ -523,12 +534,14 @@ /turf/simulated/floor/tiled/eris/dark/danger, /area/aro3/workshop) "dP" = ( -/obj/machinery/door/airlock/maintenance/common{ - name = "Bar Storage" - }, /obj/structure/cable/cyan{ icon_state = "4-8" }, +/obj/machinery/door/airlock/angled/standard{ + dir = 4; + name = "storage room"; + stripe_color = "#9e6243" + }, /turf/simulated/floor/tiled/eris/dark/panels, /area/aro3/bar) "dU" = ( @@ -570,13 +583,14 @@ "ei" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/door/airlock{ - id_tag = "aro3_private1"; - name = "Private Room 1" - }, /obj/structure/cable/cyan{ icon_state = "1-2" }, +/obj/machinery/door/airlock/angled/standard{ + id_tag = "aro3_private1"; + name = "private quarters 1"; + stripe_color = "#00AA00 + }, /turf/simulated/floor/tiled/eris/dark/panels, /area/aro3/suite_port) "el" = ( @@ -613,6 +627,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 9 }, +/obj/machinery/firealarm/angled/hidden{ + dir = 4 + }, /turf/simulated/floor/tiled/eris/dark/gray_perforated, /area/aro3/power) "eI" = ( @@ -674,7 +691,7 @@ /turf/simulated/floor/tiled/eris/dark/techfloor_grid, /area/aro3/hallway_bunkrooms) "ff" = ( -/obj/effect/low_wall_spawner/eris/rglass, +/obj/effect/low_wall_spawner/eris/reinforced/rglass, /turf/simulated/floor/plating/eris/under, /area/aro3/repair_bay) "fo" = ( @@ -734,9 +751,10 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/door/airlock{ +/obj/machinery/door/airlock/angled/standard{ id_tag = "aro3_private2"; - name = "Private Room 2" + name = "private quarters 2"; + stripe_color = "#00AA00 }, /turf/simulated/floor/tiled/eris/dark/panels, /area/aro3/suite_starboard) @@ -768,13 +786,12 @@ /obj/structure/sink{ pixel_y = 24 }, -/obj/machinery/power/apc/alarms_hidden{ - dir = 4; - req_access = list() - }, /obj/structure/cable/cyan{ icon_state = "0-2" }, +/obj/machinery/power/apc/angled/hidden{ + dir = 4 + }, /turf/simulated/floor/tiled/eris/white, /area/aro3/wc_port) "gk" = ( @@ -868,25 +885,25 @@ /turf/simulated/floor/tiled/eris/dark/techfloor_grid, /area/aro3/hallway_starboard) "gP" = ( -/obj/machinery/power/apc/alarms_hidden{ - dir = 1; - req_access = list() - }, /obj/structure/cable/cyan{ icon_state = "0-8" }, +/obj/machinery/power/apc/angled/hidden{ + dir = 1 + }, /turf/simulated/floor/tiled/eris/dark/danger, /area/aro3/flight_deck) "gQ" = ( -/obj/machinery/power/apc/alarms_hidden{ - dir = 8; - req_access = list() - }, /obj/structure/cable/cyan, +/obj/machinery/power/apc/angled/hidden{ + dir = 8 + }, /turf/simulated/floor/tiled/eris/dark, /area/aro3/workshop) "gR" = ( -/obj/machinery/computer/ship/engines, +/obj/machinery/computer/ship/engines{ + req_one_access = list(777) + }, /turf/simulated/floor/tiled/eris/dark/violetcorener, /area/aro3/cockpit) "gU" = ( @@ -911,9 +928,8 @@ /obj/structure/cable/cyan{ icon_state = "1-2" }, -/obj/machinery/alarm/alarms_hidden{ - dir = 8; - pixel_x = 26 +/obj/machinery/alarm/angled/hidden{ + dir = 8 }, /turf/simulated/floor/tiled/eris/dark/techfloor_grid, /area/aro3/hallway_starboard) @@ -980,13 +996,12 @@ /turf/simulated/floor/tiled/techmaint, /area/aro3/workshop) "hu" = ( -/obj/machinery/power/apc/alarms_hidden{ - dir = 8; - req_access = list() - }, /obj/structure/cable/cyan{ icon_state = "0-4" }, +/obj/machinery/power/apc/angled/hidden{ + dir = 8 + }, /turf/simulated/floor/tiled/eris/white, /area/aro3/suite_starboard_wc) "hw" = ( @@ -1012,12 +1027,14 @@ /turf/simulated/floor/tiled/eris/steel/bar_light, /area/aro3/bar) "hC" = ( -/obj/machinery/door/airlock{ - name = "Public WC" - }, /obj/structure/cable/cyan{ icon_state = "4-8" }, +/obj/machinery/door/airlock/angled/standard{ + dir = 4; + name = "public restroom"; + stripe_color = "#00AA00 + }, /turf/simulated/floor/tiled/eris/dark/panels, /area/aro3/wc_starboard) "hD" = ( @@ -1051,19 +1068,22 @@ /turf/simulated/floor/tiled/eris/steel/bar_flat, /area/aro3/bar) "hU" = ( -/obj/machinery/door/airlock/maintenance/common, +/obj/machinery/door/airlock/angled/standard/glass{ + name = "spare supplies" + }, /turf/simulated/floor/tiled/eris/dark/panels, /area/aro3/hallway_port) "hX" = ( /turf/simulated/floor/carpet/purcarpet, /area/aro3/bunkrooms) "ia" = ( -/obj/machinery/door/airlock/multi_tile/glass{ - name = "Bar" - }, /obj/structure/cable/cyan{ icon_state = "1-2" }, +/obj/machinery/door/airlock/angled/double/glass{ + name = "bar"; + stripe_color = "#00AA00" + }, /turf/simulated/floor/tiled/eris/steel/panels, /area/aro3/bar) "ig" = ( @@ -1075,10 +1095,6 @@ /turf/simulated/floor/tiled/eris/dark/danger, /area/aro3/repair_bay) "is" = ( -/obj/machinery/door/airlock/multi_tile/glass{ - dir = 2; - name = "Medical Bay" - }, /obj/structure/cable/cyan{ icon_state = "4-8" }, @@ -1088,6 +1104,11 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 8 }, +/obj/machinery/door/airlock/angled/double/glass{ + dir = 8; + name = "medical"; + stripe_color = "#6084e0" + }, /turf/simulated/floor/tiled/eris/steel/panels, /area/aro3/medical) "iw" = ( @@ -1095,7 +1116,7 @@ /turf/simulated/floor/tiled/eris/dark/gray_perforated, /area/aro3/power) "iy" = ( -/obj/effect/low_wall_spawner/eris/rglass, +/obj/effect/low_wall_spawner/eris/reinforced/rglass, /turf/simulated/floor/plating/eris/under, /area/aro3/cockpit) "iB" = ( @@ -1126,12 +1147,14 @@ /turf/simulated/floor/tiled/eris/white/golden, /area/aro3/medical) "iF" = ( -/obj/machinery/door/airlock/maintenance/common{ - name = "Personal Storage" - }, /obj/structure/cable/cyan{ icon_state = "4-8" }, +/obj/machinery/door/airlock/angled/standard{ + dir = 4; + name = "storage room"; + stripe_color = "#9e6243" + }, /turf/simulated/floor/tiled/eris/dark/panels, /area/aro3/hallway_bunkrooms) "iI" = ( @@ -1151,13 +1174,12 @@ /turf/simulated/floor/tiled/eris/dark, /area/aro3/function) "iL" = ( -/obj/machinery/power/apc/alarms_hidden{ - dir = 8; - req_access = list() - }, /obj/structure/cable/cyan{ icon_state = "0-2" }, +/obj/machinery/power/apc/angled/hidden{ + dir = 8 + }, /turf/simulated/floor/tiled/eris/cafe, /area/aro3/kitchen) "iN" = ( @@ -1182,24 +1204,23 @@ /turf/simulated/floor/carpet/purcarpet, /area/aro3/bunkrooms) "iS" = ( -/obj/machinery/power/apc/alarms_hidden{ - req_access = list() - }, /obj/structure/cable/cyan, +/obj/machinery/power/apc/angled/hidden, /turf/simulated/floor/wood, /area/aro3/suite_port) "iV" = ( /turf/simulated/floor/carpet/oracarpet, /area/aro3/bunkrooms) "iY" = ( -/obj/machinery/door/airlock/multi_tile/glass{ - name = "Atmos Management" - }, /obj/structure/cable/cyan{ icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/door/airlock/angled/double/glass{ + name = "atmos room"; + stripe_color = "#32d3bb" + }, /turf/simulated/floor/tiled/eris/steel/panels, /area/aro3/atmos) "iZ" = ( @@ -1212,13 +1233,12 @@ /turf/simulated/floor/tiled/eris/white/gray_platform, /area/aro3/power) "jb" = ( -/obj/machinery/power/apc/alarms_hidden{ - dir = 8; - req_access = list() - }, /obj/structure/cable/cyan{ icon_state = "0-2" }, +/obj/machinery/power/apc/angled/hidden{ + dir = 8 + }, /turf/simulated/floor/tiled/eris/dark, /area/aro3/function) "je" = ( @@ -1250,10 +1270,6 @@ /obj/structure/cable/cyan{ icon_state = "4-8" }, -/obj/machinery/alarm/alarms_hidden{ - dir = 1; - pixel_y = -26 - }, /turf/simulated/floor/outdoors/grass/heavy{ outdoors = 0 }, @@ -1267,14 +1283,18 @@ /turf/simulated/floor/tiled/techmaint, /area/aro3/medical) "jy" = ( -/obj/machinery/door/airlock{ +/obj/machinery/door/airlock/angled/standard{ + dir = 4; id_tag = "aro3_private2"; - name = "Private Room 2" + name = "private quarters 2"; + stripe_color = "#00AA00 }, /turf/simulated/floor/tiled/eris/dark/panels, /area/aro3/suite_starboard) "jz" = ( -/obj/machinery/computer/ship/sensors, +/obj/machinery/computer/ship/sensors{ + req_one_access = list(777) + }, /turf/simulated/floor/tiled/eris/dark/violetcorener, /area/aro3/cockpit) "jC" = ( @@ -1297,9 +1317,7 @@ /turf/simulated/floor/tiled/eris/dark/gray_platform, /area/aro3/hallway_bunkrooms) "jU" = ( -/obj/machinery/alarm/alarms_hidden{ - pixel_y = 26 - }, +/obj/machinery/alarm/angled/hidden, /turf/simulated/floor/tiled/eris/dark/danger, /area/aro3/flight_deck) "jV" = ( @@ -1379,8 +1397,9 @@ /turf/simulated/floor/tiled/eris/dark/techfloor_grid, /area/aro3/hallway_starboard) "km" = ( -/obj/machinery/door/airlock{ - name = "Toilet" +/obj/machinery/door/airlock/angled/standard{ + name = "toilet"; + stripe_color = "#00AA00 }, /turf/simulated/floor/tiled/eris/steel/panels, /area/aro3/suite_starboard_wc) @@ -1424,6 +1443,9 @@ dir = 5 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/firealarm/angled/hidden{ + dir = 8 + }, /turf/simulated/floor/tiled/eris/dark/gray_perforated, /area/aro3/atmos) "kH" = ( @@ -1441,15 +1463,13 @@ /turf/simulated/floor/tiled/eris/dark, /area/aro3/workshop) "kM" = ( -/obj/machinery/power/apc/alarms_hidden{ - req_access = list() - }, /obj/structure/cable/cyan{ icon_state = "0-4" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 8 }, +/obj/machinery/power/apc/angled/hidden, /turf/simulated/floor/tiled/eris/dark/violetcorener, /area/aro3/cockpit) "kP" = ( @@ -1477,15 +1497,15 @@ /turf/simulated/floor/plating/eris/under, /area/space) "lc" = ( -/obj/machinery/door/airlock/multi_tile/glass{ - dir = 2 - }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 8 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 8 }, +/obj/machinery/door/airlock/angled/double/glass{ + dir = 8 + }, /turf/simulated/floor/tiled/eris/steel/panels, /area/aro3/hallway_port) "lf" = ( @@ -1553,14 +1573,9 @@ /turf/simulated/floor/wood, /area/aro3/suite_starboard) "lC" = ( -/obj/structure/railing/grey{ - dir = 4 - }, -/obj/machinery/light{ - dir = 8 - }, -/turf/simulated/floor/water/indoors/surfluid, -/area/aro3/workshop) +/obj/machinery/firealarm/angled/hidden, +/turf/simulated/floor/tiled/eris/dark/techfloor_grid, +/area/aro3/hallway_port) "lI" = ( /obj/structure/cable/cyan{ icon_state = "1-2" @@ -1596,13 +1611,14 @@ /turf/simulated/floor/tiled/eris/dark/danger, /area/aro3/flight_deck) "mg" = ( -/obj/machinery/door/airlock/multi_tile/glass{ - dir = 2; - name = "Workshop" - }, /obj/structure/cable/cyan{ icon_state = "4-8" }, +/obj/machinery/door/airlock/angled/double/glass{ + dir = 8; + name = "workshop"; + stripe_color = "#AA00AA" + }, /turf/simulated/floor/tiled/eris/steel/panels, /area/aro3/workshop) "mo" = ( @@ -1653,11 +1669,10 @@ /turf/simulated/floor/tiled/eris/steel/bar_dance, /area/aro3/bar) "mI" = ( -/obj/machinery/power/apc/alarms_hidden{ - dir = 4; - req_access = list() - }, /obj/structure/cable/cyan, +/obj/machinery/power/apc/angled/hidden{ + dir = 4 + }, /turf/simulated/floor/tiled/eris/white/golden, /area/aro3/medical) "mL" = ( @@ -1703,15 +1718,14 @@ }, /area/aro3/park) "nd" = ( -/obj/machinery/power/apc/alarms_hidden{ - dir = 4; - req_access = list() - }, /obj/structure/cable/cyan{ icon_state = "0-8" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/power/apc/angled/hidden{ + dir = 4 + }, /turf/simulated/floor/tiled/eris/dark/techfloor_grid, /area/aro3/hallway_port) "ne" = ( @@ -1777,6 +1791,12 @@ }, /turf/simulated/floor/tiled/eris/white/golden, /area/aro3/medical) +"nH" = ( +/obj/machinery/alarm/angled/hidden{ + dir = 1 + }, +/turf/simulated/floor/tiled/eris/dark/danger, +/area/aro3/eva_hall) "nI" = ( /obj/structure/cable/cyan{ icon_state = "1-8" @@ -1819,11 +1839,13 @@ }, /turf/simulated/floor/tiled/techmaint, /area/aro3/bar) +"oc" = ( +/obj/machinery/light/floortube, +/turf/simulated/floor/tiled/eris/dark, +/area/aro3/function) "od" = ( -/obj/machinery/power/apc/alarms_hidden{ - req_access = list() - }, /obj/structure/cable/cyan, +/obj/machinery/power/apc/angled/hidden, /turf/simulated/floor/wood, /area/aro3/suite_starboard) "oh" = ( @@ -1884,6 +1906,13 @@ }, /turf/simulated/floor/tiled/eris/dark/danger, /area/aro3/eva_hall) +"oG" = ( +/obj/structure/table/bench/steel, +/obj/machinery/firealarm/angled/hidden, +/turf/simulated/floor/outdoors/grass/heavy{ + outdoors = 0 + }, +/area/aro3/park) "oK" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -1898,8 +1927,7 @@ /turf/simulated/floor/tiled/eris/steel/bar_flat, /area/aro3/bar) "oN" = ( -/obj/machinery/door/blast/regular{ - dir = 2; +/obj/machinery/door/blast/multi_tile/two_tile_ver{ id = "aroshipshutter_portair" }, /turf/simulated/floor/reinforced/airless, @@ -1963,6 +1991,18 @@ }, /turf/simulated/floor/tiled/eris/dark/techfloor_grid, /area/aro3/function) +"pm" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 + }, +/obj/machinery/light{ + dir = 1 + }, +/turf/simulated/floor/tiled/eris/dark/techfloor_grid, +/area/aro3/hallway_port) "pn" = ( /obj/structure/toilet{ pixel_y = 12 @@ -2050,13 +2090,12 @@ }, /area/aro3/park) "qi" = ( -/obj/machinery/power/apc/alarms_hidden{ - dir = 4; - req_access = list() - }, /obj/structure/cable/cyan{ icon_state = "0-8" }, +/obj/machinery/power/apc/angled/hidden{ + dir = 4 + }, /turf/simulated/floor/tiled/eris/dark/techfloor_grid, /area/aro3/hallway_bunkrooms) "qk" = ( @@ -2068,6 +2107,13 @@ /obj/structure/fans/hardlight, /turf/simulated/floor/tiled/eris/steel/panels, /area/aro3/eva_hall) +"qu" = ( +/obj/machinery/door/airlock/angled/standard{ + name = "bunkroom 2"; + stripe_color = "#00AA00 + }, +/turf/simulated/floor/tiled/eris/dark/panels, +/area/aro3/bunkrooms) "qC" = ( /turf/space/internal_edge/bottomleft, /area/aro3/bar) @@ -2200,7 +2246,6 @@ /turf/simulated/floor/tiled/eris/dark/danger, /area/aro3/flight_deck) "rx" = ( -/obj/machinery/light, /obj/structure/bed/chair/sofa/corp/left{ dir = 1 }, @@ -2261,12 +2306,12 @@ /turf/simulated/floor/tiled/eris/dark/techfloor_grid, /area/aro3/repair_bay) "rY" = ( -/obj/machinery/door/airlock/multi_tile/glass{ - dir = 2 - }, /obj/structure/cable/cyan{ icon_state = "4-8" }, +/obj/machinery/door/airlock/angled/double/glass{ + dir = 8 + }, /turf/simulated/floor/tiled/eris/steel/panels, /area/aro3/function) "se" = ( @@ -2277,15 +2322,11 @@ /obj/structure/closet/walllocker_double/medical/west, /turf/simulated/floor/tiled/eris/white/cargo, /area/aro3/medical) -"sk" = ( -/obj/machinery/door/airlock{ - name = "Bunk Room 1" - }, -/turf/simulated/floor/tiled/eris/dark/panels, -/area/aro3/bunkrooms) "so" = ( -/obj/machinery/door/airlock/maintenance/common{ - name = "Medical Storage" +/obj/machinery/door/airlock/angled/standard{ + dir = 4; + name = "storage room"; + stripe_color = "#9e6243" }, /turf/simulated/floor/tiled/eris/dark/panels, /area/aro3/medical) @@ -2326,6 +2367,12 @@ "sw" = ( /turf/simulated/floor/tiled/eris/steel/panels, /area/aro3/kitchen) +"sx" = ( +/obj/machinery/firealarm/angled/hidden{ + dir = 4 + }, +/turf/simulated/floor/tiled/eris/dark/danger, +/area/aro3/flight_deck) "sD" = ( /obj/machinery/light{ dir = 4 @@ -2360,15 +2407,19 @@ /obj/machinery/chemical_dispenser/bar_soft/full{ dir = 8 }, +/obj/machinery/firealarm/angled/hidden{ + dir = 4 + }, /turf/simulated/floor/tiled/eris/dark, /area/aro3/function) "sT" = ( -/obj/machinery/door/airlock{ - name = "WC" - }, /obj/structure/cable/cyan{ icon_state = "1-2" }, +/obj/machinery/door/airlock/angled/standard{ + name = "restroom"; + stripe_color = "#00AA00 + }, /turf/simulated/floor/tiled/eris/dark/panels, /area/aro3/suite_port) "sV" = ( @@ -2402,7 +2453,7 @@ "ti" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/door/airlock/multi_tile/glass, +/obj/machinery/door/airlock/angled/double/glass, /turf/simulated/floor/tiled/eris/steel/panels, /area/aro3/hallway_starboard) "tk" = ( @@ -2443,12 +2494,10 @@ }, /area/shuttle/aroboat3) "tB" = ( -/obj/machinery/alarm/alarms_hidden{ - pixel_y = 26 - }, /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 8 }, +/obj/machinery/alarm/angled/hidden, /turf/simulated/floor/tiled/eris/dark, /area/aro3/surfluid) "tD" = ( @@ -2471,13 +2520,15 @@ /obj/structure/cable/cyan{ icon_state = "1-2" }, -/obj/machinery/door/airlock/multi_tile/glass, +/obj/machinery/door/airlock/angled/double/glass, /turf/simulated/floor/tiled/eris/steel/panels, /area/aro3/hallway_port) "tY" = ( -/obj/machinery/door/airlock{ +/obj/machinery/door/airlock/angled/standard{ + dir = 4; id_tag = "aro3_private2_bed"; - name = "Private Room 1" + name = "bedroom"; + stripe_color = "#00AA00 }, /turf/simulated/floor/tiled/eris/dark/panels, /area/aro3/suite_starboard) @@ -2591,8 +2642,8 @@ /turf/simulated/floor/tiled/techmaint, /area/aro3/bar) "vx" = ( -/obj/machinery/door/airlock/multi_tile/glass{ - name = "Kitchen/Tech Room" +/obj/machinery/door/airlock/angled/double/glass{ + name = "ship systems" }, /turf/simulated/floor/tiled/eris/steel/panels, /area/aro3/surfluid) @@ -2609,15 +2660,14 @@ /turf/simulated/wall/eris/r_wall, /area/aro3/bar) "vJ" = ( -/obj/machinery/light, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 8 +/obj/structure/railing/grey{ + dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 8 +/obj/machinery/light{ + dir = 1 }, -/turf/simulated/floor/tiled/eris/dark/techfloor_grid, -/area/aro3/hallway_port) +/turf/simulated/floor/water/indoors/surfluid, +/area/aro3/workshop) "vL" = ( /obj/structure/table/marble, /obj/item/weapon/material/kitchen/rollingpin, @@ -2638,6 +2688,7 @@ /area/aro3/hallway_port) "vN" = ( /obj/structure/table/marble, +/obj/machinery/alarm/angled/hidden, /turf/simulated/floor/tiled/eris/cafe, /area/aro3/kitchen) "vP" = ( @@ -2661,12 +2712,10 @@ /turf/simulated/floor/tiled/eris/dark, /area/aro3/power) "vZ" = ( -/obj/machinery/power/apc/alarms_hidden{ - req_access = list() - }, /obj/structure/cable/cyan{ icon_state = "0-8" }, +/obj/machinery/power/apc/angled/hidden, /turf/simulated/floor/outdoors/grass/heavy{ outdoors = 0 }, @@ -2680,6 +2729,7 @@ /obj/machinery/light{ dir = 1 }, +/obj/machinery/portable_atmospherics/canister/air, /turf/simulated/floor/plating/eris/under, /area/aro3/atmos) "wf" = ( @@ -2879,15 +2929,15 @@ /turf/simulated/floor/reinforced/airless, /area/space) "xo" = ( -/obj/machinery/door/airlock/multi_tile/glass{ - dir = 2 - }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 8 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 8 }, +/obj/machinery/door/airlock/angled/double/glass{ + dir = 8 + }, /turf/simulated/floor/tiled/eris/steel/panels, /area/aro3/hallway_starboard) "xp" = ( @@ -3002,8 +3052,8 @@ /turf/simulated/floor/tiled/eris/dark, /area/aro3/surfluid) "ym" = ( -/obj/machinery/alarm/alarms_hidden{ - pixel_y = 26 +/obj/structure/sink/kitchen{ + pixel_y = 24 }, /turf/simulated/floor/tiled/eris/cafe, /area/aro3/kitchen) @@ -3011,6 +3061,10 @@ /obj/structure/lattice, /turf/space, /area/space) +"yo" = ( +/obj/machinery/alarm/angled/hidden, +/turf/simulated/floor/tiled/eris/dark/gray_platform, +/area/aro3/workshop) "yu" = ( /obj/machinery/mech_recharger{ icon = 'icons/turf/shuttle_alien_blue.dmi' @@ -3090,13 +3144,12 @@ }, /area/aro3/park) "yQ" = ( -/obj/machinery/power/apc/alarms_hidden{ - dir = 4; - req_access = list() - }, /obj/structure/cable/cyan{ icon_state = "0-8" }, +/obj/machinery/power/apc/angled/hidden{ + dir = 4 + }, /turf/simulated/floor/tiled/eris/white, /area/aro3/suite_port_wc) "yR" = ( @@ -3118,6 +3171,10 @@ }, /turf/simulated/floor/tiled/eris/dark/violetcorener, /area/aro3/cockpit) +"yT" = ( +/obj/machinery/alarm/angled/hidden, +/turf/simulated/floor/tiled/eris/steel/bar_flat, +/area/aro3/bar) "yU" = ( /obj/machinery/light_switch{ pixel_y = 24 @@ -3126,12 +3183,13 @@ /turf/simulated/floor/tiled/eris/cafe, /area/aro3/kitchen) "yV" = ( -/obj/machinery/door/airlock/multi_tile/glass{ - name = "Power Management" - }, /obj/structure/cable/cyan{ icon_state = "1-2" }, +/obj/machinery/door/airlock/angled/double/glass{ + name = "engine room"; + stripe_color = "#e6ef40" + }, /turf/simulated/floor/tiled/eris/steel/panels, /area/aro3/power) "yW" = ( @@ -3177,10 +3235,12 @@ /turf/space, /area/space) "zm" = ( -/obj/machinery/door/airlock/multi_tile/glass, /obj/structure/cable/cyan{ icon_state = "1-2" }, +/obj/machinery/door/airlock/angled/double/glass{ + name = "public hall" + }, /turf/simulated/floor/tiled/eris/steel/panels, /area/aro3/eva_hall) "zo" = ( @@ -3244,15 +3304,14 @@ /turf/simulated/floor/tiled/eris/dark/danger, /area/aro3/flight_deck) "zG" = ( -/obj/machinery/power/apc/alarms_hidden{ - dir = 8; - req_access = list() - }, /obj/structure/cable/cyan{ icon_state = "0-4" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/power/apc/angled/hidden{ + dir = 8 + }, /turf/simulated/floor/tiled/eris/dark/techfloor_grid, /area/aro3/hallway_starboard) "zI" = ( @@ -3323,17 +3382,15 @@ /area/aro3/bar) "Aa" = ( /obj/structure/fans/hardlight, -/obj/machinery/door/airlock/multi_tile/glass{ - dir = 2 +/obj/machinery/door/airlock/angled/double/glass{ + dir = 8; + door_color = "#AA0000"; + name = "port airlock"; + stripe_color = "#FFFFFF" }, /turf/simulated/floor/tiled/eris/steel/panels, /area/aro3/eva_hall) "Ac" = ( -/obj/machinery/alarm/alarms_hidden{ - dir = 8; - pixel_x = 26; - pixel_y = 4 - }, /obj/structure/closet/crate/bin{ anchored = 1; density = 0; @@ -3344,6 +3401,9 @@ pixel_x = 24; pixel_y = -8 }, +/obj/machinery/alarm/angled/hidden{ + dir = 8 + }, /turf/simulated/floor/tiled/eris/dark, /area/aro3/function) "Ad" = ( @@ -3386,16 +3446,16 @@ /turf/simulated/floor/tiled/techmaint, /area/aro3/hallway_bunkrooms) "Aj" = ( -/obj/machinery/door/airlock/multi_tile/glass{ - dir = 2; - name = "Kitchen" - }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 8 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 8 }, +/obj/machinery/door/airlock/angled/double/glass{ + dir = 8; + name = "kitchen" + }, /turf/simulated/floor/tiled/eris/steel/panels, /area/aro3/kitchen) "Am" = ( @@ -3529,6 +3589,9 @@ /obj/structure/bed/chair/bay/comfy/blue{ dir = 1 }, +/obj/machinery/firealarm/angled/hidden{ + dir = 8 + }, /turf/simulated/floor/tiled/eris/dark/violetcorener, /area/aro3/cockpit) "Cg" = ( @@ -3548,9 +3611,7 @@ /turf/simulated/floor/tiled/eris/dark/danger, /area/aro3/flight_deck) "Cq" = ( -/obj/machinery/alarm/alarms_hidden{ - pixel_y = 26 - }, +/obj/machinery/alarm/angled/hidden, /turf/simulated/floor/plating/eris/under, /area/aro3/atmos) "Cu" = ( @@ -3586,11 +3647,10 @@ /turf/simulated/floor/tiled/eris/dark/violetcorener, /area/aro3/cockpit) "Cz" = ( -/obj/machinery/alarm/alarms_hidden{ - dir = 8; - pixel_x = 26 - }, /obj/structure/flora/pottedplant/sticky, +/obj/machinery/alarm/angled/hidden{ + dir = 8 + }, /turf/simulated/floor/tiled/eris/dark/techfloor_grid, /area/aro3/hallway_bunkrooms) "CA" = ( @@ -3643,10 +3703,8 @@ /area/aro3/suite_port_wc) "CW" = ( /obj/structure/table/steel, -/obj/machinery/power/apc/alarms_hidden{ - req_access = list() - }, /obj/structure/cable/cyan, +/obj/machinery/power/apc/angled/hidden, /turf/simulated/floor/tiled/eris/dark/gray_perforated, /area/aro3/repair_bay) "CY" = ( @@ -3707,6 +3765,12 @@ }, /turf/simulated/wall/rpshull, /area/space) +"DG" = ( +/obj/machinery/firealarm/angled/hidden{ + dir = 1 + }, +/turf/simulated/floor/tiled/eris/cafe, +/area/aro3/kitchen) "DH" = ( /obj/structure/table/darkglass, /turf/simulated/floor/tiled/eris/steel/bar_dance, @@ -3717,9 +3781,15 @@ /turf/simulated/floor/tiled/eris/dark/gray_perforated, /area/aro3/repair_bay) "DM" = ( -/obj/machinery/gear_dispenser/suit_fancy/autolok, +/obj/machinery/gear_dispenser/suit_fancy/commonwealth, /turf/simulated/floor/tiled/eris/steel/panels, /area/aro3/eva_hall) +"DP" = ( +/obj/machinery/firealarm/angled/hidden{ + dir = 4 + }, +/turf/simulated/floor/tiled/eris/dark, +/area/aro3/workshop) "DQ" = ( /obj/structure/bed/chair/sofa/corp/left{ dir = 4 @@ -3799,9 +3869,7 @@ /turf/simulated/floor/carpet/turcarpet, /area/aro3/suite_starboard) "Ew" = ( -/obj/machinery/alarm/alarms_hidden{ - pixel_y = 26 - }, +/obj/machinery/alarm/angled/hidden, /turf/simulated/floor/plating/eris/under, /area/aro3/power) "Ex" = ( @@ -3850,8 +3918,9 @@ /turf/simulated/floor/tiled/eris/white/cargo, /area/aro3/medical) "EM" = ( -/obj/machinery/door/airlock{ - name = "Toilet" +/obj/machinery/door/airlock/angled/standard{ + name = "toilet"; + stripe_color = "#00AA00 }, /turf/simulated/floor/tiled/eris/dark/panels, /area/aro3/suite_port_wc) @@ -3931,12 +4000,13 @@ /turf/simulated/floor/tiled/eris/dark/techfloor_grid, /area/aro3/hallway_port) "Fu" = ( -/obj/machinery/door/airlock{ - name = "WC" - }, /obj/structure/cable/cyan{ icon_state = "1-2" }, +/obj/machinery/door/airlock/angled/standard{ + name = "restroom"; + stripe_color = "#00AA00 + }, /turf/simulated/floor/tiled/eris/dark/panels, /area/aro3/suite_starboard) "Fv" = ( @@ -3948,7 +4018,7 @@ /turf/simulated/floor/tiled/eris/steel/bar_dance, /area/aro3/bar) "Fy" = ( -/obj/effect/low_wall_spawner/eris/rglass, +/obj/effect/low_wall_spawner/eris/reinforced/rglass, /turf/simulated/floor/plating/eris/under, /area/aro3/kitchen) "FE" = ( @@ -3970,6 +4040,9 @@ /obj/structure/table/glass, /obj/item/weapon/reagent_containers/blood/prelabeled/OMinus, /obj/item/weapon/reagent_containers/blood/empty, +/obj/machinery/firealarm/angled/hidden{ + dir = 8 + }, /turf/simulated/floor/tiled/eris/white/cargo, /area/aro3/medical) "FP" = ( @@ -4145,17 +4218,9 @@ /turf/simulated/floor/tiled/eris/dark, /area/aro3/function) "Hz" = ( -/obj/structure/cable/cyan{ - icon_state = "4-8" - }, -/obj/machinery/button/remote/blast_door{ - dir = 1; - id = "aroshipshutter_ramp2"; - name = "hangar shutters"; - pixel_y = -28 - }, -/turf/simulated/floor/tiled/eris/dark/techfloor_grid, -/area/aro3/hallway_starboard) +/obj/effect/low_wall_spawner/eris/reinforced/rglass, +/turf/simulated/floor/plating/eris/under, +/area/aro3/workshop) "HE" = ( /turf/simulated/shuttle/wall/voidcraft/blue, /area/shuttle/aroboat3) @@ -4184,6 +4249,12 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/tiled/eris/dark/danger, /area/aro3/eva_hall) +"HO" = ( +/obj/machinery/firealarm/angled/hidden{ + dir = 1 + }, +/turf/simulated/floor/tiled/eris/dark/gray_perforated, +/area/aro3/repair_bay) "HS" = ( /obj/machinery/atmospherics/pipe/simple/visible/red{ dir = 5 @@ -4215,9 +4286,8 @@ /obj/structure/cable/cyan{ icon_state = "1-2" }, -/obj/machinery/alarm/alarms_hidden{ - dir = 4; - pixel_x = -26 +/obj/machinery/alarm/angled/hidden{ + dir = 4 }, /turf/simulated/floor/tiled/eris/dark/techfloor_grid, /area/aro3/hallway_port) @@ -4289,7 +4359,7 @@ /turf/simulated/floor/tiled/eris/steel/panels, /area/aro3/function) "Jj" = ( -/obj/effect/low_wall_spawner/eris/rglass, +/obj/effect/low_wall_spawner/eris/reinforced/rglass, /turf/simulated/floor/plating/eris/under, /area/aro3/flight_deck) "Jl" = ( @@ -4320,12 +4390,14 @@ /turf/simulated/floor/tiled/eris/steel/bar_light, /area/aro3/bar) "JU" = ( -/obj/machinery/door/airlock{ - name = "Public WC" - }, /obj/structure/cable/cyan{ icon_state = "4-8" }, +/obj/machinery/door/airlock/angled/standard{ + dir = 4; + name = "public restroom"; + stripe_color = "#00AA00 + }, /turf/simulated/floor/tiled/eris/steel/panels, /area/aro3/wc_port) "JZ" = ( @@ -4354,9 +4426,8 @@ /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 8 }, -/obj/machinery/alarm/alarms_hidden{ - dir = 8; - pixel_x = 26 +/obj/machinery/alarm/angled/hidden{ + dir = 8 }, /turf/simulated/floor/wood, /area/aro3/suite_port) @@ -4438,8 +4509,8 @@ /turf/simulated/floor/reinforced/airless, /area/space) "KK" = ( -/obj/machinery/door/airlock/multi_tile/glass{ - name = "Repair Bay" +/obj/machinery/door/airlock/angled/double/glass{ + name = "repair bay" }, /turf/simulated/floor/tiled/eris/steel/panels, /area/aro3/repair_bay) @@ -4561,7 +4632,9 @@ /turf/simulated/floor/tiled/eris/dark, /area/aro3/function) "Lt" = ( -/obj/machinery/computer/ship/navigation, +/obj/machinery/computer/ship/navigation{ + req_one_access = list(777) + }, /turf/simulated/floor/tiled/eris/dark/violetcorener, /area/aro3/cockpit) "LD" = ( @@ -4573,6 +4646,12 @@ }, /turf/simulated/floor/tiled/eris/dark/danger, /area/aro3/hallway_port) +"LE" = ( +/obj/machinery/light{ + dir = 1 + }, +/turf/simulated/floor/tiled/eris/cafe, +/area/aro3/kitchen) "LH" = ( /obj/structure/cable/cyan{ icon_state = "2-8" @@ -4607,18 +4686,9 @@ /turf/simulated/floor/tiled/eris/dark/gray_perforated, /area/aro3/hallway_starboard) "LT" = ( -/obj/structure/cable/cyan{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/unary/vent_pump/on{ - dir = 8 - }, -/obj/machinery/alarm/alarms_hidden{ - dir = 8; - pixel_x = 26 - }, -/turf/simulated/floor/tiled/eris/dark/techfloor_grid, -/area/aro3/hallway_starboard) +/obj/machinery/portable_atmospherics/canister/air, +/turf/simulated/floor/plating/eris/under, +/area/aro3/atmos) "LW" = ( /obj/structure/hull_corner, /turf/space, @@ -4724,13 +4794,18 @@ }, /turf/simulated/floor/tiled/eris/dark/gray_platform, /area/aro3/workshop) +"MO" = ( +/obj/machinery/firealarm/angled/hidden{ + dir = 4 + }, +/turf/simulated/floor/tiled/eris/steel/bar_flat, +/area/aro3/bar) "MQ" = ( /obj/structure/cable/cyan{ icon_state = "1-2" }, -/obj/machinery/alarm/alarms_hidden{ - dir = 4; - pixel_x = -26 +/obj/machinery/alarm/angled/hidden{ + dir = 4 }, /turf/simulated/floor/tiled/eris/white/golden, /area/aro3/medical) @@ -4782,8 +4857,10 @@ /turf/simulated/floor/tiled/eris/white/golden, /area/aro3/medical) "Nj" = ( -/obj/machinery/door/airlock/maintenance/common{ - name = "Materials Storage" +/obj/machinery/door/airlock/angled/standard{ + dir = 4; + name = "storage room"; + stripe_color = "#9e6243" }, /turf/simulated/floor/tiled/eris/dark/panels, /area/aro3/workshop) @@ -4893,6 +4970,18 @@ /obj/structure/lattice, /turf/space, /area/space) +"Op" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 + }, +/obj/machinery/light{ + dir = 1 + }, +/turf/simulated/floor/tiled/eris/dark/techfloor_grid, +/area/aro3/hallway_starboard) "Oq" = ( /obj/structure/cable/cyan{ icon_state = "1-2" @@ -4908,10 +4997,8 @@ /turf/simulated/floor/tiled/eris/white/cargo, /area/aro3/medical) "Os" = ( -/obj/machinery/power/apc/alarms_hidden{ - req_access = list() - }, /obj/structure/cable/cyan, +/obj/machinery/power/apc/angled/hidden, /turf/simulated/floor/tiled/eris/dark, /area/aro3/surfluid) "Ou" = ( @@ -4954,8 +5041,7 @@ /turf/simulated/floor/tiled/eris/white/golden, /area/aro3/medical) "OF" = ( -/obj/machinery/door/blast/regular{ - dir = 2; +/obj/machinery/door/blast/multi_tile/two_tile_ver{ id = "aroshipshutter_stbdair" }, /turf/simulated/floor/reinforced/airless, @@ -5003,12 +5089,12 @@ /turf/simulated/floor/tiled/eris/dark/techfloor_grid, /area/aro3/hallway_starboard) "OW" = ( -/obj/machinery/door/airlock/multi_tile/glass{ - name = "Tech Room" - }, /obj/structure/cable/cyan{ icon_state = "1-2" }, +/obj/machinery/door/airlock/angled/double/glass{ + name = "ship systems" + }, /turf/simulated/floor/tiled/eris/steel/panels, /area/aro3/surfluid) "Pb" = ( @@ -5027,9 +5113,7 @@ }, /area/aro3/park) "Pi" = ( -/obj/machinery/alarm/alarms_hidden{ - pixel_y = 26 - }, +/obj/machinery/alarm/angled/hidden, /turf/simulated/floor/tiled/eris/dark/gray_perforated, /area/aro3/repair_bay) "Pu" = ( @@ -5050,6 +5134,12 @@ }, /turf/simulated/floor/plating/eris/under, /area/aro3/power) +"Pz" = ( +/obj/machinery/light{ + dir = 1 + }, +/turf/simulated/floor/tiled/eris/dark/techfloor_grid, +/area/aro3/hallway_port) "PB" = ( /obj/structure/closet/crate/freezer/centauri, /turf/simulated/floor/tiled/eris/cafe, @@ -5105,7 +5195,7 @@ /area/aro3/hallway_starboard) "PP" = ( /obj/machinery/computer/ship/helm{ - req_one_access = list() + req_one_access = list(777) }, /turf/simulated/floor/tiled/eris/dark/violetcorener, /area/aro3/cockpit) @@ -5113,6 +5203,7 @@ /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 4 }, +/obj/machinery/firealarm/angled/hidden, /turf/simulated/floor/tiled/eris/dark/danger, /area/aro3/eva_hall) "Qb" = ( @@ -5162,8 +5253,9 @@ "QD" = ( /obj/structure/fans/hardlight, /obj/machinery/door/firedoor/glass/hidden, -/obj/machinery/door/blast/multi_tile/two_tile_hor{ - id = "aroshipshutter_ramp2" +/obj/machinery/door/airlock/angled/double/glass{ + name = "hangar"; + stripe_color = "#AA0000" }, /turf/simulated/floor/tiled/eris/dark/danger, /area/aro3/flight_deck) @@ -5180,12 +5272,12 @@ /turf/simulated/floor/tiled/eris/dark/techfloor_grid, /area/aro3/hallway_bunkrooms) "QO" = ( -/obj/machinery/door/airlock/multi_tile/glass{ - name = "Park" - }, /obj/structure/cable/cyan{ icon_state = "1-2" }, +/obj/machinery/door/airlock/angled/double/glass{ + name = "park" + }, /turf/simulated/floor/tiled/eris/steel/panels, /area/aro3/park) "QS" = ( @@ -5236,9 +5328,11 @@ /turf/simulated/floor/tiled/eris/dark/gray_platform, /area/aro3/hallway_bunkrooms) "Rm" = ( -/obj/machinery/door/airlock{ +/obj/machinery/door/airlock/angled/standard{ + dir = 4; id_tag = "aro3_private1_bed"; - name = "Private Room 1" + name = "bedroom"; + stripe_color = "#00AA00 }, /turf/simulated/floor/tiled/eris/dark/panels, /area/aro3/suite_port) @@ -5270,7 +5364,7 @@ /turf/simulated/floor/tiled/eris/cafe, /area/aro3/kitchen) "Rz" = ( -/obj/effect/low_wall_spawner/eris/rglass, +/obj/effect/low_wall_spawner/eris/reinforced/rglass, /turf/simulated/floor/plating/eris/under, /area/aro3/surfluid) "RJ" = ( @@ -5355,12 +5449,11 @@ /turf/simulated/floor/tiled/eris/dark/techfloor_grid, /area/aro3/hallway_port) "SK" = ( -/obj/machinery/power/apc/alarms_hidden{ - dir = 4; - req_access = list() - }, /obj/structure/cable/cyan, /obj/structure/closet/crate, +/obj/machinery/power/apc/angled/hidden{ + dir = 4 + }, /turf/simulated/floor/tiled/techmaint, /area/aro3/bunkrooms) "SR" = ( @@ -5405,19 +5498,20 @@ /turf/simulated/wall/eris/r_wall, /area/aro3/workshop) "Tg" = ( -/obj/machinery/alarm/alarms_hidden{ - dir = 1; - pixel_y = -26 +/obj/machinery/alarm/angled/hidden{ + dir = 1 }, -/turf/simulated/floor/tiled/eris/dark/danger, -/area/aro3/eva_hall) +/turf/simulated/floor/outdoors/grass/heavy{ + outdoors = 0 + }, +/area/aro3/park) "To" = ( -/obj/machinery/door/airlock/multi_tile/glass{ - dir = 2 - }, /obj/structure/cable/cyan{ icon_state = "4-8" }, +/obj/machinery/door/airlock/angled/double/glass{ + dir = 8 + }, /turf/simulated/floor/tiled/eris/steel/panels, /area/aro3/hallway_port) "Tr" = ( @@ -5430,11 +5524,8 @@ /turf/simulated/floor/tiled/eris/dark, /area/aro3/workshop) "Tv" = ( -/obj/machinery/power/apc/alarms_hidden{ - req_access = list() - }, /obj/structure/cable/cyan{ - icon_state = "0-4" + icon_state = "4-8" }, /turf/simulated/floor/tiled/eris/dark/danger, /area/aro3/eva_hall) @@ -5498,11 +5589,15 @@ /turf/simulated/floor/tiled/eris/cafe, /area/aro3/kitchen) "TO" = ( -/obj/machinery/door/airlock/multi_tile/glass{ - name = "Kitchen" +/obj/machinery/door/airlock/angled/double/glass{ + name = "kitchen" }, /turf/simulated/floor/tiled/eris/steel/panels, /area/aro3/function) +"TQ" = ( +/obj/machinery/portable_atmospherics/canister/empty, +/turf/simulated/floor/plating/eris/under, +/area/aro3/atmos) "TT" = ( /obj/effect/shuttle_landmark{ base_area = /area/space; @@ -5531,22 +5626,23 @@ /turf/space, /area/space) "Ui" = ( -/obj/machinery/door/airlock/multi_tile/glass{ - name = "Bridge"; - req_access = list(777); - secured_wires = 1 - }, /obj/structure/cable/cyan{ icon_state = "1-2" }, +/obj/machinery/door/airlock/angled/double/glass{ + name = "bridge"; + req_one_access = list(777); + stripe_color = "#0000AA" + }, /turf/simulated/floor/tiled/eris/steel/panels, /area/aro3/cockpit) "Uj" = ( -/obj/machinery/door/airlock/multi_tile/glass{ - name = "Bunking Area" - }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/door/airlock/angled/double/glass{ + name = "bunkrooms"; + stripe_color = "#00AA00" + }, /turf/simulated/floor/tiled/eris/steel/panels, /area/aro3/hallway_bunkrooms) "Ul" = ( @@ -5562,7 +5658,6 @@ /turf/simulated/wall/rpshull, /area/aro3/flight_deck) "Us" = ( -/obj/machinery/light, /obj/structure/bed/chair/sofa/corp/right{ dir = 1 }, @@ -5576,12 +5671,12 @@ /turf/space/internal_edge/topleft, /area/aro3/function) "Uv" = ( -/obj/machinery/door/airlock/multi_tile/glass{ - dir = 2 - }, /obj/structure/cable/cyan{ icon_state = "4-8" }, +/obj/machinery/door/airlock/angled/double/glass{ + dir = 8 + }, /turf/simulated/floor/tiled/eris/steel/panels, /area/aro3/hallway_starboard) "Uy" = ( @@ -5597,6 +5692,13 @@ "UN" = ( /turf/simulated/floor/reinforced/airless, /area/aro3/eva_hall) +"UP" = ( +/obj/machinery/power/apc/angled/hidden, +/obj/structure/cable/cyan{ + icon_state = "0-4" + }, +/turf/simulated/floor/tiled/eris/dark/danger, +/area/aro3/eva_hall) "UR" = ( /obj/structure/cable/cyan{ icon_state = "4-8" @@ -5650,8 +5752,9 @@ /turf/simulated/floor/tiled/eris/dark/gray_perforated, /area/aro3/engines) "Vv" = ( -/obj/machinery/door/airlock{ - name = "Bunk Room 3" +/obj/machinery/door/airlock/angled/standard{ + name = "bunkroom 1"; + stripe_color = "#00AA00 }, /turf/simulated/floor/tiled/eris/dark/panels, /area/aro3/bunkrooms) @@ -5665,11 +5768,15 @@ /turf/simulated/wall/eris/r_wall, /area/aro3/suite_starboard_wc) "VO" = ( -/obj/structure/sink/kitchen{ - pixel_y = 24 +/obj/structure/fans/hardlight, +/obj/machinery/door/airlock/angled/double/glass{ + dir = 8; + door_color = "#AA0000"; + name = "starboard airlock"; + stripe_color = "#FFFFFF" }, -/turf/simulated/floor/tiled/eris/cafe, -/area/aro3/kitchen) +/turf/simulated/floor/tiled/eris/steel/panels, +/area/aro3/eva_hall) "VQ" = ( /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 8 @@ -5721,7 +5828,7 @@ /turf/simulated/floor/plating/eris/under, /area/aro3/atmos) "Wy" = ( -/obj/effect/low_wall_spawner/eris/rglass, +/obj/effect/low_wall_spawner/eris/reinforced/rglass, /turf/simulated/floor/plating/eris/under, /area/aro3/medical) "Wz" = ( @@ -5779,7 +5886,7 @@ /turf/simulated/floor/tiled/eris/cafe, /area/aro3/kitchen) "WU" = ( -/obj/effect/low_wall_spawner/eris/rglass, +/obj/effect/low_wall_spawner/eris/reinforced/rglass, /turf/simulated/floor/plating/eris/under, /area/aro3/bar) "WV" = ( @@ -5905,10 +6012,13 @@ /turf/simulated/floor/tiled/eris/dark/techfloor_grid, /area/aro3/hallway_port) "Yh" = ( -/obj/machinery/door/airlock/glass, /obj/structure/cable/cyan{ icon_state = "1-2" }, +/obj/machinery/door/airlock/angled/standard/glass{ + name = "qpad room"; + stripe_color = "#AA00AA" + }, /turf/simulated/floor/tiled/eris/dark/panels, /area/aro3/hallway_starboard) "Yj" = ( @@ -5974,6 +6084,14 @@ }, /turf/simulated/floor/tiled/eris/steel/bar_dance, /area/aro3/bar) +"YI" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/light{ + dir = 8 + }, +/turf/simulated/floor/tiled/eris/dark/techfloor_grid, +/area/aro3/hallway_starboard) "YJ" = ( /turf/simulated/floor/tiled/eris/dark/techfloor_grid, /area/aro3/surfluid) @@ -6047,9 +6165,8 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/machinery/alarm/alarms_hidden{ - dir = 1; - pixel_y = -26 +/obj/machinery/alarm/angled/hidden{ + dir = 1 }, /turf/simulated/floor/tiled/eris/dark/violetcorener, /area/aro3/cockpit) @@ -6072,13 +6189,12 @@ /obj/structure/sink{ pixel_y = 24 }, -/obj/machinery/power/apc/alarms_hidden{ - dir = 8; - req_access = list() - }, /obj/structure/cable/cyan{ icon_state = "0-2" }, +/obj/machinery/power/apc/angled/hidden{ + dir = 8 + }, /turf/simulated/floor/tiled/eris/white, /area/aro3/wc_starboard) "ZB" = ( @@ -6116,6 +6232,9 @@ pixel_x = 32; pixel_y = 0 }, +/obj/machinery/firealarm/angled/hidden{ + dir = 1 + }, /turf/simulated/floor/carpet/turcarpet, /area/aro3/suite_starboard) "ZM" = ( @@ -13492,7 +13611,7 @@ WN Ut mE kq -sk +Vv iV ug lO @@ -14060,7 +14179,7 @@ WN qH eS kq -aQ +qu hX vQ lO @@ -14628,7 +14747,7 @@ WN WN Ex kq -Vv +bv Np iP lO @@ -14906,7 +15025,7 @@ ap bk ap ap -Fr +pm qI WN WN @@ -15024,7 +15143,7 @@ pc Fn Fn Fn -oN +UN oN Fn Fn @@ -15044,7 +15163,7 @@ Yf lI Yf Yf -Le +Yf Eh Yf Yf @@ -15185,7 +15304,7 @@ vh FZ NO FZ -FZ +aG FZ wE Hi @@ -15611,7 +15730,7 @@ HH jh cm VZ -AD +LE iL mQ KC @@ -15625,9 +15744,9 @@ cH qW qW RJ -iN +lC Fr -NC +ff hl hl IS @@ -15732,11 +15851,11 @@ Pe el el el -el +Tg lu DM XF -XF +UP cB EC zu @@ -15747,7 +15866,7 @@ Hw qX Fb zu -zu +oc uJ uJ iJ @@ -15767,9 +15886,9 @@ zt IK mL RJ -iN -vJ -NC +Pz +Fr +ff mO hl Is @@ -15870,7 +15989,7 @@ NQ kM Zm lu -Ml +oG el el mX @@ -15895,7 +16014,7 @@ uJ rx ns VZ -VO +AD AD AD KC @@ -16304,7 +16423,7 @@ jr lu lu VQ -Tg +XF cB cB Pb @@ -16446,7 +16565,7 @@ vZ lu vP XF -XF +nH cB EC zu @@ -16457,7 +16576,7 @@ Hw qX Fb zu -zu +oc uJ uJ iJ @@ -16469,7 +16588,7 @@ AD KC AD AD -AD +DG RJ vb yk @@ -16479,7 +16598,7 @@ Kw RJ df CH -NC +ff zy hl Is @@ -16487,7 +16606,7 @@ Is Yt NC Md -Hz +Mr Iq UR Ov @@ -16605,7 +16724,7 @@ PJ Ls cm VZ -AD +LE AD AD KC @@ -16621,12 +16740,12 @@ VA RJ Mr CH -NC +ff Pi hl IS ZW -hl +HO NC kj Mr @@ -16774,7 +16893,7 @@ KA Uv Iq jU -Ov +sx kg Ov Ov @@ -16871,7 +16990,7 @@ Fn Fn cB qm -Aa +VO cB cB ns @@ -17031,7 +17150,7 @@ zq Wc YQ Wc -Wc +YI Wc Wc vp @@ -17154,7 +17273,7 @@ Lp Fn Fn Fn -OF +UN OF Fn Fn @@ -17174,7 +17293,7 @@ gW KU Hr Hr -sD +Hr Hr Hr Hr @@ -17188,8 +17307,8 @@ Hr Hr Hr Sj -Hr -LT +gW +En Hr Ox Hr @@ -17320,7 +17439,7 @@ hM jy hM hM -CH +Op Mr Lb Lb @@ -17331,8 +17450,8 @@ WU Lb Tc Tc -Tc -Tc +Hz +Hz Tc Tc CH @@ -17472,9 +17591,9 @@ DH Fx WJ Tc -aY +vJ ki -lC +aY aY Tc lq @@ -17771,7 +17890,7 @@ wd xW Gy Hh -Hh +TQ fB fB Fn @@ -17898,7 +18017,7 @@ Qv YY WJ Tc -nm +yo nm tl kI @@ -17909,7 +18028,7 @@ tl nm NF fB -Hh +LT OG zj Hh @@ -18468,7 +18587,7 @@ WJ Tc Wz FE -tl +DP tl xI PL @@ -18601,7 +18720,7 @@ IR lr dH Lb -YY +yT zM YY YY @@ -18888,7 +19007,7 @@ Lb YY zM YY -YY +MO YY WJ Tc diff --git a/vorestation.dme b/vorestation.dme index 0e6b2ebdcb0..ea3fdd0832d 100644 --- a/vorestation.dme +++ b/vorestation.dme @@ -927,6 +927,7 @@ #include "code\game\machinery\computer\timeclock_vr.dm" #include "code\game\machinery\computer\~computer_vr.dm" #include "code\game\machinery\doors\airlock.dm" +#include "code\game\machinery\doors\airlock_angled.dm" #include "code\game\machinery\doors\airlock_control.dm" #include "code\game\machinery\doors\airlock_electronics.dm" #include "code\game\machinery\doors\airlock_vr.dm" @@ -1458,6 +1459,7 @@ #include "code\game\objects\structures\ledges.dm" #include "code\game\objects\structures\lightpost.dm" #include "code\game\objects\structures\loot_piles.dm" +#include "code\game\objects\structures\low_wall.dm" #include "code\game\objects\structures\map_blocker_vr.dm" #include "code\game\objects\structures\medical_stand_vr.dm" #include "code\game\objects\structures\mirror.dm" @@ -1479,7 +1481,6 @@ #include "code\game\objects\structures\transit_tubes.dm" #include "code\game\objects\structures\trash_pile_vr.dm" #include "code\game\objects\structures\under_wardrobe.dm" -#include "code\game\objects\structures\wall_frame.dm" #include "code\game\objects\structures\watercloset.dm" #include "code\game\objects\structures\watercloset_vr.dm" #include "code\game\objects\structures\windoor_assembly.dm"