shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

yes.

Browse Source
This commit is contained in:
Seris02
2020-01-20 13:00:24 +08:00
parent 8da447c678
commit 5524b0fa03
5 changed files with 15 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/datums/action.dm
+2 -2
View File
@@ -559,7 +559,7 @@
return
var/area/area = areas[removeAPC]
var/obj/machinery/power/apc/apc = area.get_apc()
if (!apc)
if (!apc || !(apc in owner.siliconaccessareas))
return
apc.hijacker = null
apc.update_icon()
@@ -581,7 +581,7 @@
return
var/area/area = areas[accessAPC]
var/obj/machinery/power/apc/apc = area.get_apc()
if (!apc)
if (!apc || !(apc in owner.siliconaccessareas))
return
apc.ui_interact(owner)
code/game/machinery/_machinery.dm
+1 -1
View File
@@ -224,7 +224,7 @@ Class Procs:
return !(stat & (NOPOWER|BROKEN|MAINT))
/obj/machinery/can_interact(mob/user)
var/silicon = issiliconoradminghost(user) || hasSiliconAccessInArea(user,get_area(src))
var/silicon = hasSiliconAccessInArea(user,get_area(src)) || IsAdminGhost(user)
if((stat & (NOPOWER|BROKEN)) && !(interaction_flags_machine & INTERACT_MACHINE_OFFLINE))
return FALSE
if(panel_open && !(interaction_flags_machine & INTERACT_MACHINE_OPEN))
code/game/objects/items/implants/implant_hijack.dm
+10 -7
View File
@@ -8,8 +8,8 @@
var/toggled = FALSE
icon_state = "hijack"
var/eye_color
var/stealthmode = FALSE
var/stealthcooldown = 0
//var/stealthmode = FALSE
//var/stealthcooldown = 0
/obj/item/implant/hijack/activate()
. = ..()
@@ -18,13 +18,13 @@
imp_in.click_intercept = src
imp_in.siliconaccesstoggle = TRUE
to_chat(imp_in,"<span class='notice'>You turn on [src]'s silicon interactions.</span>")
if (ishuman(imp_in) && !stealthmode)
if (ishuman(imp_in)/* && !stealthmode*/)
toggle_eyes(TRUE)
else
imp_in.click_intercept = null
imp_in.siliconaccesstoggle = FALSE
to_chat(imp_in,"<span class='notice'>You turn off [src]'s silicon interactions.</span>")
if (ishuman(imp_in) && !stealthmode)
if (ishuman(imp_in)/* && !stealthmode*/)
toggle_eyes(FALSE)
/obj/item/implant/hijack/proc/toggle_eyes(on)
@@ -58,8 +58,8 @@
/obj/item/implant/hijack/proc/InterceptClickOn(mob/living/user,params,atom/object)
if (user.get_active_held_item() || isitem(object) || !toggled || user.incapacitated())
return
if (stealthmode == FALSE && istype(object,/obj/machinery/power/apc))
hijack_remotely()
//if (stealthmode == FALSE && istype(object,/obj/machinery/power/apc))
// hijack_remotely()
var/area/a = get_area(object)
if (!hasSiliconAccessInArea(imp_in,a))
return
@@ -80,6 +80,7 @@
object.attack_ai(imp_in)
return TRUE
/* for later
/obj/item/implant/hijack/proc/hijack_remotely(/obj/machinery/power/apc/apc)
if (apc.hijacker)
return //can't remotely hijack an already hijacked APC
@@ -89,4 +90,6 @@
apc.update_icon()
cooldown = world.time + 2 MINUTES
toggle_eyes(TRUE)
stealthmode = FALSE
stealthmode = FALSE
*/
code/modules/power/apc.dm
+1 -1
View File
@@ -970,7 +970,7 @@
. = ..()
if (!QDELETED(remote_control) && user == remote_control.operator)
. = UI_INTERACTIVE
if (hasSiliconAccessInArea(user,area))
if (user == hijacker && hasSiliconAccessInArea(user,area))
. = UI_INTERACTIVE
/obj/machinery/power/apc/ui_act(action, params)
code/modules/power/lighting.dm
+1 -1
View File
@@ -333,7 +333,7 @@
else if (hijacked)
BR = BR * 1.5
PO = PO * 1.5
CO = color ? color : LIGHT_COLOR_YELLOW
CO = color || LIGHT_COLOR_YELLOW
else if (nightshift_enabled)
BR = nightshift_brightness
PO = nightshift_light_power