diff --git a/baystation12.dme b/baystation12.dme index ba9ea7f8220..de76df18f57 100644 --- a/baystation12.dme +++ b/baystation12.dme @@ -2163,10 +2163,10 @@ #include "code\modules\mob\language\human\human.dm" #include "code\modules\mob\language\human\iberian.dm" #include "code\modules\mob\language\human\indian.dm" +#include "code\modules\mob\language\human\korean.dm" #include "code\modules\mob\language\human\latin.dm" #include "code\modules\mob\language\human\russian.dm" #include "code\modules\mob\language\human\selenian.dm" -#include "code\modules\mob\language\human\korean.dm" #include "code\modules\mob\language\human\misc\common.dm" #include "code\modules\mob\language\human\misc\gutter.dm" #include "code\modules\mob\language\human\misc\spacer.dm" diff --git a/code/game/objects/items/weapons/defib.dm b/code/game/objects/items/weapons/defib.dm index 17499643019..d6d3fddac89 100644 --- a/code/game/objects/items/weapons/defib.dm +++ b/code/game/objects/items/weapons/defib.dm @@ -89,13 +89,13 @@ reattach_paddles(user) else if(istype(W, /obj/item/cell)) if(bcell) - to_chat(user, "\the [src] already has a cell.") + to_chat(user, SPAN_NOTICE("\the [src] already has a cell.")) else if(!user.unEquip(W)) return W.forceMove(src) bcell = W - to_chat(user, "You install a cell in \the [src].") + to_chat(user, SPAN_NOTICE("You install a cell in \the [src].")) update_icon() else if(isScrewdriver(W)) @@ -103,12 +103,12 @@ bcell.update_icon() bcell.dropInto(loc) bcell = null - to_chat(user, "You remove the cell from \the [src].") + to_chat(user, SPAN_NOTICE("You remove the cell from \the [src].")) update_icon() else return ..() -/obj/item/defibrillator/emag_act(var/uses, var/mob/user) +/obj/item/defibrillator/emag_act(uses, mob/user) if(paddles) return paddles.emag_act(uses, user, src) return NO_EMAG_ACT @@ -121,7 +121,7 @@ var/mob/living/carbon/human/user = usr if(!paddles) - to_chat(user, "The paddles are missing!") + to_chat(user, SPAN_WARNING("The paddles are missing!")) return if(paddles.loc != src) @@ -129,10 +129,10 @@ return if(!slot_check()) - to_chat(user, "You need to equip [src] before taking out [paddles].") + to_chat(user, SPAN_WARNING("You need to equip [src] before taking out [paddles].")) else if(!usr.put_in_hands(paddles)) //Detach the paddles into the user's hands - to_chat(user, "You need a free hand to hold the paddles!") + to_chat(user, SPAN_WARNING("You need a free hand to hold the paddles!")) update_icon() //success //checks that the base unit is in the correct slot to be used @@ -158,7 +158,7 @@ if(ismob(paddles.loc)) var/mob/M = paddles.loc if(M.drop_from_inventory(paddles, src)) - to_chat(user, "\The [paddles] snap back into the main unit.") + to_chat(user, SPAN_NOTICE("\The [paddles] snap back into the main unit.")) else paddles.forceMove(src) @@ -183,7 +183,7 @@ /obj/item/defibrillator/compact/combat name = "combat defibrillator" - desc = "A belt-equipped blood-red defibrillator that can be rapidly deployed. Does not have the restrictions or safeties of conventional defibrillators and can revive through space suits." + desc = "A belt-equipped blood-red defibrillator that can be rapidly deployed. Does not have the restrictions or safeties of conventional defibrillators and can resuscitate through space suits." paddles = /obj/item/shockpaddles/linked/combat /obj/item/defibrillator/compact/combat/loaded @@ -209,9 +209,9 @@ w_class = ITEM_SIZE_LARGE var/safety = 1 //if you can zap people with the paddles on harm mode - var/combat = 0 //If it can be used to revive people wearing thick clothing (e.g. spacesuits) - var/cooldowntime = (6 SECONDS) // How long in deciseconds until the defib is ready again after use. - var/chargetime = (2 SECONDS) + var/combat = 0 //If it can be used to resuscitate people wearing thick clothing (e.g. spacesuits) + var/cooldowntime = 6 SECONDS // How long in deciseconds until the defib is ready again after use. + var/chargetime = 2 SECONDS var/chargecost = 100 //units of charge var/burn_damage_amt = 5 @@ -219,7 +219,7 @@ var/cooldown = 0 var/busy = 0 -/obj/item/shockpaddles/proc/set_cooldown(var/delay) +/obj/item/shockpaddles/proc/set_cooldown(delay) cooldown = 1 update_icon() @@ -228,7 +228,7 @@ cooldown = 0 update_icon() - make_announcement("beeps, \"Unit is re-energized.\"", "notice") + MakeAnnouncement("beeps, \"Unit is re-energized.\"", "notice") playsound(src, 'sound/machines/defib_ready.ogg', 50, 0) /obj/item/shockpaddles/update_twohanding() @@ -252,13 +252,13 @@ if(busy) return 0 if(!check_charge(chargecost)) - to_chat(user, "\The [src] doesn't have enough charge left to do that.") + to_chat(user, SPAN_WARNING("\The [src] doesn't have enough charge left to do that.")) return 0 if(!wielded && !isrobot(user)) - to_chat(user, "You need to wield the paddles with both hands before you can use them on someone!") + to_chat(user, SPAN_WARNING("You need to wield the paddles with both hands before you can use them on someone!")) return 0 if(cooldown) - to_chat(user, "\The [src] are re-energizing!") + to_chat(user, SPAN_WARNING("\The [src] are re-energizing!")) return 0 return 1 @@ -270,7 +270,7 @@ if(!check_contact(H)) return "buzzes, \"Patient's chest is obstructed. Operation aborted.\"" -/obj/item/shockpaddles/proc/can_revive(mob/living/carbon/human/H) //This is checked right before attempting to revive +/obj/item/shockpaddles/proc/CanResuscitate(mob/living/carbon/human/H) //This is checked right before attempting to resuscitate if(H.stat == DEAD) return "buzzes, \"Resuscitation failed - Severe neurological decay makes recovery of patient impossible. Further attempts futile.\"" @@ -289,13 +289,13 @@ return TRUE return FALSE -/obj/item/shockpaddles/proc/check_charge(var/charge_amt) +/obj/item/shockpaddles/proc/check_charge(charge_amt) return 0 -/obj/item/shockpaddles/proc/checked_use(var/charge_amt) +/obj/item/shockpaddles/proc/checked_use(charge_amt) return 0 -/obj/item/shockpaddles/attack(mob/living/M, mob/living/user, var/target_zone) +/obj/item/shockpaddles/attack(mob/living/M, mob/living/user, target_zone) var/mob/living/carbon/human/H = M if(!istype(H) || user.a_intent == I_HURT) return ..() //Do a regular attack. Harm intent shocking happens as a hit effect @@ -304,7 +304,7 @@ busy = 1 update_icon() - do_revive(H, user) + DoResuscitate(H, user) busy = 0 update_icon() @@ -312,12 +312,12 @@ return 1 //Since harm-intent now skips the delay for deliberate placement, you have to be able to hit them in combat in order to shock people. -/obj/item/shockpaddles/apply_hit_effect(mob/living/target, mob/living/user, var/hit_zone) +/obj/item/shockpaddles/apply_hit_effect(mob/living/target, mob/living/user, hit_zone) if(ishuman(target) && can_use(user, target)) busy = 1 update_icon() - do_electrocute(target, user, hit_zone) + DoElectrocute(target, user, hit_zone) busy = 0 update_icon() @@ -326,53 +326,53 @@ return ..() -// This proc is used so that we can return out of the revive process while ensuring that busy and update_icon() are handled -/obj/item/shockpaddles/proc/do_revive(mob/living/carbon/human/H, mob/living/user) +// This proc is used so that we can return out of the resuscitation process while ensuring that busy and update_icon() are handled +/obj/item/shockpaddles/proc/DoResuscitate(mob/living/carbon/human/H, mob/living/user) if(H.ssd_check()) - to_chat(find_dead_player(H.ckey, 1), "Someone is attempting to resuscitate you. Re-enter your body if you want to be revived!") + to_chat(find_dead_player(H.ckey, 1), SPAN_NOTICE("Someone is attempting to resuscitate you!")) //beginning to place the paddles on patient's chest to allow some time for people to move away to stop the process - user.visible_message("\The [user] begins to place [src] on [H]'s chest.", "You begin to place [src] on [H]'s chest...") + user.visible_message(SPAN_WARNING("\The [user] begins to place [src] on [H]'s chest."), SPAN_WARNING("You begin to place [src] on [H]'s chest...")) if(!user.do_skilled(3 SECONDS, SKILL_MEDICAL, H)) return - user.visible_message("\The [user] places [src] on [H]'s chest.", "You place [src] on [H]'s chest.") + user.visible_message(SPAN_NOTICE("\The [user] places [src] on [H]'s chest."), SPAN_WARNING("You place [src] on [H]'s chest.")) playsound(get_turf(src), 'sound/machines/defib_charge.ogg', 50, 0) var/error = can_defib(H) if(error) - make_announcement(error, "warning") + MakeAnnouncement(error, "warning") playsound(get_turf(src), 'sound/machines/defib_failed.ogg', 50, 0) return if(check_blood_level(H)) - make_announcement("buzzes, \"Warning - Patient is in hypovolemic shock and may require a blood transfusion.\"", "warning") //also includes heart damage + MakeAnnouncement("buzzes, \"Warning - Patient is in hypovolemic shock and may require a blood transfusion.\"", "warning") //also includes heart damage - //placed on chest and short delay to shock for dramatic effect, revive time is 5sec total + //placed on chest and short delay to shock for dramatic effect, resusitation time is 5sec total if(!do_after(user, chargetime, H)) return //deduct charge here, in case the base unit was EMPed or something during the delay time if(!checked_use(chargecost)) - make_announcement("buzzes, \"Insufficient charge.\"", "warning") + MakeAnnouncement("buzzes, \"Insufficient charge.\"", "warning") playsound(get_turf(src), 'sound/machines/defib_failed.ogg', 50, 0) return - H.visible_message("\The [H]'s body convulses a bit.") + H.visible_message(SPAN_WARNING("\The [H]'s body convulses a bit.")) playsound(get_turf(src), "bodyfall", 50, 1) playsound(get_turf(src), 'sound/machines/defib_zap.ogg', 50, 1, -1) set_cooldown(cooldowntime) - error = can_revive(H) + error = CanResuscitate(H) if(error) - make_announcement(error, "warning") + MakeAnnouncement(error, "warning") playsound(get_turf(src), 'sound/machines/defib_failed.ogg', 50, 0) return - if(!user.skill_check(SKILL_MEDICAL, SKILL_BASIC) && !lowskill_revive(H, user)) + if(!user.skill_check(SKILL_MEDICAL, SKILL_BASIC) && !LowSkillResuscitate(H, user)) return H.apply_damage(burn_damage_amt, BURN, BP_CHEST) //set oxyloss so that the patient is just barely in crit, if possible - make_announcement("pings, \"Resuscitation successful.\"", "notice") + MakeAnnouncement("pings, \"Resuscitation successful.\"", "notice") playsound(get_turf(src), 'sound/machines/defib_success.ogg', 50, 0) H.resuscitate() var/obj/item/organ/internal/cell/potato = H.internal_organs_by_name[BP_CELL] @@ -380,49 +380,48 @@ var/obj/item/cell/C = potato.cell C.give(chargecost) H.AdjustSleeping(-60) - log_and_message_admins("used \a [src] to revive [key_name(H)].") -/obj/item/shockpaddles/proc/lowskill_revive(mob/living/carbon/human/H, mob/living/user) +/obj/item/shockpaddles/proc/LowSkillResuscitate(mob/living/carbon/human/H, mob/living/user) if(prob(60)) playsound(get_turf(src), 'sound/machines/defib_zap.ogg', 100, 1, -1) H.electrocute_act(burn_damage_amt*4, src, def_zone = BP_CHEST) - user.visible_message("The paddles were misaligned! \The [user] shocks [H] with \the [src]!", "The paddles were misaligned! You shock [H] with \the [src]!") + user.visible_message(SPAN_WARNING("The paddles were misaligned! \The [user] shocks [H] with \the [src]!"), SPAN_WARNING("The paddles were misaligned! You shock [H] with \the [src]!")) return 0 if(prob(50)) playsound(get_turf(src), 'sound/machines/defib_zap.ogg', 100, 1, -1) user.electrocute_act(burn_damage_amt*2, src, def_zone = BP_L_HAND) user.electrocute_act(burn_damage_amt*2, src, def_zone = BP_R_HAND) - user.visible_message("\The [user] shocks themselves with \the [src]!", "You forget to move your hands away and shock yourself with \the [src]!") + user.visible_message(SPAN_WARNING("\The [user] shocks themselves with \the [src]!"), SPAN_WARNING("You forget to move your hands away and shock yourself with \the [src]!")) return 0 return 1 -/obj/item/shockpaddles/proc/do_electrocute(mob/living/carbon/human/H, mob/user, var/target_zone) +/obj/item/shockpaddles/proc/DoElectrocute(mob/living/carbon/human/H, mob/user, target_zone) var/obj/item/organ/external/affecting = H.get_organ(target_zone) if(!affecting) - to_chat(user, "They are missing that body part!") + to_chat(user, SPAN_WARNING("They are missing that body part!")) return //no need to spend time carefully placing the paddles, we're just trying to shock them - user.visible_message("\The [user] slaps [src] onto [H]'s [affecting.name].", "You overcharge [src] and slap them onto [H]'s [affecting.name].") + user.visible_message(SPAN_DANGER("\The [user] slaps [src] onto [H]'s [affecting.name]."), SPAN_DANGER("You overcharge [src] and slap them onto [H]'s [affecting.name].")) //Just stop at awkwardly slapping electrodes on people if the safety is enabled if(safety) - to_chat(user, "You can't do that while the safety is enabled.") + to_chat(user, SPAN_WARNING("You can't do that while the safety is enabled.")) return playsound(get_turf(src), 'sound/machines/defib_charge.ogg', 50, 0) - audible_message("\The [src] lets out a steadily rising hum...") + audible_message(SPAN_WARNING("\The [src] lets out a steadily rising hum...")) if(!do_after(user, chargetime, H)) return //deduct charge here, in case the base unit was EMPed or something during the delay time if(!checked_use(chargecost)) - make_announcement("buzzes, \"Insufficient charge.\"", "warning") + MakeAnnouncement("buzzes, \"Insufficient charge.\"", "warning") playsound(get_turf(src), 'sound/machines/defib_failed.ogg', 50, 0) return - user.visible_message("\The [user] shocks [H] with \the [src]!", "You shock [H] with \the [src]!") + user.visible_message(SPAN_DANGER("\The [user] shocks [H] with \the [src]!"), SPAN_WARNING("You shock [H] with \the [src]!")) playsound(get_turf(src), 'sound/machines/defib_zap.ogg', 100, 1, -1) playsound(loc, 'sound/weapons/Egloves.ogg', 100, 1, -1) set_cooldown(cooldowntime) @@ -431,32 +430,35 @@ var/burn_damage = H.electrocute_act(burn_damage_amt*2, src, def_zone = target_zone) if(burn_damage > 15 && H.can_feel_pain()) H.emote("scream") - var/obj/item/organ/internal/heart/doki = LAZYACCESS(affecting.internal_organs, BP_HEART) - if(istype(doki) && doki.pulse && !doki.open && prob(10)) - to_chat(doki, "Your [doki] has stopped!") - doki.pulse = PULSE_NONE + var/obj/item/organ/internal/heart/heart = LAZYACCESS(affecting.internal_organs, BP_HEART) + if(istype(heart) && heart.pulse && !heart.open && prob(10)) + to_chat(heart, SPAN_DANGER("Your [heart] has stopped!")) + heart.pulse = PULSE_NONE admin_attack_log(user, H, "Electrocuted using \a [src]", "Was electrocuted with \a [src]", "used \a [src] to electrocute") -/obj/item/shockpaddles/proc/make_alive(mob/living/carbon/human/M) //This revives the mob +// This revives the mob; Currently not used anywhere. +/obj/item/shockpaddles/proc/ReviveMob(mob/living/carbon/human/M) var/deadtime = world.time - M.timeofdeath M.switch_from_dead_to_living_mob_list() M.timeofdeath = 0 - M.set_stat(UNCONSCIOUS) //Life() can bring them back to consciousness if it needs to. + M.set_stat(UNCONSCIOUS) // Life() can bring them back to consciousness if it needs to. M.regenerate_icons() - M.failed_last_breath = 0 //So mobs that died of oxyloss don't revive and have perpetual out of breath. + M.failed_last_breath = 0 // So mobs that died of oxyloss don't revive and have perpetual out of breath. M.reload_fullscreen() M.emote("gasp") M.Weaken(rand(10,25)) M.updatehealth() - apply_brain_damage(M, deadtime) + ApplyBrainDamage(M, deadtime) -/obj/item/shockpaddles/proc/apply_brain_damage(mob/living/carbon/human/H, var/deadtime) - if(deadtime < DEFIB_TIME_LOSS) return +/obj/item/shockpaddles/proc/ApplyBrainDamage(mob/living/carbon/human/H, deadtime) + if(deadtime < DEFIB_TIME_LOSS) + return - if(!H.should_have_organ(BP_BRAIN)) return //no brain + if(!H.should_have_organ(BP_BRAIN)) + return //no brain var/obj/item/organ/internal/brain/brain = H.internal_organs_by_name[BP_BRAIN] if(!brain) return //no brain @@ -464,10 +466,10 @@ var/brain_damage = Clamp((deadtime - DEFIB_TIME_LOSS)/(DEFIB_TIME_LIMIT - DEFIB_TIME_LOSS)*brain.max_damage, H.getBrainLoss(), brain.max_damage) H.setBrainLoss(brain_damage) -/obj/item/shockpaddles/proc/make_announcement(var/message, var/msg_class) - audible_message("\The [src] [message]", "\The [src] vibrates slightly.") +/obj/item/shockpaddles/proc/MakeAnnouncement(message, msg_class) + audible_message("\The [src] [message]", "\The [src] vibrates slightly.") -/obj/item/shockpaddles/emag_act(var/uses, var/mob/user, var/obj/item/defibrillator/base) +/obj/item/shockpaddles/emag_act(uses, mob/user, obj/item/defibrillator/base) if(istype(src, /obj/item/shockpaddles/linked)) var/obj/item/shockpaddles/linked/dfb = src if(dfb.base_unit) @@ -476,13 +478,13 @@ return if(safety) safety = 0 - to_chat(user, "You silently disable \the [src]'s safety protocols with the cryptographic sequencer.") + to_chat(user, SPAN_WARNING("You silently disable \the [src]'s safety protocols with the cryptographic sequencer.")) burn_damage_amt *= 3 base.update_icon() return 1 else safety = 1 - to_chat(user, "You silently enable \the [src]'s safety protocols with the cryptographic sequencer.") + to_chat(user, SPAN_NOTICE("You silently enable \the [src]'s safety protocols with the cryptographic sequencer.")) burn_damage_amt = initial(burn_damage_amt) base.update_icon() return 1 @@ -492,10 +494,10 @@ if(safety != new_safety) safety = new_safety if(safety) - make_announcement("beeps, \"Safety protocols enabled!\"", "notice") + MakeAnnouncement("beeps, \"Safety protocols enabled!\"", "notice") playsound(get_turf(src), 'sound/machines/defib_safetyon.ogg', 50, 0) else - make_announcement("beeps, \"Safety protocols disabled!\"", "warning") + MakeAnnouncement("beeps, \"Safety protocols disabled!\"", "warning") playsound(get_turf(src), 'sound/machines/defib_safetyoff.ogg', 50, 0) update_icon() ..() @@ -509,12 +511,12 @@ item_state = "defibpaddles0" cooldowntime = (3 SECONDS) -/obj/item/shockpaddles/robot/check_charge(var/charge_amt) +/obj/item/shockpaddles/robot/check_charge(charge_amt) if(isrobot(src.loc)) var/mob/living/silicon/robot/R = src.loc return (R.cell && R.cell.check_charge(charge_amt)) -/obj/item/shockpaddles/robot/checked_use(var/charge_amt) +/obj/item/shockpaddles/robot/checked_use(charge_amt) if(isrobot(src.loc)) var/mob/living/silicon/robot/R = src.loc return (R.cell && R.cell.checked_use(charge_amt)) @@ -528,17 +530,17 @@ safety = 0 wielded = 1 -/obj/item/shockpaddles/rig/check_charge(var/charge_amt) +/obj/item/shockpaddles/rig/check_charge(charge_amt) if(istype(src.loc, /obj/item/rig_module/device/defib)) var/obj/item/rig_module/device/defib/module = src.loc return (module.holder && module.holder.cell && module.holder.cell.check_charge(charge_amt)) -/obj/item/shockpaddles/rig/checked_use(var/charge_amt) +/obj/item/shockpaddles/rig/checked_use(charge_amt) if(istype(src.loc, /obj/item/rig_module/device/defib)) var/obj/item/rig_module/device/defib/module = src.loc return (module.holder && module.holder.cell && module.holder.cell.checked_use(charge_amt)) -/obj/item/shockpaddles/rig/set_cooldown(var/delay) +/obj/item/shockpaddles/rig/set_cooldown(delay) ..() if(istype(src.loc, /obj/item/rig_module/device/defib)) var/obj/item/rig_module/device/defib/module = src.loc @@ -567,13 +569,13 @@ if(base_unit) base_unit.reattach_paddles(user) //paddles attached to a base unit should never exist outside of their base unit or the mob equipping the base unit -/obj/item/shockpaddles/linked/check_charge(var/charge_amt) +/obj/item/shockpaddles/linked/check_charge(charge_amt) return (base_unit.bcell && base_unit.bcell.check_charge(charge_amt)) -/obj/item/shockpaddles/linked/checked_use(var/charge_amt) +/obj/item/shockpaddles/linked/checked_use(charge_amt) return (base_unit.bcell && base_unit.bcell.checked_use(charge_amt)) -/obj/item/shockpaddles/linked/make_announcement(var/message, var/msg_class) +/obj/item/shockpaddles/linked/MakeAnnouncement(message, msg_class) base_unit.audible_message("\The [base_unit] [message]", "\The [base_unit] vibrates slightly.") /* @@ -589,10 +591,10 @@ if(fail_counter) STOP_PROCESSING(SSobj, src) -/obj/item/shockpaddles/standalone/check_charge(var/charge_amt) +/obj/item/shockpaddles/standalone/check_charge(charge_amt) return 1 -/obj/item/shockpaddles/standalone/checked_use(var/charge_amt) +/obj/item/shockpaddles/standalone/checked_use(charge_amt) SSradiation.radiate(src, charge_amt/12) //just a little bit of radiation. It's the price you pay for being powered by magic I guess return 1 @@ -613,7 +615,7 @@ if(2) new_fail = max(fail_counter, 8) if(ismob(loc)) - to_chat(loc, "\The [src] feel pleasantly warm.") + to_chat(loc, SPAN_WARNING("\The [src] feel pleasantly warm.")) if(new_fail && !fail_counter) START_PROCESSING(SSobj, src)