From 90496be20a33e2327648e693950416630961bf74 Mon Sep 17 00:00:00 2001 From: ZomgPonies Date: Sun, 19 Jan 2014 08:30:50 -0500 Subject: [PATCH] Standardized intent names so it's all harm. Fuck you hurt. --- code/WorkInProgress/Sayu/programmable.dm | 2 +- .../ZomgPonies/mobs/metroid/powers.dm | 6 +- code/_onclick/click.dm | 1 + code/_onclick/hud/alien.dm | 2 +- code/_onclick/hud/alien_larva.dm | 2 +- code/_onclick/hud/monkey.dm | 2 +- code/_onclick/hud/robot.dm | 2 +- code/_onclick/hud/screen_objects.dm | 2 +- code/game/dna/dna_misc.dm | 2 +- .../gamemodes/changeling/changeling_powers.dm | 2 +- code/game/mecha/combat/combat.dm | 2 +- code/game/mecha/equipment/tools/tools.dm | 4 +- code/game/mecha/mecha.dm | 2 +- code/game/objects/items/weapons/stunbaton.dm | 2 +- .../objects/items/weapons/swords_axes_etc.dm | 4 +- code/game/objects/structures/tables_racks.dm | 2 +- code/game/objects/structures/window.dm | 2 +- code/modules/clothing/clothing.dm | 2 +- .../living/carbon/alien/humanoid/humanoid.dm | 2 +- .../living/carbon/human/human_attackalien.dm | 2 +- .../living/carbon/human/human_attackhand.dm | 2 +- .../mob/living/carbon/human/human_defense.dm | 2 +- .../mob/living/carbon/metroid/metroid.dm | 2 +- .../mob/living/carbon/monkey/monkey.dm | 6 +- .../modules/mob/living/silicon/robot/robot.dm | 2 +- .../mob/living/simple_animal/parrot.dm | 2 +- code/modules/mob/mob_helpers.dm | 12 ++-- code/modules/mob/transform_procs.dm | 12 ++-- code/modules/power/lighting.dm | 2 +- code/modules/projectiles/gun.dm | 2 +- .../projectiles/guns/projectile/pneumatic.dm | 2 +- code/modules/projectiles/projectile/beams.dm | 60 ------------------- code/modules/projectiles/projectile/change.dm | 2 +- code/modules/reagents/Chemistry-Reagents.dm | 2 +- .../reagent_containers/food/drinks/bottle.dm | 2 +- .../reagents/reagent_containers/syringes.dm | 2 +- .../artifact/effects/unknown_effect_hurt.dm | 2 +- code/modules/surgery/surgery.dm | 2 +- interface/skin.dmf | 5 +- 39 files changed, 55 insertions(+), 115 deletions(-) diff --git a/code/WorkInProgress/Sayu/programmable.dm b/code/WorkInProgress/Sayu/programmable.dm index 4a378811f3b..0de95f75aca 100644 --- a/code/WorkInProgress/Sayu/programmable.dm +++ b/code/WorkInProgress/Sayu/programmable.dm @@ -502,7 +502,7 @@ H << "The boxing machine refuses to acknowledge you unless you face it head on!" return var/damage = 0 - if(H.a_intent != "hurt") + if(H.a_intent != "harm") damage += rand(0,5) else damage += rand(0,10) diff --git a/code/WorkInProgress/ZomgPonies/mobs/metroid/powers.dm b/code/WorkInProgress/ZomgPonies/mobs/metroid/powers.dm index 91cf8c8b902..b9ce484fbb5 100644 --- a/code/WorkInProgress/ZomgPonies/mobs/metroid/powers.dm +++ b/code/WorkInProgress/ZomgPonies/mobs/metroid/powers.dm @@ -178,7 +178,7 @@ var/mob/living/carbon/slime/adult/new_slime = new adulttype(loc) new_slime.nutrition = nutrition new_slime.powerlevel = max(0, powerlevel-1) - new_slime.a_intent = "hurt" + new_slime.a_intent = "harm" new_slime.key = key new_slime.universal_speak = universal_speak new_slime << "You are now an adult slime." @@ -242,7 +242,7 @@ babies += M var/mob/living/carbon/slime/new_slime = pick_n_take(babies) - new_slime.a_intent = "hurt" + new_slime.a_intent = "harm" new_slime.universal_speak = universal_speak new_slime.key = key @@ -255,7 +255,7 @@ var/mob/dead/observer/picked = pick(candidates) var/mob/living/carbon/slime/S = pick(babies) S.key = picked - S.a_intent = "hurt" + S.a_intent = "harm" S.universal_speak = universal_speak S << "You are now a slime!" diff --git a/code/_onclick/click.dm b/code/_onclick/click.dm index fd0b658aa0b..da55252869d 100644 --- a/code/_onclick/click.dm +++ b/code/_onclick/click.dm @@ -170,6 +170,7 @@ if(!mutations.len) return if((LASER in mutations) && a_intent == "harm") LaserEyes(A) // moved into a proc below + return else if(TK in mutations) switch(get_dist(src,A)) if(0) diff --git a/code/_onclick/hud/alien.dm b/code/_onclick/hud/alien.dm index 180a9dd324e..1fac1856a37 100644 --- a/code/_onclick/hud/alien.dm +++ b/code/_onclick/hud/alien.dm @@ -10,7 +10,7 @@ using.name = "act_intent" using.dir = SOUTHWEST using.icon = 'icons/mob/screen1_alien.dmi' - using.icon_state = (mymob.a_intent == "hurt" ? "harm" : mymob.a_intent) + using.icon_state = (mymob.a_intent == "harm" ? "harm" : mymob.a_intent) using.screen_loc = ui_acti using.layer = 20 src.adding += using diff --git a/code/_onclick/hud/alien_larva.dm b/code/_onclick/hud/alien_larva.dm index 4e29827e892..59461e3c6b7 100644 --- a/code/_onclick/hud/alien_larva.dm +++ b/code/_onclick/hud/alien_larva.dm @@ -9,7 +9,7 @@ using.name = "act_intent" using.dir = SOUTHWEST using.icon = 'icons/mob/screen1_alien.dmi' - using.icon_state = (mymob.a_intent == "hurt" ? "harm" : mymob.a_intent) + using.icon_state = (mymob.a_intent == "harm" ? "harm" : mymob.a_intent) using.screen_loc = ui_acti using.layer = 20 src.adding += using diff --git a/code/_onclick/hud/monkey.dm b/code/_onclick/hud/monkey.dm index 41e8e3bd2e4..bfbbc589ab2 100644 --- a/code/_onclick/hud/monkey.dm +++ b/code/_onclick/hud/monkey.dm @@ -10,7 +10,7 @@ using.name = "act_intent" using.dir = SOUTHWEST using.icon = ui_style - using.icon_state = (mymob.a_intent == "hurt" ? "harm" : mymob.a_intent) + using.icon_state = (mymob.a_intent == "harm" ? "harm" : mymob.a_intent) using.screen_loc = ui_acti using.layer = 20 src.adding += using diff --git a/code/_onclick/hud/robot.dm b/code/_onclick/hud/robot.dm index 837d41ab7f8..c8a97c14f14 100644 --- a/code/_onclick/hud/robot.dm +++ b/code/_onclick/hud/robot.dm @@ -55,7 +55,7 @@ using.name = "act_intent" using.dir = SOUTHWEST using.icon = 'icons/mob/screen1_robot.dmi' - using.icon_state = (mymob.a_intent == "hurt" ? "harm" : mymob.a_intent) + using.icon_state = (mymob.a_intent == "harm" ? "harm" : mymob.a_intent) using.screen_loc = ui_acti using.layer = 20 src.adding += using diff --git a/code/_onclick/hud/screen_objects.dm b/code/_onclick/hud/screen_objects.dm index e486fb65c10..52f1decfc03 100644 --- a/code/_onclick/hud/screen_objects.dm +++ b/code/_onclick/hud/screen_objects.dm @@ -313,7 +313,7 @@ usr.a_intent = "help" usr.hud_used.action_intent.icon_state = "intent_help" if("harm") - usr.a_intent = "hurt" + usr.a_intent = "harm" usr.hud_used.action_intent.icon_state = "intent_hurt" if("grab") usr.a_intent = "grab" diff --git a/code/game/dna/dna_misc.dm b/code/game/dna/dna_misc.dm index 826defa893f..13ddefd5514 100644 --- a/code/game/dna/dna_misc.dm +++ b/code/game/dna/dna_misc.dm @@ -465,7 +465,7 @@ O.adjustToxLoss(M.getToxLoss() + 20) O.adjustOxyLoss(M.getOxyLoss()) O.stat = M.stat - O.a_intent = "hurt" + O.a_intent = "harm" for (var/obj/item/weapon/implant/I in implants) I.loc = O I.implanted = O diff --git a/code/game/gamemodes/changeling/changeling_powers.dm b/code/game/gamemodes/changeling/changeling_powers.dm index 8887fc5ce0a..b47f16c7205 100644 --- a/code/game/gamemodes/changeling/changeling_powers.dm +++ b/code/game/gamemodes/changeling/changeling_powers.dm @@ -252,7 +252,7 @@ O.setOxyLoss(C.getOxyLoss()) O.adjustFireLoss(C.getFireLoss()) O.stat = C.stat - O.a_intent = "hurt" + O.a_intent = "harm" for(var/obj/item/weapon/implant/I in implants) I.loc = O I.implanted = O diff --git a/code/game/mecha/combat/combat.dm b/code/game/mecha/combat/combat.dm index f75bd01ac49..d75e62cc5fd 100644 --- a/code/game/mecha/combat/combat.dm +++ b/code/game/mecha/combat/combat.dm @@ -25,7 +25,7 @@ if(!melee_can_hit || !istype(target, /atom)) return if(istype(target, /mob/living)) var/mob/living/M = target - if(src.occupant.a_intent == "hurt") + if(src.occupant.a_intent == "harm") playsound(src, 'sound/weapons/punch4.ogg', 50, 1) if(damtype == "brute") step_away(M,src,15) diff --git a/code/game/mecha/equipment/tools/tools.dm b/code/game/mecha/equipment/tools/tools.dm index cb2183e49a6..0ea7d65f0de 100644 --- a/code/game/mecha/equipment/tools/tools.dm +++ b/code/game/mecha/equipment/tools/tools.dm @@ -53,7 +53,7 @@ else if(istype(target,/mob/living)) var/mob/living/M = target if(M.stat>1) return - if(chassis.occupant.a_intent == "hurt") + if(chassis.occupant.a_intent == "harm") M.take_overall_damage(dam_force) M.adjustOxyLoss(round(dam_force/2)) M.updatehealth() @@ -1064,7 +1064,7 @@ else if(istype(target,/mob/living)) var/mob/living/M = target if(M.stat>1) return - if(chassis.occupant.a_intent == "hurt") + if(chassis.occupant.a_intent == "harm") chassis.occupant_message("\red You obliterate [target] with [src.name], leaving blood and guts everywhere.") chassis.visible_message("\red [chassis] destroys [target] in an unholy fury.") if(chassis.occupant.a_intent == "disarm") diff --git a/code/game/mecha/mecha.dm b/code/game/mecha/mecha.dm index 9d36eadeea5..1b8bd82f0aa 100644 --- a/code/game/mecha/mecha.dm +++ b/code/game/mecha/mecha.dm @@ -737,7 +737,7 @@ user << "There's already a powercell installed." return - else if(istype(W, /obj/item/weapon/weldingtool) && user.a_intent != "hurt") + else if(istype(W, /obj/item/weapon/weldingtool) && user.a_intent != "harm") var/obj/item/weapon/weldingtool/WT = W if (WT.remove_fuel(0,user)) if (hasInternalDamage(MECHA_INT_TANK_BREACH)) diff --git a/code/game/objects/items/weapons/stunbaton.dm b/code/game/objects/items/weapons/stunbaton.dm index d0de73271c4..6b894973c48 100644 --- a/code/game/objects/items/weapons/stunbaton.dm +++ b/code/game/objects/items/weapons/stunbaton.dm @@ -115,7 +115,7 @@ return var/mob/living/L = M - if(user.a_intent == "hurt") + if(user.a_intent == "harm") ..() playsound(loc, "swing_hit", 50, 1, -1) diff --git a/code/game/objects/items/weapons/swords_axes_etc.dm b/code/game/objects/items/weapons/swords_axes_etc.dm index c2cb748641b..13e62990c56 100644 --- a/code/game/objects/items/weapons/swords_axes_etc.dm +++ b/code/game/objects/items/weapons/swords_axes_etc.dm @@ -98,7 +98,7 @@ log_attack("[user.name] ([user.ckey]) attacked [M.name] ([M.ckey]) with [src.name] (INTENT: [uppertext(user.a_intent)])") */ - if (user.a_intent == "hurt") + if (user.a_intent == "harm") if(!..()) return playsound(src.loc, "swing_hit", 50, 1, -1) if (M.stuttering < 8 && (!(HULK in M.mutations)) /*&& (!istype(H:wear_suit, /obj/item/clothing/suit/judgerobe))*/) @@ -190,7 +190,7 @@ else user.take_organ_damage(2*force) return - if (user.a_intent == "hurt") + if (user.a_intent == "harm") if(!..()) return if(!isrobot(target)) playsound(src.loc, "swing_hit", 50, 1, -1) diff --git a/code/game/objects/structures/tables_racks.dm b/code/game/objects/structures/tables_racks.dm index c0ad280ea57..1b35d07e868 100644 --- a/code/game/objects/structures/tables_racks.dm +++ b/code/game/objects/structures/tables_racks.dm @@ -354,7 +354,7 @@ if (istype(G.affecting, /mob/living)) var/mob/living/M = G.affecting if (G.state < 2) - if(user.a_intent == "hurt") + if(user.a_intent == "harm") if (prob(15)) M.Weaken(5) M.apply_damage(8,def_zone = "head") visible_message("\red [G.assailant] slams [G.affecting]'s face against \the [src]!") diff --git a/code/game/objects/structures/window.dm b/code/game/objects/structures/window.dm index 7e6d4fbd44f..484ea7e1945 100644 --- a/code/game/objects/structures/window.dm +++ b/code/game/objects/structures/window.dm @@ -132,7 +132,7 @@ if(pdiff>0) message_admins("Window destroyed by hulk [user.real_name] ([formatPlayerPanel(user,user.ckey)]) with pdiff [pdiff] at [formatJumpTo(loc)]!") log_admin("Window destroyed by hulk [user.real_name] ([user.ckey]) with pdiff [pdiff] at [loc]!") - else if (usr.a_intent == "hurt") + else if (usr.a_intent == "harm") playsound(src.loc, 'sound/effects/glassknock.ogg', 80, 1) usr.visible_message("\red [usr.name] bangs against the [src.name]!", \ "\red You bang against the [src.name]!", \ diff --git a/code/modules/clothing/clothing.dm b/code/modules/clothing/clothing.dm index e3bbc145679..39f56e1825b 100644 --- a/code/modules/clothing/clothing.dm +++ b/code/modules/clothing/clothing.dm @@ -367,7 +367,7 @@ BLIND // can't see anything if(istype(usr.get_active_hand(),/obj) && istype(usr.get_inactive_hand(),/obj)) usr << "\red You need an empty hand to draw the gun!" else - if(usr.a_intent == "hurt") + if(usr.a_intent == "harm") usr.visible_message("\red \The [usr] draws \the [H.holstered], ready to shoot!", \ "\red You draw \the [H.holstered], ready to shoot!") else diff --git a/code/modules/mob/living/carbon/alien/humanoid/humanoid.dm b/code/modules/mob/living/carbon/alien/humanoid/humanoid.dm index 828ae031ca1..0c505485d0f 100644 --- a/code/modules/mob/living/carbon/alien/humanoid/humanoid.dm +++ b/code/modules/mob/living/carbon/alien/humanoid/humanoid.dm @@ -283,7 +283,7 @@ if ((O.client && !( O.blinded ))) O.show_message(text("\red [] has grabbed [] passively!", M, src), 1) - if ("hurt") + if ("harm") var/damage = rand(1, 9) if (prob(90)) if (HULK in M.mutations)//HULK SMASH diff --git a/code/modules/mob/living/carbon/human/human_attackalien.dm b/code/modules/mob/living/carbon/human/human_attackalien.dm index ea73d63f8d5..7d71cd3d029 100644 --- a/code/modules/mob/living/carbon/human/human_attackalien.dm +++ b/code/modules/mob/living/carbon/human/human_attackalien.dm @@ -22,7 +22,7 @@ playsound(loc, 'sound/weapons/thudswoosh.ogg', 50, 1, -1) visible_message(text("\red [] has grabbed [] passively!", M, src)) - if("hurt") + if("harm") if (w_uniform) w_uniform.add_fingerprint(M) var/damage = rand(15, 30) diff --git a/code/modules/mob/living/carbon/human/human_attackhand.dm b/code/modules/mob/living/carbon/human/human_attackhand.dm index 114db828bd0..8f7d714dc05 100644 --- a/code/modules/mob/living/carbon/human/human_attackhand.dm +++ b/code/modules/mob/living/carbon/human/human_attackhand.dm @@ -92,7 +92,7 @@ add_logs(src, M, "grabbed", addition="passively") return 1 - if("hurt") + if("harm") //Vampire code if(M.zone_sel && M.zone_sel.selecting == "head" && src != M) diff --git a/code/modules/mob/living/carbon/human/human_defense.dm b/code/modules/mob/living/carbon/human/human_defense.dm index e7205052b9f..11d84414f38 100644 --- a/code/modules/mob/living/carbon/human/human_defense.dm +++ b/code/modules/mob/living/carbon/human/human_defense.dm @@ -189,7 +189,7 @@ emp_act visible_message("\red [user] misses [src] with \the [I]!") return - if(istype(I, /obj/item/weapon/butch/meatcleaver) && src.stat == DEAD && user.a_intent == "hurt") + if(istype(I, /obj/item/weapon/butch/meatcleaver) && src.stat == DEAD && user.a_intent == "harm") var/obj/item/weapon/reagent_containers/food/snacks/meat/human/newmeat = new /obj/item/weapon/reagent_containers/food/snacks/meat/human(get_turf(src.loc)) newmeat.name = src.real_name + newmeat.name newmeat.subjectname = src.real_name diff --git a/code/modules/mob/living/carbon/metroid/metroid.dm b/code/modules/mob/living/carbon/metroid/metroid.dm index 687ebe92db2..12b17d58103 100644 --- a/code/modules/mob/living/carbon/metroid/metroid.dm +++ b/code/modules/mob/living/carbon/metroid/metroid.dm @@ -505,7 +505,7 @@ if ((O.client && !( O.blinded ))) O.show_message(text("\blue [M] caresses [src] with its scythe like arm."), 1) - if ("hurt") + if ("harm") if ((prob(95) && health > 0)) attacked += 10 diff --git a/code/modules/mob/living/carbon/monkey/monkey.dm b/code/modules/mob/living/carbon/monkey/monkey.dm index f7d57fc0e71..5d1c095e93c 100644 --- a/code/modules/mob/living/carbon/monkey/monkey.dm +++ b/code/modules/mob/living/carbon/monkey/monkey.dm @@ -180,7 +180,7 @@ if (M.a_intent == "help") help_shake_act(M) else - if ((M.a_intent == "hurt" && !( istype(wear_mask, /obj/item/clothing/mask/muzzle) ))) + if ((M.a_intent == "harm" && !( istype(wear_mask, /obj/item/clothing/mask/muzzle) ))) if ((prob(75) && health > 0)) playsound(loc, 'sound/weapons/bite.ogg', 50, 1, -1) for(var/mob/O in viewers(src, null)) @@ -213,7 +213,7 @@ help_shake_act(M) else - if (M.a_intent == "hurt") + if (M.a_intent == "harm") if ((prob(75) && health > 0)) for(var/mob/O in viewers(src, null)) if ((O.client && !( O.blinded ))) @@ -285,7 +285,7 @@ if ((O.client && !( O.blinded ))) O.show_message(text("\blue [M] caresses [src] with its scythe like arm."), 1) - if ("hurt") + if ("harm") if ((prob(95) && health > 0)) playsound(loc, 'sound/weapons/slice.ogg', 25, 1, -1) var/damage = rand(15, 30) diff --git a/code/modules/mob/living/silicon/robot/robot.dm b/code/modules/mob/living/silicon/robot/robot.dm index 03a01ce5a47..68fbd672fa9 100644 --- a/code/modules/mob/living/silicon/robot/robot.dm +++ b/code/modules/mob/living/silicon/robot/robot.dm @@ -816,7 +816,7 @@ if ((O.client && !( O.blinded ))) O.show_message(text("\red [] has grabbed [] passively!", M, src), 1) - if ("hurt") + if ("harm") var/damage = rand(10, 20) if (prob(90)) /* diff --git a/code/modules/mob/living/simple_animal/parrot.dm b/code/modules/mob/living/simple_animal/parrot.dm index 1328eb70707..a8f575c64ee 100644 --- a/code/modules/mob/living/simple_animal/parrot.dm +++ b/code/modules/mob/living/simple_animal/parrot.dm @@ -214,7 +214,7 @@ /mob/living/simple_animal/parrot/attack_hand(mob/living/carbon/M as mob) ..() if(client) return - if(!stat && M.a_intent == "hurt") + if(!stat && M.a_intent == "harm") icon_state = "parrot_fly" //It is going to be flying regardless of whether it flees or attacks diff --git a/code/modules/mob/mob_helpers.dm b/code/modules/mob/mob_helpers.dm index 05dfc79f107..de094aa06ef 100644 --- a/code/modules/mob/mob_helpers.dm +++ b/code/modules/mob/mob_helpers.dm @@ -369,7 +369,7 @@ It's fairly easy to fix if dealing with single letters but not so much with comp return 0 //converts intent-strings into numbers and back -var/list/intents = list("help","disarm","grab","hurt") +var/list/intents = list("help","disarm","grab","harm") /proc/intent_numeric(argument) if(istext(argument)) switch(argument) @@ -382,7 +382,7 @@ var/list/intents = list("help","disarm","grab","hurt") if(0) return "help" if(1) return "disarm" if(2) return "grab" - else return "hurt" + else return "harm" //change a mob's act-intent. Input the intent as a string such as "help" or use "right"/"left /mob/verb/a_intent_change(input as text) @@ -391,7 +391,7 @@ var/list/intents = list("help","disarm","grab","hurt") if(ishuman(src) || isalienadult(src) || isbrain(src)) switch(input) - if("help","disarm","grab","hurt") + if("help","disarm","grab","harm") a_intent = input if("right") a_intent = intent_numeric((intent_numeric(a_intent)+1) % 4) @@ -404,12 +404,12 @@ var/list/intents = list("help","disarm","grab","hurt") switch(input) if("help") a_intent = "help" - if("hurt") - a_intent = "hurt" + if("harm") + a_intent = "harm" if("right","left") a_intent = intent_numeric(intent_numeric(a_intent) - 3) if(hud_used && hud_used.action_intent) - if(a_intent == "hurt") + if(a_intent == "harm") hud_used.action_intent.icon_state = "harm" else hud_used.action_intent.icon_state = "help" diff --git a/code/modules/mob/transform_procs.dm b/code/modules/mob/transform_procs.dm index b9800dbba66..dae005bbf8a 100644 --- a/code/modules/mob/transform_procs.dm +++ b/code/modules/mob/transform_procs.dm @@ -33,7 +33,7 @@ O.dna.uni_identity = "000000000000000000DC00000660004DA0A0E00" O.dna.struc_enzymes = "[copytext(O.dna.struc_enzymes,1,1+3*(STRUCDNASIZE-1))]BB8" O.viruses = viruses - O.a_intent = "hurt" + O.a_intent = "harm" for(var/datum/disease/D in O.viruses) D.affected_mob = O @@ -212,7 +212,7 @@ if("Drone") new_xeno = new /mob/living/carbon/alien/humanoid/drone(loc) - new_xeno.a_intent = "hurt" + new_xeno.a_intent = "harm" new_xeno.key = key new_xeno << "You are now an alien." @@ -248,7 +248,7 @@ new_slime = new /mob/living/carbon/slime/adult(loc) else new_slime = new /mob/living/carbon/slime(loc) - new_slime.a_intent = "hurt" + new_slime.a_intent = "harm" new_slime.key = key new_slime << "You are now a slime. Skreee!" @@ -270,7 +270,7 @@ del(t) var/mob/living/simple_animal/corgi/new_corgi = new /mob/living/simple_animal/corgi (loc) - new_corgi.a_intent = "hurt" + new_corgi.a_intent = "harm" new_corgi.key = key new_corgi << "You are now a Corgi. Yap Yap!" @@ -304,7 +304,7 @@ var/mob/new_mob = new mobpath(src.loc) new_mob.key = key - new_mob.a_intent = "hurt" + new_mob.a_intent = "harm" new_mob << "You suddenly feel more... animalistic." @@ -324,7 +324,7 @@ var/mob/new_mob = new mobpath(src.loc) new_mob.key = key - new_mob.a_intent = "hurt" + new_mob.a_intent = "harm" new_mob << "You feel more... animalistic" del(src) diff --git a/code/modules/power/lighting.dm b/code/modules/power/lighting.dm index a62d1d4c3f0..ad75cabc2d6 100644 --- a/code/modules/power/lighting.dm +++ b/code/modules/power/lighting.dm @@ -737,7 +737,7 @@ if(!proximity) return if(istype(target, /obj/machinery/light)) return - if(user.a_intent != "hurt") + if(user.a_intent != "harm") return shatter() diff --git a/code/modules/projectiles/gun.dm b/code/modules/projectiles/gun.dm index 643700b9498..d2f1ac878ea 100644 --- a/code/modules/projectiles/gun.dm +++ b/code/modules/projectiles/gun.dm @@ -256,7 +256,7 @@ if (src.process_chambered()) //Point blank shooting if on harm intent or target we were targeting. - if(user.a_intent == "hurt") + if(user.a_intent == "harm") user.visible_message("\red \The [user] fires \the [src] point blank at [M]!") in_chamber.damage *= 1.3 src.Fire(M,user,0,0,1) diff --git a/code/modules/projectiles/guns/projectile/pneumatic.dm b/code/modules/projectiles/guns/projectile/pneumatic.dm index 9924e3d93fe..2b71becedff 100644 --- a/code/modules/projectiles/guns/projectile/pneumatic.dm +++ b/code/modules/projectiles/guns/projectile/pneumatic.dm @@ -90,7 +90,7 @@ /obj/item/weapon/storage/pneumatic/attack(mob/living/M as mob, mob/living/user as mob, def_zone) if (length(contents) > 0) - if(user.a_intent == "hurt") + if(user.a_intent == "harm") user.visible_message("\red \The [user] fires \the [src] point blank at [M]!") Fire(M,user) return diff --git a/code/modules/projectiles/projectile/beams.dm b/code/modules/projectiles/projectile/beams.dm index 42f2b555b45..e20c54598b0 100644 --- a/code/modules/projectiles/projectile/beams.dm +++ b/code/modules/projectiles/projectile/beams.dm @@ -177,67 +177,7 @@ var/list/beam_master = list() flag = "laser" eyeblur = 4 var/frequency = 1 - process() - var/reference = "\ref[src]" //So we do not have to recalculate it a ton - var/first = 1 //So we don't make the overlay in the same tile as the firer - spawn while(src) //Move until we hit something - if((!( current ) || loc == current)) //If we pass our target - current = locate(min(max(x + xo, 1), world.maxx), min(max(y + yo, 1), world.maxy), z) - if((x == 1 || x == world.maxx || y == 1 || y == world.maxy)) - del(src) //Delete if it passes the world edge - return - step_towards(src, current) //Move~ - - if(kill_count < 1) - del(src) - kill_count-- - - if(!bumped && !isturf(original)) - if(loc == get_turf(original)) - if(!(original in permutated)) - Bump(original) - - if(!first) //Add the overlay as we pass over tiles - var/target_dir = get_dir(src, current) //So we don't call this too much - - //If the icon has not been added yet - if( !("[icon_state][target_dir]" in beam_master) ) - var/image/I = image(icon,icon_state,10,target_dir) //Generate it. - beam_master["[icon_state][target_dir]"] = I //And cache it! - - //Finally add the overlay - src.loc.overlays += beam_master["[icon_state][target_dir]"] - - //Add the turf to a list in the beam master so they can be cleaned up easily. - if(reference in beam_master) - var/list/turf_master = beam_master[reference] - if("[icon_state][target_dir]" in turf_master) - var/list/turfs = turf_master["[icon_state][target_dir]"] - turfs += loc - else - turf_master["[icon_state][target_dir]"] = list(loc) - else - var/list/turfs = list() - turfs["[icon_state][target_dir]"] = list(loc) - beam_master[reference] = turfs - else - first = 0 - cleanup(reference) - return - - Del() - cleanup("\ref[src]") - ..() - - proc/cleanup(reference) //Waits .3 seconds then removes the overlay. - src = null //we're getting deleted! this will keep the code running - spawn(3) - var/list/turf_master = beam_master[reference] - for(var/laser_state in turf_master) - var/list/turfs = turf_master[laser_state] - for(var/turf/T in turfs) - T.overlays -= beam_master[laser_state] /obj/item/projectile/beam/practice name = "laser" diff --git a/code/modules/projectiles/projectile/change.dm b/code/modules/projectiles/projectile/change.dm index 31c7389fefd..4d0d6838e5a 100644 --- a/code/modules/projectiles/projectile/change.dm +++ b/code/modules/projectiles/projectile/change.dm @@ -81,7 +81,7 @@ for (var/obj/effect/proc_holder/spell/S in M.spell_list) new_mob.spell_list += new S.type - new_mob.a_intent = "hurt" + new_mob.a_intent = "harm" if(M.mind) M.mind.transfer_to(new_mob) else diff --git a/code/modules/reagents/Chemistry-Reagents.dm b/code/modules/reagents/Chemistry-Reagents.dm index 4503c358320..14e1ab91511 100644 --- a/code/modules/reagents/Chemistry-Reagents.dm +++ b/code/modules/reagents/Chemistry-Reagents.dm @@ -490,7 +490,7 @@ datum W.loc = M.loc W.dropped(M) var/mob/living/carbon/slime/new_mob = new /mob/living/carbon/slime(M.loc) - new_mob.a_intent = "hurt" + new_mob.a_intent = "harm" new_mob.universal_speak = 1 if(M.mind) M.mind.transfer_to(new_mob) diff --git a/code/modules/reagents/reagent_containers/food/drinks/bottle.dm b/code/modules/reagents/reagent_containers/food/drinks/bottle.dm index 807552c54b9..6cefca65541 100644 --- a/code/modules/reagents/reagent_containers/food/drinks/bottle.dm +++ b/code/modules/reagents/reagent_containers/food/drinks/bottle.dm @@ -37,7 +37,7 @@ if(!target) return - if(user.a_intent != "hurt" || !isGlass) + if(user.a_intent != "harm" || !isGlass) return ..() diff --git a/code/modules/reagents/reagent_containers/syringes.dm b/code/modules/reagents/reagent_containers/syringes.dm index ba865133bdd..e5d1f40785a 100644 --- a/code/modules/reagents/reagent_containers/syringes.dm +++ b/code/modules/reagents/reagent_containers/syringes.dm @@ -57,7 +57,7 @@ user << "\red This syringe is broken!" return - if (user.a_intent == "hurt" && ismob(target)) + if (user.a_intent == "harm" && ismob(target)) if((CLUMSY in user.mutations) && prob(50)) target = user syringestab(target, user) diff --git a/code/modules/research/xenoarchaeology/artifact/effects/unknown_effect_hurt.dm b/code/modules/research/xenoarchaeology/artifact/effects/unknown_effect_hurt.dm index f69b9b9d9db..5cf460049dd 100644 --- a/code/modules/research/xenoarchaeology/artifact/effects/unknown_effect_hurt.dm +++ b/code/modules/research/xenoarchaeology/artifact/effects/unknown_effect_hurt.dm @@ -1,6 +1,6 @@ /datum/artifact_effect/hurt - effecttype = "hurt" + effecttype = "harm" effect_type = 5 /datum/artifact_effect/hurt/DoEffectTouch(var/mob/toucher) diff --git a/code/modules/surgery/surgery.dm b/code/modules/surgery/surgery.dm index 8bd4bd8f3e3..d61f917eaac 100644 --- a/code/modules/surgery/surgery.dm +++ b/code/modules/surgery/surgery.dm @@ -77,7 +77,7 @@ proc/spread_germs_to_organ(datum/organ/external/E, mob/living/carbon/human/user) proc/do_surgery(mob/living/M, mob/living/user, obj/item/tool) if(!istype(M,/mob/living/carbon)) return 0 - if (user.a_intent == "hurt") //check for Hippocratic Oath + if (user.a_intent == "harm") //check for Hippocratic Oath return 0 for(var/datum/surgery_step/S in surgery_steps) //check if tool is right or close enough and if this step is possible diff --git a/interface/skin.dmf b/interface/skin.dmf index 2f79aa23583..9785212012d 100644 --- a/interface/skin.dmf +++ b/interface/skin.dmf @@ -267,11 +267,11 @@ macro "hotkeymode" is-disabled = false elem name = "4" - command = "a-intent hurt" + command = "a-intent harm" is-disabled = false elem name = "CTRL+4" - command = "a-intent hurt" + command = "a-intent harm" is-disabled = false elem name = "A+REP" @@ -1137,7 +1137,6 @@ window "chemdispenser_reagents" align = center text-wrap = false - window "mainwindow" elem "mainwindow" type = MAIN