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

Updates holder ui when pulsed/cut.

Browse Source
This commit is contained in:
davipatury
2017-02-26 15:23:56 -03:00
parent a3a1775696
commit bf45dd3cad
15 changed files with 59 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/datums/wires/airlock.dm
+4 -1
View File
@@ -113,6 +113,7 @@ var/const/AIRLOCK_WIRE_LIGHT = 2048
if(AIRLOCK_WIRE_LIGHT)
A.lights = mended
A.update_icon()
..()
/datum/wires/airlock/UpdatePulsed(index)
@@ -176,4 +177,6 @@ var/const/AIRLOCK_WIRE_LIGHT = 2048
if(AIRLOCK_WIRE_LIGHT)
A.lights = !A.lights
A.update_icon()
A.update_icon()
..()
code/datums/wires/alarm.dm
+2
View File
@@ -52,6 +52,7 @@ var/const/AALARM_WIRE_AALARM = 16
if(A.alarm_area.atmosalert(2, A))
A.post_alert(2)
A.update_icon()
..()
/datum/wires/alarm/UpdatePulsed(index)
var/obj/machinery/alarm/A = holder
@@ -94,3 +95,4 @@ var/const/AALARM_WIRE_AALARM = 16
if(A.alarm_area.atmosalert(0, A))
A.post_alert(0)
A.update_icon()
..()
code/datums/wires/apc.dm
+2 -2
View File
@@ -53,7 +53,7 @@ var/const/APC_WIRE_AI_CONTROL = 8
A.aidisabled = 0
A.updateDialog()
A.updateDialog()
..()
/datum/wires/apc/UpdateCut(index, mended)
var/obj/machinery/power/apc/A = holder
@@ -77,4 +77,4 @@ var/const/APC_WIRE_AI_CONTROL = 8
else
if(A.aidisabled == 1)
A.aidisabled = 0
A.updateDialog()
..()
code/datums/wires/autolathe.dm
+12 -3
View File
@@ -28,6 +28,7 @@ var/const/AUTOLATHE_DISABLE_WIRE = 4
A.shocked = !mended
if(AUTOLATHE_DISABLE_WIRE)
A.disabled = !mended
..()
/datum/wires/autolathe/UpdatePulsed(index)
if(IsIndexCut(index))
@@ -36,19 +37,27 @@ var/const/AUTOLATHE_DISABLE_WIRE = 4
switch(index)
if(AUTOLATHE_HACK_WIRE)
A.adjust_hacked(!A.hacked)
updateUIs()
spawn(50)
if(A && !IsIndexCut(index))
A.adjust_hacked(0)
Interact(usr)
updateUIs()
if(AUTOLATHE_SHOCK_WIRE)
A.shocked = !A.shocked
updateUIs()
spawn(50)
if(A && !IsIndexCut(index))
A.shocked = 0
Interact(usr)
updateUIs()
if(AUTOLATHE_DISABLE_WIRE)
A.disabled = !A.disabled
updateUIs()
spawn(50)
if(A && !IsIndexCut(index))
A.disabled = 0
Interact(usr)
updateUIs()
/datum/wires/autolathe/proc/updateUIs()
nanomanager.update_uis(src)
if(holder)
nanomanager.update_uis(holder)
code/datums/wires/camera.dm
+2 -2
View File
@@ -46,7 +46,7 @@ var/const/CAMERA_WIRE_NOTHING2 = 32
C.triggerCameraAlarm()
else
C.cancelCameraAlarm()
return
..()
/datum/wires/camera/UpdatePulsed(index)
var/obj/machinery/camera/C = holder
@@ -65,7 +65,7 @@ var/const/CAMERA_WIRE_NOTHING2 = 32
if(CAMERA_WIRE_ALARM)
C.visible_message("[bicon(C)] *beep*", "[bicon(C)] *beep*")
return
..()
/datum/wires/camera/proc/CanDeconstruct()
if(IsIndexCut(CAMERA_WIRE_POWER) && IsIndexCut(CAMERA_WIRE_FOCUS) && IsIndexCut(CAMERA_WIRE_LIGHT) && IsIndexCut(CAMERA_WIRE_NOTHING1) && IsIndexCut(CAMERA_WIRE_NOTHING2))
code/datums/wires/explosive.dm
+2
View File
@@ -10,12 +10,14 @@ var/const/WIRE_EXPLODE = 1
switch(index)
if(WIRE_EXPLODE)
explode()
..()
/datum/wires/explosive/UpdateCut(index, mended)
switch(index)
if(WIRE_EXPLODE)
if(!mended)
explode()
..()
/datum/wires/explosive/gibtonite
holder_type = /obj/item/weapon/twohanded/required/gibtonite
code/datums/wires/mulebot.dm
+1
View File
@@ -31,6 +31,7 @@ var/const/WIRE_BEACON_RX = 256 // beacon ping recv
holder.visible_message("\blue [bicon(holder)] The drive motor whines briefly.")
else
holder.visible_message("\blue [bicon(holder)] You hear a radio crackle.")
..()
// HELPER PROCS
code/datums/wires/nuclearbomb.dm
+14 -7
View File
@@ -25,15 +25,17 @@ var/const/NUCLEARBOMB_WIRE_SAFETY = 4
switch(index)
if(NUCLEARBOMB_WIRE_LIGHT)
N.lighthack = !N.lighthack
updateUIs()
spawn(100)
N.lighthack = !N.lighthack
updateUIs()
if(NUCLEARBOMB_WIRE_TIMING)
if(N.timing)
spawn
message_admins("[key_name_admin(usr)] pulsed a nuclear bomb's detonation wire, causing it to explode (<A HREF='?_src_=holder;adminplayerobservecoodjump=1;X=[holder.x];Y=[holder.y];Z=[holder.z]'>JMP</a>)")
N.explode()
message_admins("[key_name_admin(usr)] pulsed a nuclear bomb's detonation wire, causing it to explode (<A HREF='?_src_=holder;adminplayerobservecoodjump=1;X=[holder.x];Y=[holder.y];Z=[holder.z]'>JMP</a>)")
N.explode()
if(NUCLEARBOMB_WIRE_SAFETY)
N.safety = !N.safety
updateUIs()
spawn(100)
N.safety = !N.safety
if(N.safety == 1)
@@ -45,15 +47,15 @@ var/const/NUCLEARBOMB_WIRE_SAFETY = 4
N.icon_state = "nuclearbomb1"
else
N.visible_message("\blue The [N] emits a quiet whirling noise!")
updateUIs()
/datum/wires/nuclearbomb/UpdateCut(var/index, var/mended)
/datum/wires/nuclearbomb/UpdateCut(index, mended)
var/obj/machinery/nuclearbomb/N = holder
switch(index)
if(NUCLEARBOMB_WIRE_SAFETY)
if(N.timing)
spawn
message_admins("[key_name_admin(usr)] cut a nuclear bomb's timing wire, causing it to explode (<A HREF='?_src_=holder;adminplayerobservecoodjump=1;X=[holder.x];Y=[holder.y];Z=[holder.z]'>JMP</a>)")
N.explode()
message_admins("[key_name_admin(usr)] cut a nuclear bomb's timing wire, causing it to explode (<A HREF='?_src_=holder;adminplayerobservecoodjump=1;X=[holder.x];Y=[holder.y];Z=[holder.z]'>JMP</a>)")
N.explode()
if(NUCLEARBOMB_WIRE_TIMING)
if(!N.lighthack)
if(N.icon_state == "nuclearbomb2")
@@ -62,3 +64,8 @@ var/const/NUCLEARBOMB_WIRE_SAFETY = 4
bomb_set = 0
if(NUCLEARBOMB_WIRE_LIGHT)
N.lighthack = !N.lighthack
/datum/wires/nuclearbomb/proc/updateUIs()
nanomanager.update_uis(src)
if(holder)
nanomanager.update_uis(holder)
code/datums/wires/particle_accelerator.dm
+3 -1
View File
@@ -29,6 +29,7 @@ var/const/PARTICLE_LIMIT_POWER_WIRE = 8 // Determines how strong the PA can be.
if(PARTICLE_LIMIT_POWER_WIRE)
C.visible_message("[bicon(C)]<b>[C]</b> makes a large whirring noise.")
..()
/datum/wires/particle_acc/control_box/UpdateCut(index, mended)
var/obj/machinery/particle_accelerator/control_box/C = holder
@@ -49,4 +50,5 @@ var/const/PARTICLE_LIMIT_POWER_WIRE = 8 // Determines how strong the PA can be.
if(PARTICLE_LIMIT_POWER_WIRE)
C.strength_upper_limit = (mended ? 2 : 3)
if(C.strength_upper_limit < C.strength)
C.remove_strength()
C.remove_strength()
..()
code/datums/wires/radio.dm
+2
View File
@@ -24,6 +24,7 @@ var/const/WIRE_TRANSMIT = 4
if(WIRE_TRANSMIT)
R.broadcasting = !R.broadcasting && !IsIndexCut(WIRE_SIGNAL)
..()
/datum/wires/radio/UpdateCut(index, mended)
var/obj/item/device/radio/R = holder
@@ -37,3 +38,4 @@ var/const/WIRE_TRANSMIT = 4
if(WIRE_TRANSMIT)
R.broadcasting = mended && !IsIndexCut(WIRE_SIGNAL)
..()
code/datums/wires/robot.dm
+2
View File
@@ -56,6 +56,7 @@ var/const/BORG_WIRE_LAWCHECK = 16 // Not used on MoMMIs
if(BORG_WIRE_LOCKED_DOWN)
R.SetLockdown(!mended)
..()
/datum/wires/robot/UpdatePulsed(index)
@@ -75,6 +76,7 @@ var/const/BORG_WIRE_LAWCHECK = 16 // Not used on MoMMIs
if(BORG_WIRE_LOCKED_DOWN)
R.SetLockdown(!R.lockcharge) // Toggle
..()
/datum/wires/robot/CanUse(mob/living/L)
var/mob/living/silicon/robot/R = holder
code/datums/wires/smartfridge.dm
+2
View File
@@ -36,6 +36,7 @@ var/const/SMARTFRIDGE_WIRE_IDSCAN = 4
S.seconds_electrified = 30
if(SMARTFRIDGE_WIRE_IDSCAN)
S.scan_id = !S.scan_id
..()
/datum/wires/smartfridge/UpdateCut(index, mended)
var/obj/machinery/smartfridge/S = holder
@@ -49,3 +50,4 @@ var/const/SMARTFRIDGE_WIRE_IDSCAN = 4
S.seconds_electrified = -1
if(SMARTFRIDGE_WIRE_IDSCAN)
S.scan_id = 1
..()
code/datums/wires/syndicatebomb.dm
+4 -2
View File
@@ -47,6 +47,7 @@ var/const/WIRE_ACTIVATE = 16 // Will start a bombs timer if pulsed, will hint if
else
P.loc.visible_message("<span class='notice'>[bicon(holder)] The bomb seems to hesitate for a moment.</span>")
P.timer += 5
..()
/datum/wires/syndicatebomb/UpdateCut(index, mended)
var/obj/machinery/syndicatebomb/P = holder
@@ -58,7 +59,7 @@ var/const/WIRE_ACTIVATE = 16 // Will start a bombs timer if pulsed, will hint if
P.timer = 0
else
P.defused = 1
if(mended)
else
P.defused = 0 //cutting and mending all the wires of an inactive bomb will thus cure any sabotage
if(WIRE_UNBOLT)
if(!mended && P.anchored)
@@ -74,4 +75,5 @@ var/const/WIRE_ACTIVATE = 16 // Will start a bombs timer if pulsed, will hint if
P.loc.visible_message("<span class='notice'>[bicon(holder)] The timer stops! The bomb has been defused!</span>")
P.icon_state = "[initial(P.icon_state)]-inactive[P.open_panel ? "-wires" : ""]"
P.active = 0
P.defused = 1
P.defused = 1
..()
code/datums/wires/vending.dm
+3 -1
View File
@@ -38,6 +38,7 @@ var/const/VENDING_WIRE_IDSCAN = 8
V.seconds_electrified = 30
if(VENDING_WIRE_IDSCAN)
V.scan_id = !V.scan_id
..()
/datum/wires/vending/UpdateCut(index, mended)
var/obj/machinery/vending/V = holder
@@ -52,4 +53,5 @@ var/const/VENDING_WIRE_IDSCAN = 8
else
V.seconds_electrified = -1
if(VENDING_WIRE_IDSCAN)
V.scan_id = 1
V.scan_id = 1
..()
code/datums/wires/wires.dm
+4 -2
View File
@@ -145,11 +145,13 @@ var/list/wireColours = list("red", "blue", "green", "black", "orange", "brown",
// Called when wires cut/mended.
/datum/wires/proc/UpdateCut(index, mended)
return
if(holder)
nanomanager.update_uis(holder)
// Called when wire pulsed. Add code here.
/datum/wires/proc/UpdatePulsed(index)
return
if(holder)
nanomanager.update_uis(holder)
/datum/wires/proc/CanUse(mob/living/L)
return 1