cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-07-19 19:13:30 +01:00
Code Issues Packages Projects Releases Wiki Activity

Plasmafire hotfix (#21440)

Browse Source 
* I am in severe pain

* airlock changes

* whoops walls were too low

* blocking heat spread

* removes tweaks
This commit is contained in:
DGamerL
2023-06-23 22:00:36 +02:00
committed by GitHub
parent 81c107d1f8
commit b759ced58b
8 changed files with 22 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/structures/door_assembly.dm
+10 -8
View File
@@ -19,7 +19,7 @@
var/glass = FALSE // FALSE = glass can be installed. TRUE = glass is already installed.
var/polarized_glass = FALSE
var/created_name
var/heat_proof_finished = FALSE //whether to heat-proof the finished airlock
var/reinforced_glass = FALSE // FALSE = rglass can be installed. TRUE = rglass is already installed.
var/noglass = FALSE //airlocks with no glass version, also cannot be modified with sheets
var/material_type = /obj/item/stack/sheet/metal
var/material_amt = 4
@@ -105,7 +105,7 @@
return
if(S.type == /obj/item/stack/sheet/rglass)
to_chat(user, "<span class='notice'>You install reinforced glass windows into the airlock assembly.</span>")
heat_proof_finished = TRUE //reinforced glass makes the airlock heat-proof
reinforced_glass = TRUE
else
to_chat(user, "<span class='notice'>You install regular glass windows into the airlock assembly.</span>")
S.use(1)
@@ -155,12 +155,14 @@
if(glass)
door = new glass_type(loc)
door.polarized_glass = polarized_glass
if(reinforced_glass)
door = new glass_type(loc)
door.polarized_glass = polarized_glass
else
door = new airlock_type(loc)
door.setDir(dir)
door.electronics = electronics
door.unres_sides = electronics.unres_access_from
door.heat_proof = heat_proof_finished
if(electronics.one_access)
door.req_access = null
door.req_one_access = electronics.selected_accesses
@@ -215,9 +217,9 @@
if(!I.use_tool(src, user, 40, volume = I.tool_volume))
return
to_chat(user, "<span class='notice'>You weld the glass panel out.</span>")
if(heat_proof_finished)
if(reinforced_glass)
new /obj/item/stack/sheet/rglass(get_turf(src))
heat_proof_finished = FALSE
reinforced_glass = FALSE
else
new /obj/item/stack/sheet/glass(get_turf(src))
glass = FALSE
@@ -272,11 +274,11 @@
name = "wired "
if(AIRLOCK_ASSEMBLY_NEEDS_SCREWDRIVER)
name = "near finished "
name += "[heat_proof_finished ? "heat-proofed " : ""][glass ? "window " : ""][base_name] assembly"
name += "[reinforced_glass ? "window " : ""][glass ? "window " : ""][base_name] assembly"
/obj/structure/door_assembly/proc/transfer_assembly_vars(obj/structure/door_assembly/source, obj/structure/door_assembly/target, previous = FALSE)
target.glass = source.glass
target.heat_proof_finished = source.heat_proof_finished
target.reinforced_glass = source.reinforced_glass
target.created_name = source.created_name
target.state = source.state
target.anchored = source.anchored
@@ -300,7 +302,7 @@
new to_spawn_type(T, material_amt)
if(glass)
if(disassembled)
if(heat_proof_finished)
if(reinforced_glass)
new /obj/item/stack/sheet/rglass(T)
else
new /obj/item/stack/sheet/glass(T)