diff --git a/code/game/objects/items/robot/robot_items.dm b/code/game/objects/items/robot/robot_items.dm index 038d6390889..a4fcc1db00b 100644 --- a/code/game/objects/items/robot/robot_items.dm +++ b/code/game/objects/items/robot/robot_items.dm @@ -173,32 +173,32 @@ /obj/item/device/harmalarm/emag_act(mob/user) emagged = !emagged if(emagged) - to_chat(user, "You short out the safeties on the [src]!") + to_chat(user, "You short out the safeties on the [src]!") else - to_chat(user, "You reset the safeties on the [src]!") + to_chat(user, "You reset the safeties on the [src]!") /obj/item/device/harmalarm/attack_self(mob/user) var/safety = !emagged if(cooldown > world.time) - to_chat(user, "The device is still recharging!") + to_chat(user, "The device is still recharging!") return if(isrobot(user)) var/mob/living/silicon/robot/R = user if(R.cell.charge < 1200) - to_chat(user, "You don't have enough charge to do this!") + to_chat(user, "You don't have enough charge to do this!") return R.cell.charge -= 1000 if(R.emagged) safety = FALSE if(safety) - user.visible_message("[user] blares out a near-deafening siren from its speakers!") + user.visible_message("[user] blares out a near-deafening siren from its speakers!") for(var/mob/living/carbon/M in get_mobs_in_view(9, user)) if(!M.check_ear_prot()) M.AdjustConfused(6) to_chat(M, "The siren pierces your hearing!") - audible_message("HUMAN HARM") + audible_message("HUMAN HARM") playsound(get_turf(src), 'sound/AI/harmalarm.ogg', 70, 3) cooldown = world.time + 200 log_game("[key_name(user)] used a Cyborg Harm Alarm in ([user.x],[user.y],[user.z])") @@ -209,13 +209,13 @@ return - user.audible_message("BZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZT") + user.audible_message("BZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZT") for(var/mob/living/carbon/human/H in get_mobs_in_view(9, user)) if(istype(H.l_ear, /obj/item/clothing/ears/earmuffs) || istype(H.r_ear, /obj/item/clothing/ears/earmuffs) || H.ear_deaf) continue - var/earsafety = 0 + var/earsafety = FALSE if(H.check_ear_prot()) - earsafety = 1 + earsafety = TRUE if(earsafety) H.AdjustConfused(5) diff --git a/code/game/objects/items/weapons/RSF.dm b/code/game/objects/items/weapons/RSF.dm index 2c6b5723768..639bd65dd57 100644 --- a/code/game/objects/items/weapons/RSF.dm +++ b/code/game/objects/items/weapons/RSF.dm @@ -239,10 +239,10 @@ RSF icon = 'icons/obj/tools.dmi' icon_state = "rcd" var/matter = 10 - var/toxin = 0 + var/toxin = FALSE var/cooldown = 0 var/cooldowndelay = 10 - var/emagged = 0 + var/emagged = FALSE w_class = WEIGHT_CLASS_NORMAL /obj/item/weapon/cookiesynth/examine(mob/user) @@ -258,20 +258,20 @@ RSF to_chat(user, "You short out [src]'s reagent safety checker!") else to_chat(user, "You reset [src]'s reagent safety checker!") - toxin = 0 + toxin = FALSE /obj/item/weapon/cookiesynth/attack_self(mob/user) var/mob/living/silicon/robot/P = null if(isrobot(user)) P = user if(emagged && !toxin) - toxin = 1 + toxin = TRUE to_chat(user, "Cookie Synthesizer Hacked.") else if(P.emagged && !toxin) - toxin = 1 + toxin = TRUE to_chat(user, "Cookie Synthesizer Hacked.") else - toxin = 0 + toxin = FALSE to_chat(user, "Cookie Synthesizer Reset.") /obj/item/weapon/cookiesynth/process() diff --git a/code/modules/reagents/chemistry/reagents/toxins.dm b/code/modules/reagents/chemistry/reagents/toxins.dm index 6b4b7918ead..5d6523f7913 100644 --- a/code/modules/reagents/chemistry/reagents/toxins.dm +++ b/code/modules/reagents/chemistry/reagents/toxins.dm @@ -1157,5 +1157,5 @@ if(M.staminaloss < (45 - healthcomp)) //At 50 health you would have 200 - 150 health meaning 50 compensation. 60 - 50 = 10, so would only do 10-19 stamina.) M.adjustStaminaLoss(10) if(prob(30)) - to_chat(M, "You should sit down and take a rest...") + to_chat(M, "You feel like you should sit down and take a rest...") ..() \ No newline at end of file