Skip to content

Commit

Permalink
Shutter fix (#16232)
Browse files Browse the repository at this point in the history
  • Loading branch information
Lumipharon committed Jul 4, 2024
1 parent d86967f commit 33840a1
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 17 deletions.
6 changes: 2 additions & 4 deletions code/game/objects/machinery/doors/door.dm
Original file line number Diff line number Diff line change
Expand Up @@ -200,7 +200,6 @@
return FALSE
operating = TRUE
do_animate("opening")
icon_state = "door0"
set_opacity(FALSE)
for(var/t in fillers)
var/obj/effect/opacifier/O = t
Expand All @@ -211,7 +210,7 @@
/obj/machinery/door/proc/finish_open()
layer = open_layer
density = FALSE
update_icon()
update_appearance(UPDATE_ICON_STATE)

if(operating)
operating = FALSE
Expand All @@ -226,14 +225,13 @@
if(operating)
return FALSE
operating = TRUE

density = TRUE
layer = closed_layer
do_animate("closing")
addtimer(CALLBACK(src, PROC_REF(finish_close)), openspeed)

/obj/machinery/door/proc/finish_close()
update_icon()
update_appearance(UPDATE_ICON_STATE)
if(visible && !glass)
set_opacity(TRUE) //caaaaarn!
for(var/t in fillers)
Expand Down
19 changes: 6 additions & 13 deletions code/game/objects/machinery/doors/shutters.dm
Original file line number Diff line number Diff line change
Expand Up @@ -84,9 +84,10 @@


/obj/machinery/door/poddoor/shutters/opened
icon_state = "shutter"
icon_state = "shutter0"
density = FALSE
opacity = FALSE
layer = PODDOOR_OPEN_LAYER

/obj/machinery/door/poddoor/shutters/opened/medbay
name = "Medbay Lockdown Shutters"
Expand Down Expand Up @@ -125,8 +126,7 @@
density = FALSE
opacity = FALSE
layer = PODDOOR_OPEN_LAYER
icon_state = "shutter"

icon_state = "shutter0"

/obj/machinery/door/poddoor/shutters/mainship/selfdestruct
name = "Self Destruct Lockdown"
Expand Down Expand Up @@ -159,9 +159,8 @@
/obj/machinery/door/poddoor/shutters/transit/open
density = FALSE
opacity = FALSE
resistance_flags = RESIST_ALL|DROPSHIP_IMMUNE
layer = PODDOOR_OPEN_LAYER
icon_state = "shutter"
icon_state = "shutter0"

/obj/machinery/door/poddoor/shutters/barren
resistance_flags = UNACIDABLE|DROPSHIP_IMMUNE
Expand All @@ -171,15 +170,13 @@
density = FALSE
opacity = FALSE
resistance_flags = RESIST_ALL|DROPSHIP_IMMUNE
icon_state = "shutter"
open_layer = PODDOOR_CLOSED_LAYER
closed_layer = PODDOOR_CLOSED_LAYER

/obj/machinery/door/poddoor/shutters/tadpole_cockpit
name = "pressure shutters"
density = FALSE
opacity = FALSE
icon_state = "shutter"
open_layer = PODDOOR_CLOSED_LAYER
closed_layer = PODDOOR_CLOSED_LAYER

Expand All @@ -194,7 +191,6 @@

/obj/machinery/door/poddoor/shutters/mainship/req
name = "\improper Requisitions Shutters"
icon_state = "shutter"

/obj/machinery/door/poddoor/shutters/mainship/req/ro
name = "\improper RO Line"
Expand All @@ -210,7 +206,6 @@
/obj/machinery/door/poddoor/shutters/mainship/containment
name = "\improper Containment Cell"
id = "containmentcell"
icon_state = "shutter"

/obj/machinery/door/poddoor/shutters/mainship/containment/cell1
name = "\improper Containment Cell 1"
Expand All @@ -223,20 +218,17 @@
/obj/machinery/door/poddoor/shutters/mainship/brigarmory
name = "\improper Brig Armory Shutters"
id = "brig_armory"
icon_state = "shutter"

/obj/machinery/door/poddoor/shutters/mainship/cic
name = "\improper CIC Shutters"

/obj/machinery/door/poddoor/shutters/mainship/cic/armory
name = "\improper Armory Shutters"
id = "cic_armory"
icon_state = "shutter"

/obj/machinery/door/poddoor/shutters/mainship/engineering/armory
name = "\improper Engineering Armory Shutters"
id = "engi_armory"
icon_state = "shutter"

/obj/machinery/door/poddoor/shutters/mainship/corporate
name = "\improper Privacy Shutters"
Expand Down Expand Up @@ -301,9 +293,9 @@

/obj/machinery/door/poddoor/shutters/urban/open_shutters/opened
icon_state = "almayer_pdoor0"
base_icon_state = "almayer_pdoor"
density = FALSE
opacity = FALSE
layer = PODDOOR_OPEN_LAYER

/obj/machinery/door/poddoor/shutters/urban/shutters
icon_state = "shutter"
Expand All @@ -314,6 +306,7 @@
base_icon_state = "shutter"
density = FALSE
opacity = FALSE
layer = PODDOOR_OPEN_LAYER

/obj/machinery/door/poddoor/shutters/urban/white
desc = "That looks like it doesn't open easily."
Expand Down
Binary file modified icons/obj/doors/mainship/blastdoors_shutters.dmi
Binary file not shown.
Binary file modified icons/obj/structures/prop/urban/urbanshutters.dmi
Binary file not shown.

0 comments on commit 33840a1

Please sign in to comment.