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

push

Browse Source
This commit is contained in:
SandPoot
2024-08-24 21:28:55 -03:00
parent 9604090014
commit c07e94be66
218 changed files with 1001 additions and 979 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/machinery/computer/_computer.dm
+10 -10
View File
@@ -20,7 +20,7 @@
power_change()
/obj/machinery/computer/process()
if(stat & (NOPOWER|BROKEN))
if(machine_stat & (NOPOWER|BROKEN))
return FALSE
return TRUE
@@ -44,16 +44,16 @@
. = ..()
SSvis_overlays.remove_vis_overlay(src, managed_vis_overlays)
if(icon_keyboard)
if(stat & NOPOWER)
if(machine_stat & NOPOWER)
. += "[icon_keyboard]_off"
else
. += icon_keyboard
if(stat & BROKEN)
if(machine_stat & BROKEN)
. += mutable_appearance(icon, "[icon_state]_broken")
return // If we don't do this broken computers glow in the dark.
if(stat & NOPOWER) // Your screen can't be on if you've got no damn charge
if(machine_stat & NOPOWER) // Your screen can't be on if you've got no damn charge
return
// This lets screens ignore lighting and be visible even in the darkest room
@@ -63,7 +63,7 @@
/obj/machinery/computer/power_change()
..()
if(stat & NOPOWER)
if(machine_stat & NOPOWER)
set_light(0)
else
set_light(brightness_on)
@@ -83,7 +83,7 @@
/obj/machinery/computer/play_attack_sound(damage_amount, damage_type = BRUTE, damage_flag = 0)
switch(damage_type)
if(BRUTE)
if(stat & BROKEN)
if(machine_stat & BROKEN)
playsound(src.loc, 'sound/effects/hit_on_shattered_glass.ogg', 70, TRUE)
else
playsound(src.loc, 'sound/effects/glasshit.ogg', 75, TRUE)
@@ -94,8 +94,8 @@
if(!circuit) //no circuit, no breaking
return
. = ..()
if(. && !(stat & BROKEN))
stat |= BROKEN
if(. && !(machine_stat & BROKEN))
machine_stat |= BROKEN
playsound(loc, 'sound/effects/glassbr3.ogg', 100, TRUE)
set_light(0)
update_icon()
@@ -124,7 +124,7 @@
circuit = null
component_parts -= circuit
A.set_anchored(TRUE)
if(stat & BROKEN)
if(machine_stat & BROKEN)
if(user)
to_chat(user, "<span class='notice'>The broken glass falls out.</span>")
else
@@ -144,5 +144,5 @@
/obj/machinery/computer/AltClick(mob/user)
. = ..()
if(!user.canUseTopic(src, !issilicon(user)) || !(stat & (NOPOWER|BROKEN)))
if(!user.canUseTopic(src, !issilicon(user)) || !(machine_stat & (NOPOWER|BROKEN)))
return
code/game/machinery/computer/aifixer.dm
+3 -3
View File
@@ -12,7 +12,7 @@
/obj/machinery/computer/aifixer/attackby(obj/item/I, mob/user, params)
if(occupier && I.tool_behaviour == TOOL_SCREWDRIVER)
if(stat & (NOPOWER|BROKEN))
if(machine_stat & (NOPOWER|BROKEN))
to_chat(user, "<span class='warning'>The screws on [name]'s screen won't budge.</span>")
else
to_chat(user, "<span class='warning'>The screws on [name]'s screen won't budge and it emits a warning beep.</span>")
@@ -83,7 +83,7 @@
/obj/machinery/computer/aifixer/update_overlays()
. = ..()
if(stat & (NOPOWER|BROKEN))
if(machine_stat & (NOPOWER|BROKEN))
return
if(active)
. += "ai-fixer-on"
@@ -101,7 +101,7 @@
return
//Downloading AI from card to terminal.
if(interaction == AI_TRANS_FROM_CARD)
if(stat & (NOPOWER|BROKEN))
if(machine_stat & (NOPOWER|BROKEN))
to_chat(user, "[src] is offline and cannot take an AI at this time!")
return
AI.forceMove(src)
code/game/machinery/computer/apc_control.dm
+3 -3
View File
@@ -18,7 +18,7 @@
logs = list()
/obj/machinery/computer/apc_control/process()
if(operator && (!operator.Adjacent(src) || stat))
if(operator && (!operator.Adjacent(src) || machine_stat))
operator = null
if(active_apc)
if(!active_apc.locked)
@@ -37,7 +37,7 @@
..()
/obj/machinery/computer/apc_control/proc/check_apc(obj/machinery/power/apc/APC)
return APC.z == z && !APC.malfhack && !APC.aidisabled && !(APC.obj_flags & EMAGGED) && !APC.stat && !istype(APC.area, /area/ai_monitored) && !APC.area.outdoors
return APC.z == z && !APC.malfhack && !APC.aidisabled && !(APC.obj_flags & EMAGGED) && !APC.machine_stat && !istype(APC.area, /area/ai_monitored) && !APC.area.outdoors
/obj/machinery/computer/apc_control/ui_interact(mob/user, datum/tgui/ui)
operator = user
@@ -201,6 +201,6 @@
/mob/proc/using_power_flow_console()
for(var/obj/machinery/computer/apc_control/A in range(1, src))
if(A.operator && A.operator == src && !A.stat)
if(A.operator && A.operator == src && !A.machine_stat)
return TRUE
return
code/game/machinery/computer/arcade.dm
+1 -1
View File
@@ -123,7 +123,7 @@ GLOBAL_LIST_INIT(arcade_prize_pool, list(
if(prize_override)
override = TRUE
if(stat & (NOPOWER|BROKEN) || . & EMP_PROTECT_SELF)
if(machine_stat & (NOPOWER|BROKEN) || . & EMP_PROTECT_SELF)
return
var/empprize = null
code/game/machinery/computer/atmos_alert.dm
+1 -1
View File
@@ -81,7 +81,7 @@
. = ..()
SSvis_overlays.remove_vis_overlay(src, managed_vis_overlays)
var/overlay_state = icon_screen
if(stat & (NOPOWER|BROKEN))
if(machine_stat & (NOPOWER|BROKEN))
. |= "[icon_keyboard]_off"
return
. |= icon_keyboard
code/game/machinery/computer/camera.dm
+1 -1
View File
@@ -261,7 +261,7 @@
/obj/machinery/computer/security/telescreen/update_icon_state()
icon_state = initial(icon_state)
if(stat & BROKEN)
if(machine_stat & BROKEN)
icon_state += "b"
/obj/machinery/computer/security/telescreen/entertainment
code/game/machinery/computer/camera_advanced.dm
+2 -1
View File
@@ -83,7 +83,7 @@
playsound(src, 'sound/machines/terminal_off.ogg', 25, FALSE)
/obj/machinery/computer/camera_advanced/check_eye(mob/user)
if( (stat & (NOPOWER|BROKEN)) || (!Adjacent(user) && hasSiliconAccessInArea(user)) || user.eye_blind || user.incapacitated() )
if( (machine_stat & (NOPOWER|BROKEN)) || (!Adjacent(user) && hasSiliconAccessInArea(user)) || user.eye_blind || user.incapacitated() )
user.unset_machine()
/obj/machinery/computer/camera_advanced/Destroy()
@@ -91,6 +91,7 @@
current_user.unset_machine()
QDEL_NULL(eyeobj)
QDEL_LIST(actions)
current_user = null
return ..()
/obj/machinery/computer/camera_advanced/on_unset_machine(mob/M)
code/game/machinery/computer/launchpad_control.dm
+2 -2
View File
@@ -67,7 +67,7 @@
var/list/this_pad = list()
this_pad["name"] = pad.display_name
this_pad["id"] = i
if(pad.stat & NOPOWER)
if(pad.machine_stat & NOPOWER)
this_pad["inactive"] = TRUE
pad_list += list(this_pad)
else
@@ -81,7 +81,7 @@
data["pad_name"] = current_pad.display_name
data["range"] = current_pad.range
data["selected_pad"] = current_pad
if(QDELETED(current_pad) || (current_pad.stat & NOPOWER))
if(QDELETED(current_pad) || (current_pad.machine_stat & NOPOWER))
data["pad_active"] = FALSE
return data
data["pad_active"] = TRUE
code/game/machinery/computer/law.dm
+1 -1
View File
@@ -7,7 +7,7 @@
/obj/machinery/computer/upload/attackby(obj/item/O, mob/user, params)
if(istype(O, /obj/item/ai_module))
var/obj/item/ai_module/M = O
if(src.stat & (NOPOWER|BROKEN|MAINT))
if(src.machine_stat & (NOPOWER|BROKEN|MAINT))
return
if(!current)
to_chat(user, "<span class='caution'>You haven't selected anything to transmit laws to!</span>")
code/game/machinery/computer/medical.dm
+1 -1
View File
@@ -539,7 +539,7 @@
/obj/machinery/computer/med_data/emp_act(severity)
. = ..()
if(!(stat & (BROKEN|NOPOWER)) && !(. & EMP_PROTECT_SELF))
if(!(machine_stat & (BROKEN|NOPOWER)) && !(. & EMP_PROTECT_SELF))
for(var/datum/data/record/R in GLOB.data_core.medical)
if(prob(severity/10))
switch(rand(1,6))
code/game/machinery/computer/pod.dm
+1 -1
View File
@@ -35,7 +35,7 @@
*/
/obj/machinery/computer/pod/proc/alarm()
set waitfor = FALSE
if(stat & (NOPOWER|BROKEN))
if(machine_stat & (NOPOWER|BROKEN))
return
if(!connected)
code/game/machinery/computer/security.dm
+1 -1
View File
@@ -767,7 +767,7 @@ What a mess.*/
/obj/machinery/computer/secure_data/emp_act(severity)
. = ..()
if(stat & (BROKEN|NOPOWER) || . & EMP_PROTECT_SELF)
if(machine_stat & (BROKEN|NOPOWER) || . & EMP_PROTECT_SELF)
return
for(var/datum/data/record/R in GLOB.data_core.security)
code/game/machinery/computer/station_alert.dm
+1 -1
View File
@@ -29,7 +29,7 @@
. = ..()
SSvis_overlays.remove_vis_overlay(src, managed_vis_overlays)
var/overlay_state = icon_screen
if(stat & (NOPOWER|BROKEN))
if(machine_stat & (NOPOWER|BROKEN))
. |= "[icon_keyboard]_off"
return
. |= icon_keyboard
code/game/machinery/computer/teleporter.dm
+3 -3
View File
@@ -177,12 +177,12 @@
log_game("[key_name(user)] has set the teleporter target to [target_station] at [AREACOORD(T)]")
target = target_station.teleporter_hub
target_station.linked_stations |= power_station
target_station.stat &= ~NOPOWER
target_station.machine_stat &= ~NOPOWER
if(target_station.teleporter_hub)
target_station.teleporter_hub.stat &= ~NOPOWER
target_station.teleporter_hub.machine_stat &= ~NOPOWER
target_station.teleporter_hub.update_icon()
if(target_station.teleporter_console)
target_station.teleporter_console.stat &= ~NOPOWER
target_station.teleporter_console.machine_stat &= ~NOPOWER
target_station.teleporter_console.update_icon()
/obj/machinery/computer/teleporter/proc/untarget_implant() //untargets from mob the racker was once implanted in to prevent issues.