cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-28 14:37:04 +01:00
Code Issues Packages Projects Releases Wiki Activity

p_open -> panel_open

Browse Source
This commit is contained in:
uraniummeltdown
2018-01-23 18:10:57 +05:00
parent 7b4390a828
commit 134ad47f80
8 changed files with 35 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/datums/wires/airlock.dm
+1 -1
View File
@@ -58,7 +58,7 @@ var/const/AIRLOCK_WIRE_LIGHT = 512
if(A.isElectrified())
if(A.shock(L, 100))
return 0
if(A.p_open)
if(A.panel_open)
return 1
return 0
code/game/machinery/doors/airlock.dm
+11 -11
View File
@@ -310,7 +310,7 @@ About the new airlock wires panel:
filling_overlay = get_airlock_overlay("[airlock_material]_closed", overlays_file)
else
filling_overlay = get_airlock_overlay("fill_closed", icon)
if(p_open)
if(panel_open)
panel_overlay = get_airlock_overlay("panel_closed", overlays_file)
if(welded)
weld_overlay = get_airlock_overlay("welded", overlays_file)
@@ -330,7 +330,7 @@ About the new airlock wires panel:
filling_overlay = get_airlock_overlay("[airlock_material]_closed", overlays_file)
else
filling_overlay = get_airlock_overlay("fill_closed", icon)
if(p_open)
if(panel_open)
panel_overlay = get_airlock_overlay("panel_closed", overlays_file)
if(welded)
weld_overlay = get_airlock_overlay("welded", overlays_file)
@@ -345,7 +345,7 @@ About the new airlock wires panel:
filling_overlay = get_airlock_overlay("[airlock_material]_closed", overlays_file)
else
filling_overlay = get_airlock_overlay("fill_closed", icon)
if(p_open)
if(panel_open)
panel_overlay = get_airlock_overlay("panel_closed", overlays_file)
if(welded)
weld_overlay = get_airlock_overlay("welded", overlays_file)
@@ -360,7 +360,7 @@ About the new airlock wires panel:
filling_overlay = get_airlock_overlay("fill_closing", icon)
if(lights && arePowerSystemsOn())
lights_overlay = get_airlock_overlay("lights_closing", overlays_file)
if(p_open)
if(panel_open)
panel_overlay = get_airlock_overlay("panel_closing", overlays_file)
if(note)
note_overlay = get_airlock_overlay("[notetype]_closing", note_overlay_file)
@@ -371,7 +371,7 @@ About the new airlock wires panel:
filling_overlay = get_airlock_overlay("[airlock_material]_open", overlays_file)
else
filling_overlay = get_airlock_overlay("fill_open", icon)
if(p_open)
if(panel_open)
panel_overlay = get_airlock_overlay("panel_open", overlays_file)
if(note)
note_overlay = get_airlock_overlay("[notetype]_open", note_overlay_file)
@@ -384,7 +384,7 @@ About the new airlock wires panel:
filling_overlay = get_airlock_overlay("fill_opening", icon)
if(lights && arePowerSystemsOn())
lights_overlay = get_airlock_overlay("lights_opening", overlays_file)
if(p_open)
if(panel_open)
panel_overlay = get_airlock_overlay("panel_opening", overlays_file)
if(note)
note_overlay = get_airlock_overlay("[notetype]_opening", note_overlay_file)
@@ -451,7 +451,7 @@ About the new airlock wires panel:
note.examine(user)
/obj/machinery/door/airlock/attack_ghost(mob/user)
if(p_open)
if(panel_open)
wires.Interact(user)
ui_interact(user)
@@ -563,7 +563,7 @@ About the new airlock wires panel:
visible_message("<span class='warning'>[user] headbutts the airlock. Good thing they're wearing a helmet.</span>")
return
if(p_open)
if(panel_open)
wires.Interact(user)
else
..(user)
@@ -708,8 +708,8 @@ About the new airlock wires panel:
else
return
else if(isscrewdriver(C))
p_open = !p_open
to_chat(user, "<span class='notice'>You [p_open ? "open":"close"] the maintenance panel of the airlock.</span>")
panel_open = !panel_open
to_chat(user, "<span class='notice'>You [panel_open ? "open":"close"] the maintenance panel of the airlock.</span>")
playsound(loc, C.usesound, 50, 1)
update_icon()
else if(iswirecutter(C))
@@ -745,7 +745,7 @@ About the new airlock wires panel:
beingcrowbarred = 1 //derp, Agouri
else
beingcrowbarred = 0
if(beingcrowbarred && p_open && (emagged || (density && welded && (!operating || emagged) && !arePowerSystemsOn() && !locked)))
if(beingcrowbarred && panel_open && (emagged || (density && welded && !operating && !arePowerSystemsOn() && !locked)))
playsound(loc, C.usesound, 100, 1)
user.visible_message("[user] removes the electronics from the airlock assembly.", "You start to remove electronics from the airlock assembly.")
if(do_after(user, 40 * C.toolspeed, target = src))
code/game/machinery/doors/door.dm
+3 -4
View File
@@ -11,7 +11,6 @@
var/open_layer = OPEN_DOOR_LAYER
var/closed_layer = CLOSED_DOOR_LAYER
var/visible = 1
var/p_open = 0
var/operating = 0
var/autoclose = 0
var/autoclose_timer
@@ -69,7 +68,7 @@
return ..()
/obj/machinery/door/Bumped(atom/AM)
if(p_open || operating || emagged)
if(panel_open || operating || emagged)
return
if(isliving(AM))
var/mob/living/M = AM
@@ -215,12 +214,12 @@
/obj/machinery/door/proc/do_animate(animation)
switch(animation)
if("opening")
if(p_open)
if(panel_open)
flick("o_doorc0", src)
else
flick("doorc0", src)
if("closing")
if(p_open)
if(panel_open)
flick("o_doorc1", src)
else
flick("doorc1", src)
code/game/machinery/doors/firedoor.dm
+1 -1
View File
@@ -27,7 +27,7 @@
var/active_alarm = FALSE
/obj/machinery/door/firedoor/Bumped(atom/AM)
if(p_open || operating)
if(panel_open || operating)
return
if(!density)
return ..()
code/game/machinery/doors/windowdoor.dm
+4 -4
View File
@@ -262,17 +262,17 @@
to_chat(user, "<span class='warning'>You need to open the door to access the maintenance panel.</span>")
return
playsound(loc, I.usesound, 50, 1)
p_open = !p_open
to_chat(user, "<span class='notice'>You [p_open ? "open":"close"] the maintenance panel of the [name].</span>")
panel_open = !panel_open
to_chat(user, "<span class='notice'>You [panel_open ? "open":"close"] the maintenance panel of the [name].</span>")
return
if(iscrowbar(I))
if(p_open && !density && !operating)
if(panel_open && !density && !operating)
playsound(loc, I.usesound, 100, 1)
user.visible_message("<span class='warning'>[user] removes the electronics from the [name].</span>", \
"You start to remove electronics from the [name].")
if(do_after(user, 40 * I.toolspeed, target = src))
if(p_open && !density && !operating && loc)
if(panel_open && !density && !operating && loc)
var/obj/structure/windoor_assembly/WA = new /obj/structure/windoor_assembly(loc)
switch(base_state)
if("left")
code/modules/mob/living/carbon/human/interactive/interactive.dm
+2 -2
View File
@@ -618,7 +618,7 @@
if(istype(D,/obj/machinery/door/airlock))
var/obj/machinery/door/airlock/AL = D
if(!AL.CanAStarPass(RPID)) // only crack open doors we can't get through
AL.p_open = 1
AL.panel_open = 1
AL.update_icon()
AL.shock(src, mistake_chance)
sleep(5)
@@ -638,7 +638,7 @@
if(prob(mistake_chance) && !AL.wires.IsIndexCut(AIRLOCK_WIRE_ELECTRIFY))
AL.wires.CutWireIndex(AIRLOCK_WIRE_ELECTRIFY)
sleep(5)
AL.p_open = 0
AL.panel_open = 0
AL.update_icon()
D.open()