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

Merge remote-tracking branch 'Paradise/master' into nanoui-is-dead

Browse Source
This commit is contained in:
AffectedArc07
2020-11-29 09:46:30 +00:00
parent c12a3654fd 28cea0e1d0
commit ee13f13a2a
14 changed files with 242 additions and 101 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/structures/displaycase.dm
+2 -2
View File
@@ -201,9 +201,9 @@
electronics.forceMove(display)
display.electronics = electronics
if(electronics.one_access)
display.req_one_access = electronics.conf_access
display.req_one_access = electronics.selected_accesses
else
display.req_access = electronics.conf_access
display.req_access = electronics.selected_accesses
qdel(src)
else
return ..()
code/game/objects/structures/door_assembly.dm
+3 -3
View File
@@ -175,13 +175,13 @@
door = new airlock_type(loc)
door.setDir(dir)
door.electronics = electronics
door.unres_sides = electronics.unres_sides
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.conf_access
door.req_one_access = electronics.selected_accesses
else
door.req_access = electronics.conf_access
door.req_access = electronics.selected_accesses
if(created_name)
door.name = created_name
else
code/game/objects/structures/windoor_assembly.dm
+2 -2
View File
@@ -203,9 +203,9 @@
windoor.density = FALSE
if(electronics.one_access)
windoor.req_one_access = electronics.conf_access
windoor.req_one_access = electronics.selected_accesses
else
windoor.req_access = electronics.conf_access
windoor.req_access = electronics.selected_accesses
windoor.electronics = src.electronics
electronics.forceMove(windoor)
electronics = null