Skip to content
This repository has been archived by the owner on Dec 18, 2018. It is now read-only.

Commit

Permalink
fixes layering of shutters when open (#726)
Browse files Browse the repository at this point in the history
  • Loading branch information
@spookydonut @Rohesie
spookydonut authored and Rohesie committed Nov 21, 2018
1 parent a8ec4e4 commit c02a2cb
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 6 deletions.
9 changes: 8 additions & 1 deletion code/game/machinery/doors/shutters.dm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,12 @@

/obj/machinery/door/poddoor/shutters/New()
..()
layer = PODDOOR_CLOSED_LAYER
if(density && closed_layer)
layer = closed_layer
else if(!density && open_layer)
layer = open_layer
else
layer = PODDOOR_CLOSED_LAYER

/obj/machinery/door/poddoor/shutters/attackby(obj/item/C as obj, mob/user as mob)
add_fingerprint(user)
Expand Down Expand Up @@ -99,12 +104,14 @@
density = FALSE
opacity = FALSE
unacidable = TRUE
layer = PODDOOR_OPEN_LAYER
icon_state = "shutter0"

/obj/machinery/door/poddoor/shutters/transit/open
density = FALSE
opacity = FALSE
unacidable = TRUE
layer = PODDOOR_OPEN_LAYER
icon_state = "shutter0"

/obj/machinery/door/poddoor/shutters/almayer/pressure
Expand Down
10 changes: 5 additions & 5 deletions maps/Z.03.USS_Almayer.dmm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -313,7 +313,7 @@
"aga" = (/obj/machinery/atmospherics/unary/vent_pump,/turf/open/floor/almayer{tag = "icon-bluecorner (NORTH)"; icon_state = "bluecorner"; dir = 1},/area/almayer/living/offices)
"agb" = (/obj/structure/foamedmetal,/turf/open/floor/plating,/area/almayer/hull/upper_hull)
"agc" = (/obj/structure/cable/yellow{d1 = 2; d2 = 8; icon_state = "2-8"},/turf/open/floor/plating/plating_catwalk,/area/almayer/hull/lower_hull)
"agd" = (/obj/structure/window/framed/almayer/white,/obj/machinery/door/firedoor/border_only/almayer,/obj/machinery/door/poddoor/shutters/almayer{density = 0; dir = 4; icon_state = "shutter0"; id = "researchlockdownext"; name = "\improper Research Lockdown"; opacity = 0},/turf/open/floor/plating,/area/almayer/medical/medical_science)
"agd" = (/obj/structure/window/framed/almayer/white,/obj/machinery/door/firedoor/border_only/almayer,/obj/machinery/door/poddoor/shutters/almayer/open{dir = 4; id = "researchlockdownext"; name = "\improper Research Lockdown"},/turf/open/floor/plating,/area/almayer/medical/medical_science)
"age" = (/obj/structure/bed/chair{dir = 1},/turf/open/floor/almayer{tag = "icon-red (NORTHWEST)"; icon_state = "red"; dir = 9},/area/almayer/shipboard/starboard_missiles)
"agf" = (/obj/structure/bed/chair{dir = 1},/turf/open/floor/almayer{tag = "icon-red (NORTH)"; icon_state = "red"; dir = 1},/area/almayer/shipboard/starboard_missiles)
"agg" = (/obj/structure/bed/chair{dir = 1},/turf/open/floor/almayer{tag = "icon-red (NORTHEAST)"; icon_state = "red"; dir = 5},/area/almayer/shipboard/starboard_missiles)
Expand Down Expand Up @@ -1422,7 +1422,7 @@
"aBr" = (/obj/structure/ladder{height = 2; id = "engineeringladder"},/turf/open/floor/plating/almayer,/area/almayer/engineering/upper_engineering)
"aBs" = (/obj/structure/bed/chair{dir = 1},/turf/open/floor/almayer{dir = 2; icon_state = "orange"; tag = "icon-orange (NORTH)"},/area/almayer/engineering/upper_engineering)
"aBt" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/open/floor/plating/plating_catwalk,/area/almayer/engineering/upper_engineering)
"aBu" = (/obj/machinery/smartfridge/chemistry,/obj/machinery/door/poddoor/shutters/almayer{density = 0; dir = 4; icon_state = "shutter0"; id = "researchlockdownext"; name = "\improper Research Lockdown"; opacity = 0},/turf/open/floor/almayer{icon_state = "sterile_green"; tag = "icon-sterile"},/area/almayer/medical/medical_science)
"aBu" = (/obj/machinery/smartfridge/chemistry,/obj/machinery/door/poddoor/shutters/almayer/open{dir = 4; id = "researchlockdownext"; name = "\improper Research Lockdown"},/turf/open/floor/almayer{icon_state = "sterile_green"; tag = "icon-sterile"},/area/almayer/medical/medical_science)
"aBv" = (/obj/structure/cable/yellow{d1 = 1; d2 = 4; icon_state = "1-4"},/turf/open/floor/almayer{tag = "icon-orange (SOUTHWEST)"; icon_state = "orange"; dir = 10},/area/almayer/engineering/upper_engineering)
"aBw" = (/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"; layer = 2.1},/obj/structure/disposalpipe/segment,/turf/open/floor/plating/plating_catwalk,/area/almayer/hull/upper_hull)
"aBx" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply{tag = "icon-intact-supply (EAST)"; icon_state = "intact-supply"; dir = 4},/obj/structure/bed/chair/office/dark,/turf/open/floor/almayer{icon_state = "dark_sterile"; tag = "icon-sterile"},/area/almayer/medical/medical_science)
Expand Down Expand Up @@ -1484,7 +1484,7 @@
"aCB" = (/obj/machinery/vending/snack,/turf/open/floor/almayer{icon_state = "sterile_green_side"; tag = "icon-sterile"},/area/almayer/medical/upper_medical)
"aCC" = (/turf/open/floor/almayer{tag = "icon-sterile_green_side (NORTHEAST)"; icon_state = "sterile_green_side"; dir = 5},/area/almayer/medical/upper_medical)
"aCD" = (/obj/machinery/computer/pandemic,/turf/open/floor/almayer{tag = "icon-sterile_green_side (NORTH)"; icon_state = "sterile_green_side"; dir = 1},/area/almayer/medical/medical_science)
"aCE" = (/obj/machinery/door/firedoor/border_only/almayer,/obj/machinery/door/poddoor/shutters/almayer{density = 0; dir = 4; icon_state = "shutter0"; id = "researchlockdownext"; name = "\improper Research Lockdown"; opacity = 0},/obj/machinery/door/window/westright,/obj/machinery/door/window/eastleft{req_one_access_txt = "0"},/obj/structure/table/reinforced,/turf/open/floor/almayer{icon_state = "sterile_green"; tag = "icon-sterile"},/area/almayer/medical/medical_science)
"aCE" = (/obj/machinery/door/firedoor/border_only/almayer,/obj/machinery/door/window/westright,/obj/machinery/door/window/eastleft{req_one_access_txt = "0"},/obj/structure/table/reinforced,/obj/machinery/door/poddoor/shutters/almayer/open{dir = 4; id = "researchlockdownext"; name = "\improper Research Lockdown"},/turf/open/floor/almayer{icon_state = "sterile_green"; tag = "icon-sterile"},/area/almayer/medical/medical_science)
"aCF" = (/obj/structure/closet/secure_closet/medical1,/turf/open/floor/almayer{tag = "icon-sterile_green_side (EAST)"; icon_state = "sterile_green_side"; dir = 4},/area/almayer/medical/medical_science)
"aCG" = (/turf/open/floor/almayer{icon_state = "plate"; tag = "icon-sterile"},/area/almayer/command/corporateliaison)
"aCH" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 1; on = 1},/turf/open/floor/almayer{icon_state = "plate"; tag = "icon-sterile"},/area/almayer/command/corporateliaison)
Expand Down Expand Up @@ -2074,7 +2074,7 @@
"aNT" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/open/floor/almayer{tag = "icon-green (WEST)"; icon_state = "green"; dir = 8},/area/almayer/living/basketball)
"aNU" = (/obj/machinery/light{dir = 4},/obj/structure/disposalpipe/segment,/turf/open/floor/almayer{tag = "icon-red (WEST)"; icon_state = "red"; dir = 8},/area/almayer/hallways/aft_hallway)
"aNV" = (/obj/machinery/light{dir = 1},/obj/machinery/atmospherics/pipe/simple/hidden/supply{tag = "icon-intact-supply (EAST)"; icon_state = "intact-supply"; dir = 4},/turf/open/floor/almayer{tag = "icon-orange (NORTH)"; icon_state = "orange"; dir = 1},/area/almayer/engineering/port_atmos)
"aNW" = (/obj/machinery/door/poddoor/shutters/almayer{density = 0; dir = 4; icon_state = "shutter0"; id = "researchlockdownext"; name = "\improper Research Lockdown"; opacity = 0},/obj/machinery/door/firedoor/border_only/almayer,/obj/machinery/door/airlock/almayer/research/glass{id = "researchdoorext"; id_tag = "researchdoorext"; name = "\improper Medical Research Wing"},/turf/open/floor/almayer{tag = "icon-sterile_green_side (NORTH)"; icon_state = "sterile_green_side"; dir = 1},/area/almayer/medical/medical_science)
"aNW" = (/obj/machinery/door/firedoor/border_only/almayer,/obj/machinery/door/airlock/almayer/research/glass{id = "researchdoorext"; id_tag = "researchdoorext"; name = "\improper Medical Research Wing"},/obj/machinery/door/poddoor/shutters/almayer/open{dir = 4; id = "researchlockdownext"; name = "\improper Research Lockdown"},/turf/open/floor/almayer{tag = "icon-sterile_green_side (NORTH)"; icon_state = "sterile_green_side"; dir = 1},/area/almayer/medical/medical_science)
"aNX" = (/obj/structure/window/reinforced{dir = 4; health = 80},/obj/structure/bed/chair{dir = 4},/turf/open/floor/almayer{tag = "icon-green (EAST)"; icon_state = "green"; dir = 4},/area/almayer/living/basketball)
"aNY" = (/obj/structure/bed/chair/office/dark,/obj/effect/landmark/start{name = "Researcher"},/turf/open/floor/almayer{icon_state = "dark_sterile"; tag = "icon-sterile"},/area/almayer/medical/medical_science)
"aNZ" = (/obj/effect/decal/warning_stripes{tag = "icon-W"; icon_state = "W"},/turf/open/floor/wood,/area/almayer/living/basketball)
Expand Down Expand Up @@ -2240,7 +2240,7 @@
"aRd" = (/obj/structure/disposalpipe/segment{dir = 4},/obj/machinery/door/airlock/multi_tile/almayer/medidoor{dir = 2; name = "Research Chemical Lab"; req_access_txt = "20"; req_one_access_txt = "0"},/turf/open/floor/almayer{icon_state = "sterile_green_side"; tag = "icon-sterile"},/area/almayer/medical/medical_science)
"aRe" = (/obj/structure/disposalpipe/segment{dir = 4},/turf/open/floor/almayer{tag = "icon-sterile_green_side (SOUTHWEST)"; icon_state = "sterile_green_side"; dir = 10},/area/almayer/medical/medical_science)
"aRf" = (/obj/structure/disposalpipe/segment{dir = 8; icon_state = "pipe-c"},/turf/open/floor/almayer{icon_state = "dark_sterile"; tag = "icon-sterile"},/area/almayer/medical/medical_science)
"aRg" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply{tag = "icon-intact-supply (EAST)"; icon_state = "intact-supply"; dir = 4},/obj/structure/disposalpipe/segment{dir = 4},/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/door/poddoor/shutters/almayer{density = 0; dir = 4; icon_state = "shutter0"; id = "researchlockdownext"; name = "\improper Research Lockdown"; opacity = 0},/obj/machinery/door/firedoor/border_only/almayer,/obj/machinery/door/airlock/almayer/research/glass{id = "researchdoorext"; id_tag = "researchdoorext"; name = "\improper Medical Research Wing"},/turf/open/floor/almayer{icon_state = "sterile_green_side"; tag = "icon-sterile"},/area/almayer/medical/medical_science)
"aRg" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply{tag = "icon-intact-supply (EAST)"; icon_state = "intact-supply"; dir = 4},/obj/structure/disposalpipe/segment{dir = 4},/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/door/firedoor/border_only/almayer,/obj/machinery/door/airlock/almayer/research/glass{id = "researchdoorext"; id_tag = "researchdoorext"; name = "\improper Medical Research Wing"},/obj/machinery/door/poddoor/shutters/almayer/open{dir = 4; id = "researchlockdownext"; name = "\improper Research Lockdown"},/turf/open/floor/almayer{icon_state = "sterile_green_side"; tag = "icon-sterile"},/area/almayer/medical/medical_science)
"aRh" = (/obj/structure/table/almayer,/obj/item/storage/box/syringes{pixel_x = 2; pixel_y = 2},/obj/item/storage/box/beakers,/obj/item/storage/box/beakers,/obj/machinery/firealarm{dir = 4; pixel_x = 24},/turf/open/floor/almayer{tag = "icon-sterile_green_side (EAST)"; icon_state = "sterile_green_side"; dir = 4},/area/almayer/medical/medical_science)
"aRi" = (/turf/open/floor/almayer{tag = "icon-silvercorner (NORTH)"; icon_state = "silvercorner"; dir = 1},/area/almayer/hull/upper_hull)
"aRj" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/structure/disposalpipe/segment,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/turf/open/floor/almayer{tag = "icon-orangecorner"; icon_state = "orangecorner"},/area/almayer/hallways/stern_hallway)
Expand Down

0 comments on commit c02a2cb

Please sign in to comment.