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
+12 -12
View File
@@ -55,7 +55,7 @@ GLOBAL_LIST_EMPTY(allCasters)
return ..()
/obj/machinery/newscaster/update_icon_state()
if(stat & (NOPOWER|BROKEN))
if(machine_stat & (NOPOWER|BROKEN))
icon_state = "newscaster_off"
else
if(GLOB.news_network.wanted_issue.active)
@@ -66,7 +66,7 @@ GLOBAL_LIST_EMPTY(allCasters)
/obj/machinery/newscaster/update_overlays()
. = ..()
if(!(stat & (NOPOWER|BROKEN)) && !GLOB.news_network.wanted_issue.active && alert)
if(!(machine_stat & (NOPOWER|BROKEN)) && !GLOB.news_network.wanted_issue.active && alert)
. += "newscaster_alert"
var/hp_percent = obj_integrity * 100 /max_integrity
@@ -81,14 +81,14 @@ GLOBAL_LIST_EMPTY(allCasters)
. += "crack3"
/obj/machinery/newscaster/power_change()
if(stat & BROKEN)
if(machine_stat & BROKEN)
return
if(powered())
stat &= ~NOPOWER
machine_stat &= ~NOPOWER
update_icon()
else
spawn(rand(0, 15))
stat |= NOPOWER
machine_stat |= NOPOWER
update_icon()
/obj/machinery/newscaster/take_damage(damage_amount, damage_type = BRUTE, damage_flag = 0, sound_effect = 1, attack_dir)
@@ -557,7 +557,7 @@ GLOBAL_LIST_EMPTY(allCasters)
I.play_tool_sound(src)
if(I.use_tool(src, user, 60))
playsound(loc, 'sound/items/deconstruct.ogg', 50, 1)
if(stat & BROKEN)
if(machine_stat & BROKEN)
to_chat(user, "<span class='warning'>The broken remains of [src] fall on the ground.</span>")
new /obj/item/stack/sheet/metal(loc, 5)
new /obj/item/shard(loc)
@@ -567,18 +567,18 @@ GLOBAL_LIST_EMPTY(allCasters)
new /obj/item/wallframe/newscaster(loc)
qdel(src)
else if(I.tool_behaviour == TOOL_WELDER && user.a_intent != INTENT_HARM)
if(stat & BROKEN)
if(machine_stat & BROKEN)
if(!I.tool_start_check(user, amount=0))
return
user.visible_message("[user] is repairing [src].", \
"<span class='notice'>You begin repairing [src]...</span>", \
"<span class='italics'>You hear welding.</span>")
if(I.use_tool(src, user, 40, volume=50))
if(!(stat & BROKEN))
if(!(machine_stat & BROKEN))
return
to_chat(user, "<span class='notice'>You repair [src].</span>")
obj_integrity = max_integrity
stat &= ~BROKEN
machine_stat &= ~BROKEN
update_icon()
else
to_chat(user, "<span class='notice'>[src] does not need repairs.</span>")
@@ -588,7 +588,7 @@ GLOBAL_LIST_EMPTY(allCasters)
/obj/machinery/newscaster/play_attack_sound(damage, damage_type = BRUTE, damage_flag = 0)
switch(damage_type)
if(BRUTE)
if(stat & BROKEN)
if(machine_stat & BROKEN)
playsound(loc, 'sound/effects/hit_on_shattered_glass.ogg', 100, 1)
else
playsound(loc, 'sound/effects/glasshit.ogg', 90, 1)
@@ -604,8 +604,8 @@ GLOBAL_LIST_EMPTY(allCasters)
qdel(src)
/obj/machinery/newscaster/obj_break()
if(!(stat & BROKEN) && !(flags_1 & NODECONSTRUCT_1))
stat |= BROKEN
if(!(machine_stat & BROKEN) && !(flags_1 & NODECONSTRUCT_1))
machine_stat |= BROKEN
playsound(loc, 'sound/effects/glassbr3.ogg', 100, 1)
update_icon()