diff --git a/code/game/machinery/doors/blast_door.dm b/code/game/machinery/doors/blast_door.dm index eb20eb2d0a..fee4973703 100644 --- a/code/game/machinery/doors/blast_door.dm +++ b/code/game/machinery/doors/blast_door.dm @@ -29,6 +29,7 @@ var/close_sound = 'sound/machines/door/blastdoorclose.ogg' var/damage = BLAST_DOOR_CRUSH_DAMAGE var/multiplier = 1 // The multiplier for how powerful our YEET is. + var/istransparent = 0 closed_layer = ON_WINDOW_LAYER // Above airlocks when closed var/id = 1.0 @@ -108,10 +109,13 @@ src.density = 1 update_nearby_tiles() src.update_icon() - src.set_opacity(1) + if(src.istransparent) + src.set_opacity(0) + else + src.set_opacity(1) sleep(15) src.operating = 0 - + // Blast door crushing. for(var/turf/turf in locs) for(var/atom/movable/AM in turf) @@ -276,10 +280,11 @@ // Parameters: None // Description: Closes the door. Does necessary checks. /obj/machinery/door/blast/close() + if (src.operating || (stat & BROKEN || stat & NOPOWER)) return - force_close() + force_close() // Proc: repair() // Parameters: None @@ -323,5 +328,52 @@ obj/machinery/door/blast/regular/open icon_state = "shutter1" damage = SHUTTER_CRUSH_DAMAGE +// SUBTYPE: Transparent +// Not technically a blast door but operates like one. Allows air and light. +obj/machinery/door/blast/gate + name = "thick gate" + icon_state_open = "tshutter0" + icon_state_opening = "tshutterc0" + icon_state_closed = "tshutter1" + icon_state_closing = "tshutterc1" + icon_state = "tshutter1" + damage = SHUTTER_CRUSH_DAMAGE + maxhealth = 400 + block_air_zones = 0 + opacity = 0 + istransparent = 1 + +obj/machinery/door/blast/gate/open + icon_state = "tshutter0" + density = 0 + +/obj/machinery/door/blast/gate/thin + name = "thin gate" + icon_state_open = "shutter2_0" + icon_state_opening = "shutter2_c0" + icon_state_closed = "shutter2_1" + icon_state_closing = "shutter2_c1" + icon_state = "shutter2_1" + maxhealth = 200 + opacity = 0 + +/obj/machinery/door/blast/gate/thin/open + icon_state = "shutter2_1" + density = 0 + +/obj/machinery/door/blast/gate/bars + name = "prison bars" + icon_state_open = "bars_0" + icon_state_opening = "bars_c0" + icon_state_closed = "bars_1" + icon_state_closing = "bars_c1" + icon_state = "bars_1" + maxhealth = 600 + opacity = 0 + +/obj/machinery/door/blast/gate/bars/open + icon_state = "bars_1" + density = 0 + #undef BLAST_DOOR_CRUSH_DAMAGE #undef SHUTTER_CRUSH_DAMAGE \ No newline at end of file diff --git a/html/changelogs/woodrat - WR_shutters.yml b/html/changelogs/woodrat - WR_shutters.yml new file mode 100644 index 0000000000..4e8a24e018 --- /dev/null +++ b/html/changelogs/woodrat - WR_shutters.yml @@ -0,0 +1,37 @@ +################################ +# Example Changelog File +# +# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb. +# +# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.) +# When it is, any changes listed below will disappear. +# +# Valid Prefixes: +# bugfix +# wip (For works in progress) +# tweak +# soundadd +# sounddel +# rscadd (general adding of nice things) +# rscdel (general deleting of nice things) +# imageadd +# imagedel +# maptweak +# spellcheck (typo fixes) +# experiment +################################# + +# Your name. +author: Woodrat + +# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again. +delete-after: True + +# Any changes you've made. See valid prefix list above. +# INDENT WITH TWO SPACES. NOT TABS. SPACES. +# SCREW THIS UP AND IT WON'T WORK. +# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries. +# Please surround your changes in double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog. +changes: + - rscadd: "Added new shutters ported from World." + - tweak: "Replaced lightswitch, request console, newscaster sprite with one from Virgo." \ No newline at end of file diff --git a/icons/obj/doors/rapid_pdoor.dmi b/icons/obj/doors/rapid_pdoor.dmi index 66027d65fd..01ab429f32 100644 Binary files a/icons/obj/doors/rapid_pdoor.dmi and b/icons/obj/doors/rapid_pdoor.dmi differ diff --git a/icons/obj/power.dmi b/icons/obj/power.dmi index c806ec99be..e982df9b9f 100644 Binary files a/icons/obj/power.dmi and b/icons/obj/power.dmi differ diff --git a/icons/obj/terminals.dmi b/icons/obj/terminals.dmi index 659b22ff7a..a375136543 100644 Binary files a/icons/obj/terminals.dmi and b/icons/obj/terminals.dmi differ