diff --git a/code/__DEFINES/mob.dm b/code/__DEFINES/mob.dm index 0080658562b..8779d6e8860 100644 --- a/code/__DEFINES/mob.dm +++ b/code/__DEFINES/mob.dm @@ -91,3 +91,9 @@ #define APPEARANCE_EYE_COLOR 256 #define APPEARANCE_ALL_HAIR APPEARANCE_HAIR|APPEARANCE_HAIR_COLOR|APPEARANCE_FACIAL_HAIR|APPEARANCE_FACIAL_HAIR_COLOR #define APPEARANCE_ALL 511 + +// Intents +#define I_HELP "help" +#define I_DISARM "disarm" +#define I_GRAB "grab" +#define I_HARM "harm" \ No newline at end of file diff --git a/code/_onclick/click.dm b/code/_onclick/click.dm index 2a227db446f..5c05e27b3c6 100644 --- a/code/_onclick/click.dm +++ b/code/_onclick/click.dm @@ -167,10 +167,10 @@ animals lunging, etc. */ /mob/proc/RangedAttack(var/atom/A, var/params) - if(ishuman(src) && (istype(src:gloves, /obj/item/clothing/gloves/color/yellow/power)) && a_intent == "harm") + if(ishuman(src) && (istype(src:gloves, /obj/item/clothing/gloves/color/yellow/power)) && a_intent == I_HARM) PowerGlove(A) if(!mutations.len) return - if((LASER in mutations) && a_intent == "harm") + if((LASER in mutations) && a_intent == I_HARM) LaserEyes(A) // moved into a proc below return else diff --git a/code/_onclick/hud/screen_objects.dm b/code/_onclick/hud/screen_objects.dm index 3de689430a6..ebeeb392aac 100644 --- a/code/_onclick/hud/screen_objects.dm +++ b/code/_onclick/hud/screen_objects.dm @@ -333,16 +333,16 @@ if("act_intent") usr.a_intent_change("right") if("help") - usr.a_intent = "help" + usr.a_intent = I_HELP usr.hud_used.action_intent.icon_state = "intent_help" if("harm") - usr.a_intent = "harm" + usr.a_intent = I_HARM usr.hud_used.action_intent.icon_state = "intent_harm" if("grab") - usr.a_intent = "grab" + usr.a_intent = I_GRAB usr.hud_used.action_intent.icon_state = "intent_grab" if("disarm") - usr.a_intent = "disarm" + usr.a_intent = I_DISARM usr.hud_used.action_intent.icon_state = "intent_disarm" if("pull") @@ -378,7 +378,7 @@ if(isrobot(usr)) var/mob/living/silicon/robot/R = usr R.sensor_mode() - + if("Toggle Headlamp") if(isrobot(usr)) var/mob/living/silicon/robot/R = usr diff --git a/code/_onclick/oldcode.dm b/code/_onclick/oldcode.dm index 954d2eac3fd..17fb1005fa6 100644 --- a/code/_onclick/oldcode.dm +++ b/code/_onclick/oldcode.dm @@ -347,7 +347,7 @@ src.hand_al(usr, usr.hand) else // ------- YOU ARE CLICKING ON AN OBJECT THAT'S INACCESSIBLE TO YOU AND IS NOT YOUR HUD ------- - if((LASER in usr:mutations) && usr:a_intent == "harm" && world.time >= usr.next_move) + if((LASER in usr:mutations) && usr:a_intent == I_HARM && world.time >= usr.next_move) // ------- YOU HAVE THE LASER MUTATION, YOUR INTENT SET TO HURT AND IT'S BEEN MORE THAN A DECISECOND SINCE YOU LAS TATTACKED ------- var/turf/T = get_turf(usr) diff --git a/code/_onclick/other_mobs.dm b/code/_onclick/other_mobs.dm index 921fb8e818e..974025dbc1b 100644 --- a/code/_onclick/other_mobs.dm +++ b/code/_onclick/other_mobs.dm @@ -30,7 +30,7 @@ /mob/living/carbon/human/RangedAttack(var/atom/A) if(!gloves && !mutations.len) return var/obj/item/clothing/gloves/G = gloves - if((LASER in mutations) && a_intent == "harm") + if((LASER in mutations) && a_intent == I_HARM) LaserEyes(A) // moved into a proc below else if(istype(G) && G.Touch(A,0)) // for magic gloves diff --git a/code/game/dna/dna_misc.dm b/code/game/dna/dna_misc.dm index bc2098d77a6..b4c8bda8b9f 100644 --- a/code/game/dna/dna_misc.dm +++ b/code/game/dna/dna_misc.dm @@ -467,7 +467,7 @@ O.adjustToxLoss(M.getToxLoss() + 20) O.adjustOxyLoss(M.getOxyLoss()) O.stat = M.stat - O.a_intent = "harm" + O.a_intent = I_HARM for (var/obj/item/weapon/implant/I in implants) I.loc = O I.implanted = O diff --git a/code/game/dna/genes/goon_powers.dm b/code/game/dna/genes/goon_powers.dm index 06a16390fa7..ecdbd6fa2f2 100644 --- a/code/game/dna/genes/goon_powers.dm +++ b/code/game/dna/genes/goon_powers.dm @@ -562,13 +562,13 @@ thoughts = "haunted by their own mortality" switch(M.a_intent) - if ("help") + if (I_HELP) usr << "\blue Mood: You sense benevolent thoughts from [M.name]." - if ("disarm") + if (I_DISARM) usr << "\blue Mood: You sense cautious thoughts from [M.name]." - if ("grab") + if (I_GRAB) usr << "\blue Mood: You sense hostile thoughts from [M.name]." - if ("harm") + if (I_HARM) usr << "\blue Mood: You sense cruel thoughts from [M.name]." for(var/mob/living/L in view(7,M)) if (L == M) diff --git a/code/game/machinery/bots/bots.dm b/code/game/machinery/bots/bots.dm index 9b15852dfaa..f45ffa43de8 100644 --- a/code/game/machinery/bots/bots.dm +++ b/code/game/machinery/bots/bots.dm @@ -246,7 +246,7 @@ else user << "Maintenance panel is locked." else - if(istype(W, /obj/item/weapon/weldingtool) && user.a_intent != "harm") + if(istype(W, /obj/item/weapon/weldingtool) && user.a_intent != I_HARM) if(health >= maxhealth) user << "[src] does not need a repair." return diff --git a/code/game/machinery/bots/ed209bot.dm b/code/game/machinery/bots/ed209bot.dm index 33a3d45d849..36a2fdae614 100644 --- a/code/game/machinery/bots/ed209bot.dm +++ b/code/game/machinery/bots/ed209bot.dm @@ -186,7 +186,7 @@ Auto Patrol[]"}, user << "Access denied." else ..() - if(istype(W, /obj/item/weapon/weldingtool) && user.a_intent != "harm") // Any intent but harm will heal, so we shouldn't get angry. + if(istype(W, /obj/item/weapon/weldingtool) && user.a_intent != I_HARM) // Any intent but harm will heal, so we shouldn't get angry. return if (!istype(W, /obj/item/weapon/screwdriver) && (!target)) // Added check for welding tool to fix #2432. Welding tool behavior is handled in superclass. if(W.force)//If force is non-zero and damage type isn't stamina. diff --git a/code/game/machinery/bots/secbot.dm b/code/game/machinery/bots/secbot.dm index 90784f970c1..471f401d46f 100644 --- a/code/game/machinery/bots/secbot.dm +++ b/code/game/machinery/bots/secbot.dm @@ -192,7 +192,7 @@ Auto Patrol: []"}, user << " Access denied." else ..() - if(istype(W, /obj/item/weapon/weldingtool) && user.a_intent != "harm") // Any intent but harm will heal, so we shouldn't get angry. + if(istype(W, /obj/item/weapon/weldingtool) && user.a_intent != I_HARM) // Any intent but harm will heal, so we shouldn't get angry. return if(!istype(W, /obj/item/weapon/screwdriver) && (W.force) && (!target)) // Added check for welding tool to fix #2432. Welding tool behavior is handled in superclass. threatlevel = user.assess_threat(src) diff --git a/code/game/machinery/programmable_unloader.dm b/code/game/machinery/programmable_unloader.dm index 608279392b9..be221157b01 100644 --- a/code/game/machinery/programmable_unloader.dm +++ b/code/game/machinery/programmable_unloader.dm @@ -501,7 +501,7 @@ H << "The boxing machine refuses to acknowledge you unless you face it head on!" return var/damage = 0 - if(H.a_intent != "harm") + if(H.a_intent != I_HARM) damage += rand(0,5) else damage += rand(0,10) diff --git a/code/game/mecha/equipment/tools/tools.dm b/code/game/mecha/equipment/tools/tools.dm index 783513c62ac..05ae2c9b125 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 == "harm") + if(chassis.occupant.a_intent == I_HARM) M.take_overall_damage(dam_force) M.adjustOxyLoss(round(dam_force/2)) M.updatehealth() @@ -1058,10 +1058,10 @@ else if(istype(target,/mob/living)) var/mob/living/M = target if(M.stat>1) return - if(chassis.occupant.a_intent == "harm") + if(chassis.occupant.a_intent == I_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") + if(chassis.occupant.a_intent == I_DISARM) chassis.occupant_message("\red You tear [target]'s limbs off with [src.name].") chassis.visible_message("\red [chassis] rips [target]'s arms off.") else diff --git a/code/game/mecha/mecha.dm b/code/game/mecha/mecha.dm index 98a7b32f682..f78c1e61b17 100644 --- a/code/game/mecha/mecha.dm +++ b/code/game/mecha/mecha.dm @@ -844,7 +844,7 @@ user << "There's already a powercell installed." return - else if(istype(W, /obj/item/weapon/weldingtool) && user.a_intent != "harm") + else if(istype(W, /obj/item/weapon/weldingtool) && user.a_intent != I_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/policetape.dm b/code/game/objects/items/policetape.dm index 3420dd3acbd..488f958e17f 100644 --- a/code/game/objects/items/policetape.dm +++ b/code/game/objects/items/policetape.dm @@ -164,7 +164,7 @@ var/list/tape_roll_applications = list() breaktape(W, user) /obj/item/tape/attack_hand(mob/user as mob) - if (user.a_intent == "help" && src.allowed(user)) + if (user.a_intent == I_HELP && src.allowed(user)) user.show_viewers("\blue [user] lifts [src], allowing passage.") src.density = 0 spawn(200) @@ -176,7 +176,7 @@ var/list/tape_roll_applications = list() breaktape(/obj/item/weapon/wirecutters,user) /obj/item/tape/proc/breaktape(obj/item/weapon/W as obj, mob/user as mob) - if(user.a_intent == "help" && ((!can_puncture(W) && src.allowed(user)))) + if(user.a_intent == I_HELP && ((!can_puncture(W) && src.allowed(user)))) user << "You can't break the [src] with that!" return user.show_viewers("\blue [user] breaks the [src]!") diff --git a/code/game/objects/items/weapons/defib.dm b/code/game/objects/items/weapons/defib.dm index 22226dcdcea..51fe775d82c 100644 --- a/code/game/objects/items/weapons/defib.dm +++ b/code/game/objects/items/weapons/defib.dm @@ -320,7 +320,7 @@ user << "The instructions on [defib] don't mention how to revive that..." return else - if(user.a_intent == "harm" && !defib.safety) + if(user.a_intent == I_HARM && !defib.safety) busy = 1 H.visible_message("[user] has touched [H.name] with [src]!", \ "[user] has touched [H.name] with [src]!") @@ -435,7 +435,7 @@ user << "This unit is only designed to work on humanoid lifeforms." return else - if(user.a_intent == "harm" && !safety) + if(user.a_intent == I_HARM && !safety) busy = 1 H.visible_message("[user] has touched [H.name] with [src]!", \ "[user] has touched [H.name] with [src]!") diff --git a/code/game/objects/items/weapons/handcuffs.dm b/code/game/objects/items/weapons/handcuffs.dm index 1fc648e3e2c..fc6636b6561 100644 --- a/code/game/objects/items/weapons/handcuffs.dm +++ b/code/game/objects/items/weapons/handcuffs.dm @@ -63,7 +63,7 @@ var/last_chew = 0 var/mob/living/carbon/human/H = A if (!H.handcuffed) return - if (H.a_intent != "harm") + if (H.a_intent != I_HARM) return if (H.zone_sel.selecting != "mouth") return diff --git a/code/game/objects/items/weapons/kitchen.dm b/code/game/objects/items/weapons/kitchen.dm index db1f078e034..f1980d417c2 100644 --- a/code/game/objects/items/weapons/kitchen.dm +++ b/code/game/objects/items/weapons/kitchen.dm @@ -40,7 +40,7 @@ if(!istype(M)) return ..() - if(user.a_intent != "help") + if(user.a_intent != I_HELP) if(user.zone_sel.selecting == "head" || user.zone_sel.selecting == "eyes") if((CLUMSY in user.mutations) && prob(50)) M = user diff --git a/code/game/objects/items/weapons/stunbaton.dm b/code/game/objects/items/weapons/stunbaton.dm index 7273b9e107c..1416602d4fd 100644 --- a/code/game/objects/items/weapons/stunbaton.dm +++ b/code/game/objects/items/weapons/stunbaton.dm @@ -117,7 +117,7 @@ var/mob/living/L = M - if(user.a_intent != "harm") + if(user.a_intent != I_HARM) if(status) user.do_attack_animation(L) baton_stun(L, user) diff --git a/code/game/objects/items/weapons/swords_axes_etc.dm b/code/game/objects/items/weapons/swords_axes_etc.dm index d0619606d57..66683b26abe 100644 --- a/code/game/objects/items/weapons/swords_axes_etc.dm +++ b/code/game/objects/items/weapons/swords_axes_etc.dm @@ -126,7 +126,7 @@ return if(!isliving(target)) return - if (user.a_intent == "harm") + if (user.a_intent == I_HARM) if(!..()) return if(!isrobot(target)) return else diff --git a/code/game/objects/items/weapons/tools.dm b/code/game/objects/items/weapons/tools.dm index 5755d94f7c8..af98d810510 100644 --- a/code/game/objects/items/weapons/tools.dm +++ b/code/game/objects/items/weapons/tools.dm @@ -83,7 +83,7 @@ return /obj/item/weapon/screwdriver/attack(mob/living/carbon/M as mob, mob/living/carbon/user as mob) - if(!istype(M) || user.a_intent == "help") + if(!istype(M) || user.a_intent == I_HELP) return ..() if(user.zone_sel.selecting != "eyes" && user.zone_sel.selecting != "head") return ..() @@ -475,7 +475,7 @@ if (!S) return - if(!(S.status & ORGAN_ROBOT) || user.a_intent != "help" || S.open == 2) + if(!(S.status & ORGAN_ROBOT) || user.a_intent != I_HELP || S.open == 2) return ..() if(S.brute_dam) diff --git a/code/game/objects/structures/displaycase.dm b/code/game/objects/structures/displaycase.dm index 0e34ed14e68..5b5109a8b9c 100644 --- a/code/game/objects/structures/displaycase.dm +++ b/code/game/objects/structures/displaycase.dm @@ -195,7 +195,7 @@ circuit=null new /obj/machinery/constructable_frame/machine_frame(T) qdel(src) - if(user.a_intent == "harm") + if(user.a_intent == I_HARM) src.health -= W.force src.healthcheck() ..() @@ -219,7 +219,7 @@ src.add_fingerprint(user) update_icon() else - if(user.a_intent == "harm") + if(user.a_intent == I_HARM) user.changeNext_move(CLICK_CD_MELEE) user.do_attack_animation(src) user.visible_message("\red [user.name] kicks \the [src]!", \ diff --git a/code/game/objects/structures/stool_bed_chair_nest/wheelchair.dm b/code/game/objects/structures/stool_bed_chair_nest/wheelchair.dm index 956bc6d7d07..4af9b504ed3 100644 --- a/code/game/objects/structures/stool_bed_chair_nest/wheelchair.dm +++ b/code/game/objects/structures/stool_bed_chair_nest/wheelchair.dm @@ -133,7 +133,7 @@ ..() if(!buckled_mob) return - if(propelled || (pulling && (pulling.a_intent == "harm"))) + if(propelled || (pulling && (pulling.a_intent == I_HARM))) var/mob/living/occupant = buckled_mob unbuckle() diff --git a/code/game/objects/structures/tables_racks.dm b/code/game/objects/structures/tables_racks.dm index ae88b3b38f8..7c973eed7ec 100644 --- a/code/game/objects/structures/tables_racks.dm +++ b/code/game/objects/structures/tables_racks.dm @@ -299,8 +299,8 @@ user.do_attack_animation(src) visible_message("[user] slices [src] apart!") destroy() - -/obj/structure/table/mech_melee_attack(obj/mecha/M) + +/obj/structure/table/mech_melee_attack(obj/mecha/M) visible_message("[M] smashes [src] apart!") destroy() @@ -402,7 +402,7 @@ if (istype(G.affecting, /mob/living)) var/mob/living/M = G.affecting if (G.state < 2) - if(user.a_intent == "harm") + if(user.a_intent == I_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]!") @@ -914,8 +914,8 @@ visible_message("[user] smashes [src] apart!") user.say(pick(";RAAAAAAAARGH!", ";HNNNNNNNNNGGGGGGH!", ";GWAAAAAAAARRRHHH!", "NNNNNNNNGGGGGGGGHH!", ";AAAAAAARRRGH!" )) destroy() - -/obj/structure/rack/mech_melee_attack(obj/mecha/M) + +/obj/structure/rack/mech_melee_attack(obj/mecha/M) visible_message("[M] smashes [src] apart!") destroy() diff --git a/code/game/objects/structures/window.dm b/code/game/objects/structures/window.dm index f04ce3ab802..02aed69966e 100644 --- a/code/game/objects/structures/window.dm +++ b/code/game/objects/structures/window.dm @@ -119,7 +119,7 @@ var/global/wcCommon = pick(list("#379963", "#0d8395", "#58b5c3", "#49e46e", "#8f user.say(pick(";RAAAAAAAARGH!", ";HNNNNNNNNNGGGGGGH!", ";GWAAAAAAAARRRHHH!", "NNNNNNNNGGGGGGGGHH!", ";AAAAAAARRRGH!")) user.visible_message("[user] smashes through [src]!") destroy() - else if (usr.a_intent == "harm") + else if (usr.a_intent == I_HARM) user.changeNext_move(CLICK_CD_MELEE) playsound(get_turf(src), 'sound/effects/glassknock.ogg', 80, 1) usr.visible_message("\red [usr.name] bangs against the [src.name]!", \ diff --git a/code/modules/clothing/under/accessories/accessory.dm b/code/modules/clothing/under/accessories/accessory.dm index ba2e2f7f723..2f6fb17f314 100644 --- a/code/modules/clothing/under/accessories/accessory.dm +++ b/code/modules/clothing/under/accessories/accessory.dm @@ -80,7 +80,7 @@ /obj/item/clothing/accessory/stethoscope/attack(mob/living/carbon/human/M, mob/living/user) if(ishuman(M) && isliving(user)) - if(user.a_intent == "help") + if(user.a_intent == I_HELP) var/body_part = parse_zone(user.zone_sel.selecting) if(body_part) var/their = "their" diff --git a/code/modules/fish/fishtank.dm b/code/modules/fish/fishtank.dm index f27a5c320a7..55a89f36789 100644 --- a/code/modules/fish/fishtank.dm +++ b/code/modules/fish/fishtank.dm @@ -491,7 +491,7 @@ /obj/machinery/fishtank/attack_animal(mob/living/simple_animal/M as mob) if(istype(M, /mob/living/simple_animal/pet/cat)) - if(M.a_intent == "help") //Cats can try to fish in open tanks on help intent + if(M.a_intent == I_HELP) //Cats can try to fish in open tanks on help intent if(lid_switch) //Can't fish in a closed tank. Fishbowls are ALWAYS open. M.visible_message("[M.name] stares at into \the [src] while sitting perfectly still.", "The lid is closed, so you stare into \the [src] intently.") else @@ -513,7 +513,7 @@ else attack_generic(M, M.harm_intent_damage) else if(istype(M, /mob/living/simple_animal/hostile/bear)) - if(M.a_intent == "help") //Bears can try to fish in open tanks on help intent + if(M.a_intent == I_HELP) //Bears can try to fish in open tanks on help intent if(lid_switch) //Can't fish in a closed tank. Fishbowls are ALWAYS open. M.visible_message("[M.name] scrapes it's claws along \the [src]'s lid.", "The lid is closed, so you scrape your claws against \the [src]'s lid.") else @@ -533,7 +533,7 @@ else if(M.melee_damage_upper > 0) //If the simple_animal has a melee_damage_upper defined, use that for the damage attack_generic(M, M.melee_damage_upper) - else if(M.a_intent == "harm") //Let any simple_animal try to break tanks when on harm intent + else if(M.a_intent == I_HARM) //Let any simple_animal try to break tanks when on harm intent if(M.harm_intent_damage <= 0) return //If it doesn't do damage, don't bother with the attack attack_generic(M, M.harm_intent_damage) check_health() @@ -553,7 +553,7 @@ user.say(pick(";RAAAAAAAARGH!", ";HNNNNNNNNNGGGGGGH!", ";GWAAAAAAAARRRHHH!", "NNNNNNNNGGGGGGGGHH!", ";AAAAAAARRRGH!")) user.visible_message("[user] smashes through [src]!") destroy() - else if (usr.a_intent == "harm") + else if (usr.a_intent == I_HARM) user.changeNext_move(CLICK_CD_MELEE) playsound(get_turf(src), 'sound/effects/glassknock.ogg', 80, 1) usr.visible_message("[usr.name] bangs against the [src.name]!", \ @@ -589,7 +589,7 @@ //Welders repair damaged tanks on help intent, damage on all others if(istype(O, /obj/item/weapon/weldingtool)) var/obj/item/weapon/weldingtool/W = O - if(user.a_intent == "help") + if(user.a_intent == I_HELP) if(W.isOn()) if(cur_health < max_health) usr << "You repair some of the cracks on \the [src]." diff --git a/code/modules/hydroponics/grown.dm b/code/modules/hydroponics/grown.dm index f494d7336db..9f0f22f8bcc 100644 --- a/code/modules/hydroponics/grown.dm +++ b/code/modules/hydroponics/grown.dm @@ -294,7 +294,7 @@ if(user == M) return ..() - if(user.a_intent == "harm") + if(user.a_intent == I_HARM) // This is being copypasted here because reagent_containers (WHY DOES FOOD DESCEND FROM THAT) overrides it completely. // TODO: refactor all food paths to be less horrible and difficult to work with in this respect. ~Z @@ -359,7 +359,7 @@ if(istype(user.loc,/turf/space)) return - if(user.a_intent == "harm") + if(user.a_intent == I_HARM) user.visible_message("\The [user] squashes \the [src]!") seed.thrown_at(src,user) sleep(-1) diff --git a/code/modules/mining/equipment_locker.dm b/code/modules/mining/equipment_locker.dm index 1bfe96094db..67eb53c2e0d 100644 --- a/code/modules/mining/equipment_locker.dm +++ b/code/modules/mining/equipment_locker.dm @@ -31,7 +31,7 @@ component_parts += new /obj/item/device/assembly/igniter(null) component_parts += new /obj/item/weapon/stock_parts/console_screen(null) RefreshParts() - + /obj/machinery/mineral/ore_redemption/upgraded/New() ..() component_parts = list() @@ -604,7 +604,7 @@ stop_automated_movement_when_pulled = 1 mouse_opacity = 1 faction = list("neutral") - a_intent = "harm" + a_intent = I_HARM min_oxy = 0 max_oxy = 0 min_tox = 0 @@ -668,7 +668,7 @@ SetCollectBehavior() /mob/living/simple_animal/hostile/mining_drone/attack_hand(mob/living/carbon/human/M) - if(M.a_intent == "help") + if(M.a_intent == I_HELP) switch(search_objects) if(0) SetCollectBehavior() diff --git a/code/modules/mob/living/carbon/alien/alien_defenses.dm b/code/modules/mob/living/carbon/alien/alien_defenses.dm index 6c670bc7fe5..8d0c36bc05d 100644 --- a/code/modules/mob/living/carbon/alien/alien_defenses.dm +++ b/code/modules/mob/living/carbon/alien/alien_defenses.dm @@ -16,7 +16,7 @@ In all, this is a lot like the monkey code. /N switch(M.a_intent) - if ("help") + if (I_HELP) sleeping = max(0,sleeping-5) resting = 0 AdjustParalysis(-3) @@ -24,7 +24,7 @@ In all, this is a lot like the monkey code. /N AdjustWeakened(-3) visible_message("[M.name] nuzzles [src] trying to wake it up!") - if ("grab") + if (I_GRAB) src.grabbedby(M) return 1 @@ -53,11 +53,11 @@ In all, this is a lot like the monkey code. /N return 0 //this is horrible but 100% necessary switch(M.a_intent) - if("help") + if(I_HELP) help_shake_act(M) - if("grab") + if(I_GRAB) src.grabbedby(M) - if ("harm", "disarm") + if (I_HARM, I_DISARM) return 1 return 0 diff --git a/code/modules/mob/living/carbon/alien/humanoid/humanoid.dm b/code/modules/mob/living/carbon/alien/humanoid/humanoid.dm index b88004e4a2d..5e3302042f6 100644 --- a/code/modules/mob/living/carbon/alien/humanoid/humanoid.dm +++ b/code/modules/mob/living/carbon/alien/humanoid/humanoid.dm @@ -198,13 +198,13 @@ switch(M.a_intent) - if ("help") + if (I_HELP) help_shake_act(M) - if ("grab") + if (I_GRAB) grabbedby(M) - if ("harm") + if (I_HARM) M.do_attack_animation(src) var/damage = rand(1, 9) if (prob(90)) @@ -229,7 +229,7 @@ playsound(loc, 'sound/weapons/punchmiss.ogg', 25, 1, -1) visible_message("[M] has attempted to punch [src]!") - if ("disarm") + if (I_DISARM) if (!lying) if (prob(5))//Very small chance to push an alien down. Paralyse(2) @@ -265,7 +265,7 @@ In all, this is a lot like the monkey code. /N switch(M.a_intent) - if ("help") + if (I_HELP) sleeping = max(0,sleeping-5) resting = 0 AdjustParalysis(-3) @@ -291,7 +291,7 @@ In all, this is a lot like the monkey code. /N /mob/living/carbon/alien/humanoid/attack_larva(mob/living/carbon/alien/larva/L as mob) switch(L.a_intent) - if("help") + if(I_HELP) visible_message("[L] rubs its head against [src].") diff --git a/code/modules/mob/living/carbon/alien/larva/larva.dm b/code/modules/mob/living/carbon/alien/larva/larva.dm index 8f098b64cdf..f9a2b945410 100644 --- a/code/modules/mob/living/carbon/alien/larva/larva.dm +++ b/code/modules/mob/living/carbon/alien/larva/larva.dm @@ -159,22 +159,11 @@ switch(M.a_intent) - if ("help") + if (I_HELP) help_shake_act(M) - if ("grab") - if (M == src || anchored) - return - var/obj/item/weapon/grab/G = new /obj/item/weapon/grab(M, src ) - - M.put_in_active_hand(G) - - G.synch() - - LAssailant = M - - playsound(loc, 'sound/weapons/thudswoosh.ogg', 50, 1, -1) - visible_message("[M] has grabbed [src] passively!") + if (I_GRAB) + grabbedby(M) else M.do_attack_animation(src) @@ -216,7 +205,7 @@ switch(M.a_intent) - if ("help") + if (I_HELP) sleeping = max(0,sleeping-5) resting = 0 AdjustParalysis(-3) diff --git a/code/modules/mob/living/carbon/human/human.dm b/code/modules/mob/living/carbon/human/human.dm index a63f487aec7..cc287c81a21 100644 --- a/code/modules/mob/living/carbon/human/human.dm +++ b/code/modules/mob/living/carbon/human/human.dm @@ -181,7 +181,7 @@ return //BubbleWrap: people in handcuffs are always switched around as if they were on 'help' intent to prevent a person being pulled from being seperated from their puller - if((tmob.a_intent == "help" || tmob.restrained()) && (a_intent == "help" || src.restrained()) && tmob.canmove && !tmob.buckled && canmove) // mutual brohugs all around! + if((tmob.a_intent == I_HELP || tmob.restrained()) && (a_intent == I_HELP || src.restrained()) && tmob.canmove && !tmob.buckled && canmove) // mutual brohugs all around! var/turf/oldloc = loc loc = tmob.loc tmob.loc = oldloc @@ -414,7 +414,7 @@ /mob/living/carbon/human/attack_larva(mob/living/carbon/alien/larva/L as mob) switch(L.a_intent) - if("help") + if(I_HELP) visible_message("[L] rubs its head against [src].") @@ -431,7 +431,7 @@ var/armor_block = run_armor_check(affecting, "melee") apply_damage(damage, BRUTE, affecting, armor_block) -/mob/living/carbon/human/proc/is_loyalty_implanted() +/mob/living/carbon/human/proc/is_loyalty_implanted() for(var/L in contents) if(istype(L, /obj/item/weapon/implant/loyalty)) for(var/obj/item/organ/external/O in organs) @@ -694,7 +694,7 @@ // if looting pockets with gloves, do it quietly if(href_list["pockets"]) - if(isanimal(usr)) + if(isanimal(usr)) return //animals cannot strip people if(frozen) @@ -726,19 +726,19 @@ // Update strip window if(usr.machine == src && in_range(src, usr)) show_inv(usr) - + else if(!pickpocket) // Display a warning if the user mocks up src << "You feel your [pocket_side] pocket being fumbled with!" // if looting id with gloves, do it quietly - this allows pickpocket gloves to take/place id stealthily - Bone White if(href_list["item"]) - if(isanimal(usr)) + if(isanimal(usr)) return //animals cannot strip people - + if(frozen) usr << "\red Do not attempt to strip frozen people." - return + return var/itemTarget = href_list["item"] if(itemTarget == "id") if(pickpocket) @@ -1158,7 +1158,7 @@ if(!fail_msg) fail_msg = "There is no exposed flesh or thin material [target_zone == "head" ? "on their head" : "on their body"] to inject into." user << "[fail_msg]" - + /mob/living/carbon/human/proc/check_has_mouth() // Todo, check stomach organ when implemented. var/obj/item/organ/external/head/H = get_organ("head") @@ -1170,7 +1170,7 @@ if(stat==DEAD)return if(!check_has_mouth()) - return + return if(!lastpuke) lastpuke = 1 @@ -1517,16 +1517,16 @@ W.add_fingerprint(src) -// Allows IPC's to change their monitor display +// Allows IPC's to change their monitor display /mob/living/carbon/human/proc/change_monitor() - set category = "IC" + set category = "IC" set name = "Change Monitor Display" set desc = "Change the display on your monitor." - + if(stat || paralysis || stunned || weakened) src << "You cannot change your monitor display in your current state." - return - + return + var/list/hair = list() for(var/i in hair_styles_list) var/datum/sprite_accessory/hair/tmp_hair = hair_styles_list[i] @@ -1540,7 +1540,7 @@ h_style = new_style update_hair() - + //Putting a couple of procs here that I don't know where else to dump. //Mostly going to be used for Vox and Vox Armalis, but other human mobs might like them (for adminbuse). /mob/living/carbon/human/proc/leap() diff --git a/code/modules/mob/living/carbon/human/human_attackalien.dm b/code/modules/mob/living/carbon/human/human_attackalien.dm index c09901e8dcb..e40030c9e0f 100644 --- a/code/modules/mob/living/carbon/human/human_attackalien.dm +++ b/code/modules/mob/living/carbon/human/human_attackalien.dm @@ -4,12 +4,12 @@ return 0 switch(M.a_intent) - if ("help") + if (I_HELP) visible_message(text("\blue [M] caresses [src] with its scythe like arm.")) - if ("grab") + if (I_GRAB) grabbedby(M) - if("harm") + if(I_HARM) M.do_attack_animation(src) if (w_uniform) w_uniform.add_fingerprint(M) @@ -30,7 +30,7 @@ apply_effect(4, WEAKEN, armor_block) updatehealth() - if("disarm") + if(I_DISARM) M.do_attack_animation(src) var/randn = rand(1, 100) if (randn <= 80) diff --git a/code/modules/mob/living/carbon/human/human_attackhand.dm b/code/modules/mob/living/carbon/human/human_attackhand.dm index fe466cb1c74..c863249b79a 100644 --- a/code/modules/mob/living/carbon/human/human_attackhand.dm +++ b/code/modules/mob/living/carbon/human/human_attackhand.dm @@ -58,7 +58,7 @@ species.handle_attack_hand(src,M) switch(M.a_intent) - if("help") + if(I_HELP) if(health >= config.health_threshold_crit) help_shake_act(M) add_logs(src, M, "shaked") @@ -88,14 +88,14 @@ add_logs(src, M, "CPRed") return 1 - if("grab") + if(I_GRAB) if(attacker_style && attacker_style.grab_act(H, src)) return 1 else src.grabbedby(M) return 1 - if("harm") + if(I_HARM) if(attacker_style && attacker_style.harm_act(H, src)) return 1 else @@ -163,7 +163,7 @@ forcesay(hit_appends) - if("disarm") + if(I_DISARM) if(attacker_style && attacker_style.disarm_act(H, src)) return 1 else diff --git a/code/modules/mob/living/carbon/human/human_defense.dm b/code/modules/mob/living/carbon/human/human_defense.dm index 036dcc78803..3036d0252a8 100644 --- a/code/modules/mob/living/carbon/human/human_defense.dm +++ b/code/modules/mob/living/carbon/human/human_defense.dm @@ -35,10 +35,10 @@ emp_act if(check_shields(P.damage, "the [P.name]", P)) P.on_hit(src, 100, def_zone) return 2 - + var/obj/item/organ/external/organ = get_organ(check_zone(def_zone)) if(isnull(organ)) - return + return //Shrapnel if (P.damage_type == BRUTE) @@ -221,7 +221,7 @@ emp_act /mob/living/carbon/human/proc/attacked_by(var/obj/item/I, var/mob/living/user, var/def_zone) if(!I || !user) return 0 - if((istype(I, /obj/item/weapon/butch/meatcleaver) || istype(I, /obj/item/weapon/twohanded/chainsaw)) && src.stat == DEAD && user.a_intent == "harm") + if((istype(I, /obj/item/weapon/butch/meatcleaver) || istype(I, /obj/item/weapon/twohanded/chainsaw)) && src.stat == DEAD && user.a_intent == I_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 @@ -465,7 +465,7 @@ emp_act if(penetrated_dam) SS.create_breaches(damtype, penetrated_dam) /mob/living/carbon/human/mech_melee_attack(obj/mecha/M) - if(M.occupant.a_intent == "harm") + if(M.occupant.a_intent == I_HARM) if(M.damtype == "brute") step_away(src,M,15) var/obj/item/organ/external/affecting = get_organ(pick("chest", "chest", "chest", "head")) @@ -493,7 +493,7 @@ emp_act attack_log += text("\[[time_stamp()]\] Has been attacked by \the [M] controlled by [key_name(M.occupant)] (INTENT: [uppertext(M.occupant.a_intent)])") M.occupant.attack_log += text("\[[time_stamp()]\] Attacked [src] with \the [M] (INTENT: [uppertext(M.occupant.a_intent)])") msg_admin_attack("[key_name_admin(M.occupant)] attacked [key_name_admin(src)] with \the [M] (INTENT: [uppertext(M.occupant.a_intent)])") - + else ..() diff --git a/code/modules/mob/living/carbon/human/species/apollo.dm b/code/modules/mob/living/carbon/human/species/apollo.dm index 8289d8bc267..f5445b80543 100644 --- a/code/modules/mob/living/carbon/human/species/apollo.dm +++ b/code/modules/mob/living/carbon/human/species/apollo.dm @@ -51,7 +51,7 @@ C << "It feels like part of you has died." /datum/species/wryn/handle_attack_hand(var/mob/living/carbon/human/H, var/mob/living/carbon/human/M) - if(M.a_intent == "harm") + if(M.a_intent == I_HARM) if(H.handcuffed) if(!(locate(H.internal_organs_by_name["antennae"]) in H.internal_organs)) return var/turf/p_loc = M.loc diff --git a/code/modules/mob/living/carbon/metroid/metroid.dm b/code/modules/mob/living/carbon/metroid/metroid.dm index 93a478f5829..078305a654d 100644 --- a/code/modules/mob/living/carbon/metroid/metroid.dm +++ b/code/modules/mob/living/carbon/metroid/metroid.dm @@ -270,7 +270,7 @@ switch(L.a_intent) - if("help") + if(I_HELP) visible_message("[L] rubs its head against [src].") @@ -366,22 +366,11 @@ switch(M.a_intent) - if ("help") + if (I_HELP) help_shake_act(M) - if ("grab") - if (M == src || anchored) - return - var/obj/item/weapon/grab/G = new /obj/item/weapon/grab(M, src) - - M.put_in_active_hand(G) - - G.synch() - - LAssailant = M - - playsound(loc, 'sound/weapons/thudswoosh.ogg', 50, 1, -1) - visible_message("[M] has grabbed [src] passively!") + if (I_GRAB) + grabbedby(M) else M.do_attack_animation(src) @@ -427,10 +416,10 @@ return switch(M.a_intent) - if ("help") + if (I_HELP) visible_message("[M] caresses [src] with its scythe like arm.") - if ("harm") + if (I_HARM) M.do_attack_animation(src) if (prob(95)) attacked += 10 @@ -450,21 +439,10 @@ visible_message("[M] has attempted to lunge at [name]!", \ "[M] has attempted to lunge at [name]!") - if ("grab") - if (M == src || anchored) - return - var/obj/item/weapon/grab/G = new /obj/item/weapon/grab(M, src ) + if (I_GRAB) + grabbedby(M) - M.put_in_active_hand(G) - - G.synch() - - LAssailant = M - - playsound(loc, 'sound/weapons/thudswoosh.ogg', 50, 1, -1) - visible_message(" [M] has grabbed [name] passively!") - - if ("disarm") + if (I_DISARM) M.do_attack_animation(src) playsound(loc, 'sound/weapons/pierce.ogg', 25, 1, -1) var/damage = 5 diff --git a/code/modules/mob/living/living_defense.dm b/code/modules/mob/living/living_defense.dm index d1017431eb8..5737aad1c6c 100644 --- a/code/modules/mob/living/living_defense.dm +++ b/code/modules/mob/living/living_defense.dm @@ -146,7 +146,7 @@ src.pinned += O /mob/living/mech_melee_attack(obj/mecha/M) - if(M.occupant.a_intent == "harm") + if(M.occupant.a_intent == I_HARM) if(M.damtype == "brute") step_away(src,M,15) switch(M.damtype) @@ -168,9 +168,9 @@ attack_log += text("\[[time_stamp()]\] Has been attacked by \the [M] controlled by [key_name(M.occupant)] (INTENT: [uppertext(M.occupant.a_intent)])") M.occupant.attack_log += text("\[[time_stamp()]\] Attacked [src] with \the [M] (INTENT: [uppertext(M.occupant.a_intent)])") msg_admin_attack("[key_name_admin(M.occupant)] attacked [key_name_admin(src)] with \the [M] (INTENT: [uppertext(M.occupant.a_intent)])") - + else - + step_away(src,M) add_logs(M.occupant, src, "pushed", object=M, admin=0) M.occupant_message("You push [src] out of the way.") diff --git a/code/modules/mob/living/silicon/ai/ai.dm b/code/modules/mob/living/silicon/ai/ai.dm index 19fb4b6f513..6992e7d91e6 100644 --- a/code/modules/mob/living/silicon/ai/ai.dm +++ b/code/modules/mob/living/silicon/ai/ai.dm @@ -91,7 +91,7 @@ var/list/ai_verbs_default = list( /mob/living/silicon/ai/proc/add_ai_verbs() src.verbs |= ai_verbs_default src.verbs |= silicon_subsystems - + /mob/living/silicon/ai/proc/remove_ai_verbs() src.verbs -= ai_verbs_default src.verbs -= silicon_subsystems @@ -551,7 +551,7 @@ var/list/ai_verbs_default = list( switch(M.a_intent) - if ("help") + if (I_HELP) visible_message("[M] caresses [src]'s plating with its scythe like arm.") else //harm @@ -960,7 +960,7 @@ var/list/ai_verbs_default = list( /mob/living/silicon/ai/proc/is_in_chassis() return istype(loc, /turf) - + /mob/living/silicon/ai/transfer_ai(var/interaction, var/mob/user, var/mob/living/silicon/ai/AI, var/obj/item/device/aicard/card) if(!..()) return diff --git a/code/modules/mob/living/silicon/mommi/mommi.dm b/code/modules/mob/living/silicon/mommi/mommi.dm index fa3f2c45d82..9fe7884ff29 100644 --- a/code/modules/mob/living/silicon/mommi/mommi.dm +++ b/code/modules/mob/living/silicon/mommi/mommi.dm @@ -338,7 +338,7 @@ They can only use one tool at a time, they can't choose modules, and they have 1 if(ishuman(user)) - if(user.a_intent == "help") + if(user.a_intent == I_HELP) user.visible_message("\blue [user.name] pats [src.name] on the head.") return @@ -346,7 +346,7 @@ They can only use one tool at a time, they can't choose modules, and they have 1 if(!istype(user, /mob/living/silicon)) switch(user.a_intent) - if("disarm") + if(I_DISARM) user.attack_log += text("\[[time_stamp()]\] Disarmed [src.name] ([src.ckey])") src.attack_log += text("\[[time_stamp()]\] Has been disarmed by [user.name] ([user.ckey])") log_admin("ATTACK: [user.name] ([user.ckey]) disarmed [src.name] ([src.ckey])") diff --git a/code/modules/mob/living/silicon/pai/pai.dm b/code/modules/mob/living/silicon/pai/pai.dm index 4dc1758066f..79ead634085 100644 --- a/code/modules/mob/living/silicon/pai/pai.dm +++ b/code/modules/mob/living/silicon/pai/pai.dm @@ -231,7 +231,7 @@ switch(M.a_intent) - if ("help") + if (I_HELP) for(var/mob/O in viewers(src, null)) if ((O.client && !( O.blinded ))) O.show_message(text("\blue [M] caresses [src]'s casing with its scythe like arm."), 1) @@ -281,7 +281,7 @@ medicalActive2 = null medical_cannotfind = 0 nanomanager.update_uis(src) - usr << "You reset your record-viewing software." + usr << "You reset your record-viewing software." /mob/living/silicon/pai/cancel_camera() set category = "pAI Commands" @@ -554,12 +554,12 @@ /mob/living/silicon/pai/MouseDrop(atom/over_object) var/mob/living/carbon/H = over_object if(!istype(H) || !Adjacent(H)) return ..() - if(H.a_intent == "help") + if(H.a_intent == I_HELP) get_scooped(H) //return else return ..() - + /mob/living/silicon/pai/on_forcemove(atom/newloc) if(card) card.loc = newloc diff --git a/code/modules/mob/living/silicon/robot/drone/drone_abilities.dm b/code/modules/mob/living/silicon/robot/drone/drone_abilities.dm index 93a5b2c46f2..50b846c0192 100644 --- a/code/modules/mob/living/silicon/robot/drone/drone_abilities.dm +++ b/code/modules/mob/living/silicon/robot/drone/drone_abilities.dm @@ -45,7 +45,7 @@ //Actual picking-up event. /mob/living/silicon/robot/drone/attack_hand(mob/living/carbon/human/M as mob) - if(M.a_intent == "help") + if(M.a_intent == I_HELP) get_scooped(M) ..() \ No newline at end of file diff --git a/code/modules/mob/living/silicon/robot/robot.dm b/code/modules/mob/living/silicon/robot/robot.dm index df492ba3c1f..29691e3d53f 100644 --- a/code/modules/mob/living/silicon/robot/robot.dm +++ b/code/modules/mob/living/silicon/robot/robot.dm @@ -73,11 +73,11 @@ var/list/robot_verbs_default = list( var/braintype = "Cyborg" var/base_icon = "" var/crisis = 0 - + var/lamp_max = 10 //Maximum brightness of a borg lamp. Set as a var for easy adjusting. var/lamp_intensity = 0 //Luminosity of the headlamp. 0 is off. Higher settings than the minimum require power. var/lamp_recharging = 0 //Flag for if the lamp is on cooldown after being forcibly disabled. - + var/jetpackoverlay = 0 var/magpulse = 0 @@ -163,8 +163,8 @@ var/list/robot_verbs_default = list( /mob/living/silicon/robot/SetName(pickedName as text) custom_name = pickedName - updatename() - + updatename() + /mob/living/silicon/robot/proc/sync() if(lawupdate && connected_ai) lawsync() @@ -578,8 +578,8 @@ var/list/robot_verbs_default = list( return - if (istype(W, /obj/item/weapon/weldingtool) && user.a_intent == "help") - if(W == module_active) + if (istype(W, /obj/item/weapon/weldingtool) && user.a_intent == I_HELP) + if(W == module_active) return if (!getBruteLoss()) user << "Nothing to fix!" @@ -597,7 +597,7 @@ var/list/robot_verbs_default = list( return - else if(istype(W, /obj/item/stack/cable_coil) && user.a_intent == "help" && (wiresexposed || istype(src,/mob/living/silicon/robot/drone))) + else if(istype(W, /obj/item/stack/cable_coil) && user.a_intent == I_HELP && (wiresexposed || istype(src,/mob/living/silicon/robot/drone))) if (!getFireLoss()) user << "Nothing to fix!" return @@ -825,23 +825,15 @@ var/list/robot_verbs_default = list( switch(M.a_intent) - if ("help") + if (I_HELP) for(var/mob/O in viewers(src, null)) if ((O.client && !( O.blinded ))) O.show_message(text("[M] caresses [src]'s plating with its scythe like arm."), 1) - if ("grab") - if (M == src || anchored) - return - var/obj/item/weapon/grab/G = new /obj/item/weapon/grab(M, src ) + if (I_GRAB) + grabbedby(M) - M.put_in_active_hand(G) - - G.synch() - playsound(loc, 'sound/weapons/thudswoosh.ogg', 50, 1, -1) - visible_message("[M] has grabbed [src] passively!") - - if ("harm") + if (I_HARM) M.do_attack_animation(src) var/damage = rand(10, 20) if (prob(90)) @@ -857,7 +849,7 @@ var/list/robot_verbs_default = list( visible_message("[M] took a swipe at [src]!", \ "[M] took a swipe at [src]!") - if ("disarm") + if (I_DISARM) if(!(lying)) M.do_attack_animation(src) if (prob(85)) @@ -923,7 +915,7 @@ var/list/robot_verbs_default = list( update_icons() if(!opened && (!istype(user, /mob/living/silicon))) - if (user.a_intent == "help") + if (user.a_intent == I_HELP) user.visible_message("[user] pets [src]!", \ "You pet [src]!") @@ -986,7 +978,7 @@ var/list/robot_verbs_default = list( icon_state = "[base_icon]-roll" else icon_state = base_icon - + if(jetpackoverlay) overlays += "minerjetpack-[icon_state]" update_fire() @@ -1124,7 +1116,7 @@ var/list/robot_verbs_default = list( if(lamp_button) lamp_button.icon_state = "lamp[lamp_intensity]" - update_icons() + update_icons() /mob/living/silicon/robot/Move(a, b, flag) @@ -1188,7 +1180,7 @@ var/list/robot_verbs_default = list( // Instead of being listed as "deactivated". The downside is that I'm going // to have to check if every camera is null or not before doing anything, to prevent runtime errors. // I could change the network to null but I don't know what would happen, and it seems too hacky for me. - + /mob/living/silicon/robot/proc/ResetSecurityCodes() set category = "Robot Commands" set name = "Reset Identity Codes" @@ -1368,7 +1360,7 @@ var/list/robot_verbs_default = list( connected_ai << "

NOTICE - Cyborg module change detected: [name] has loaded the [designation] module.
" if(3) //New Name connected_ai << "

NOTICE - Cyborg reclassification detected: [oldname] is now designated as [newname].
" - + /mob/living/silicon/robot/proc/disconnect_from_ai() if(connected_ai) sync() // One last sync attempt @@ -1381,4 +1373,4 @@ var/list/robot_verbs_default = list( connected_ai = AI connected_ai.connected_robots |= src notify_ai(1) - sync() + sync() diff --git a/code/modules/mob/living/simple_animal/borer.dm b/code/modules/mob/living/simple_animal/borer.dm index 68216b57736..3e0c3605eda 100644 --- a/code/modules/mob/living/simple_animal/borer.dm +++ b/code/modules/mob/living/simple_animal/borer.dm @@ -42,7 +42,7 @@ icon_living = "brainslug" icon_dead = "brainslug_dead" speed = 5 - a_intent = "harm" + a_intent = I_HARM stop_automated_movement = 1 status_flags = CANPUSH attacktext = "nips" diff --git a/code/modules/mob/living/simple_animal/constructs.dm b/code/modules/mob/living/simple_animal/constructs.dm index be304fc4cd8..cc5c5d930e9 100644 --- a/code/modules/mob/living/simple_animal/constructs.dm +++ b/code/modules/mob/living/simple_animal/constructs.dm @@ -10,7 +10,7 @@ response_harm = "punches" icon_dead = "shade_dead" speed = 0 - a_intent = "harm" + a_intent = I_HARM stop_automated_movement = 1 status_flags = CANPUSH attack_sound = 'sound/weapons/punch1.ogg' diff --git a/code/modules/mob/living/simple_animal/friendly/corgi.dm b/code/modules/mob/living/simple_animal/friendly/corgi.dm index 85599a57af8..ac707426430 100644 --- a/code/modules/mob/living/simple_animal/friendly/corgi.dm +++ b/code/modules/mob/living/simple_animal/friendly/corgi.dm @@ -595,8 +595,8 @@ /mob/living/simple_animal/pet/corgi/attack_hand(mob/living/carbon/human/M) . = ..() switch(M.a_intent) - if("help") wuv(1,M) - if("harm") wuv(-1,M) + if(I_HELP) wuv(1,M) + if(I_HARM) wuv(-1,M) /mob/living/simple_animal/pet/corgi/proc/wuv(change, mob/M) if(change) diff --git a/code/modules/mob/living/simple_animal/friendly/diona.dm b/code/modules/mob/living/simple_animal/friendly/diona.dm index 4f9ce5fef68..45cc9a73f66 100644 --- a/code/modules/mob/living/simple_animal/friendly/diona.dm +++ b/code/modules/mob/living/simple_animal/friendly/diona.dm @@ -50,7 +50,7 @@ /mob/living/simple_animal/diona/attack_hand(mob/living/carbon/human/M as mob) //Let people pick the little buggers up. - if(M.a_intent == "help") + if(M.a_intent == I_HELP) if(M.species && M.species.name == "Diona") M << "You feel your being twine with that of [src] as it merges with your biomass." src << "You feel your being twine with that of [M] as you merge with its biomass." diff --git a/code/modules/mob/living/simple_animal/friendly/farm_animals.dm b/code/modules/mob/living/simple_animal/friendly/farm_animals.dm index 238ef2c5852..c380fba0ea2 100644 --- a/code/modules/mob/living/simple_animal/friendly/farm_animals.dm +++ b/code/modules/mob/living/simple_animal/friendly/farm_animals.dm @@ -137,7 +137,7 @@ milk_content = min(50, milk_content+rand(5, 10)) /mob/living/simple_animal/cow/attack_hand(mob/living/carbon/M as mob) - if(!stat && M.a_intent == "disarm" && icon_state != icon_dead) + if(!stat && M.a_intent == I_DISARM && icon_state != icon_dead) M.visible_message("[M] tips over [src].","You tip over [src].") Weaken(30) icon_state = icon_dead diff --git a/code/modules/mob/living/simple_animal/hostile/alien.dm b/code/modules/mob/living/simple_animal/hostile/alien.dm index 3ec2633e2e9..4659c1b4dd1 100644 --- a/code/modules/mob/living/simple_animal/hostile/alien.dm +++ b/code/modules/mob/living/simple_animal/hostile/alien.dm @@ -19,7 +19,7 @@ melee_damage_upper = 25 attacktext = "slashes" speak_emote = list("hisses") - a_intent = "harm" + a_intent = I_HARM attack_sound = 'sound/weapons/bladeslice.ogg' min_oxy = 0 max_oxy = 0 diff --git a/code/modules/mob/living/simple_animal/hostile/mining_mobs.dm b/code/modules/mob/living/simple_animal/hostile/mining_mobs.dm index 3522cce7bc0..d83770ffc8b 100644 --- a/code/modules/mob/living/simple_animal/hostile/mining_mobs.dm +++ b/code/modules/mob/living/simple_animal/hostile/mining_mobs.dm @@ -17,7 +17,7 @@ response_disarm = "shoves" response_harm = "strikes" status_flags = 0 - a_intent = "harm" + a_intent = I_HARM var/throw_message = "bounces off of" var/icon_aggro = null // for swapping to when we get aggressive see_in_dark = 8 @@ -73,7 +73,7 @@ melee_damage_lower = 12 melee_damage_upper = 12 attacktext = "bites into" - a_intent = "harm" + a_intent = I_HARM speak_emote = list("chitters") attack_sound = 'sound/weapons/bladeslice.ogg' ranged_cooldown_cap = 4 @@ -140,7 +140,7 @@ melee_damage_upper = 0 attacktext = "barrels into" attack_sound = 'sound/weapons/punch1.ogg' - a_intent = "help" + a_intent = I_HELP speak_emote = list("screeches") throw_message = "sinks in slowly, before being pushed out of " status_flags = CANPUSH diff --git a/code/modules/mob/living/simple_animal/hostile/mushroom.dm b/code/modules/mob/living/simple_animal/hostile/mushroom.dm index 0d1d16ac19a..c3fa9d01800 100644 --- a/code/modules/mob/living/simple_animal/hostile/mushroom.dm +++ b/code/modules/mob/living/simple_animal/hostile/mushroom.dm @@ -138,7 +138,7 @@ /mob/living/simple_animal/hostile/mushroom/attack_hand(mob/living/carbon/human/M as mob) ..() - if(M.a_intent == "harm") + if(M.a_intent == I_HARM) Bruise() /mob/living/simple_animal/hostile/mushroom/hitby(atom/movable/AM) diff --git a/code/modules/mob/living/simple_animal/hostile/retaliate/clown.dm b/code/modules/mob/living/simple_animal/hostile/retaliate/clown.dm index 2635c97f9a1..f4f0db898bb 100644 --- a/code/modules/mob/living/simple_animal/hostile/retaliate/clown.dm +++ b/code/modules/mob/living/simple_animal/hostile/retaliate/clown.dm @@ -13,7 +13,7 @@ speak = list("HONK", "Honk!", "Welcome to clown planet!") emote_see = list("honks") speak_chance = 1 - a_intent = "harm" + a_intent = I_HARM maxHealth = 75 health = 75 speed = 0 diff --git a/code/modules/mob/living/simple_animal/hostile/retaliate/drone.dm b/code/modules/mob/living/simple_animal/hostile/retaliate/drone.dm index e4b9fe7ac0f..eb3d989cb3e 100644 --- a/code/modules/mob/living/simple_animal/hostile/retaliate/drone.dm +++ b/code/modules/mob/living/simple_animal/hostile/retaliate/drone.dm @@ -15,7 +15,7 @@ response_harm = "hits the" speak = list("ALERT.","Hostile-ile-ile entities dee-twhoooo-wected.","Threat parameterszzzz- szzet.","Bring sub-sub-sub-systems uuuup to combat alert alpha-a-a.") emote_see = list("beeps menacingly","whirrs threateningly","scans its immediate vicinity") - a_intent = "harm" + a_intent = I_HARM stop_automated_movement_when_pulled = 0 health = 300 maxHealth = 300 diff --git a/code/modules/mob/living/simple_animal/hostile/russian.dm b/code/modules/mob/living/simple_animal/hostile/russian.dm index 729ef2ad658..69ad3e579d7 100644 --- a/code/modules/mob/living/simple_animal/hostile/russian.dm +++ b/code/modules/mob/living/simple_animal/hostile/russian.dm @@ -18,7 +18,7 @@ melee_damage_upper = 15 attacktext = "punches" attack_sound = 'sound/weapons/punch1.ogg' - a_intent = "harm" + a_intent = I_HARM var/corpse = /obj/effect/landmark/mobcorpse/russian var/weapon1 = /obj/item/weapon/kitchenknife min_oxy = 5 diff --git a/code/modules/mob/living/simple_animal/hostile/spaceworms.dm b/code/modules/mob/living/simple_animal/hostile/spaceworms.dm index 4736c407839..65cd340bf3f 100644 --- a/code/modules/mob/living/simple_animal/hostile/spaceworms.dm +++ b/code/modules/mob/living/simple_animal/hostile/spaceworms.dm @@ -30,7 +30,7 @@ max_co2 = 0 max_tox = 0 - a_intent = "harm" //so they don't get pushed around + a_intent = I_HARM //so they don't get pushed around environment_smash = 1 diff --git a/code/modules/mob/living/simple_animal/hostile/statue.dm b/code/modules/mob/living/simple_animal/hostile/statue.dm index 1cf812d1dec..c2e84b06370 100644 --- a/code/modules/mob/living/simple_animal/hostile/statue.dm +++ b/code/modules/mob/living/simple_animal/hostile/statue.dm @@ -8,7 +8,7 @@ icon_living = "angelseen" icon_dead = "angelseen" gender = NEUTER - a_intent = "harm" + a_intent = I_HARM response_help = "touches" response_disarm = "pushes" diff --git a/code/modules/mob/living/simple_animal/hostile/syndicate.dm b/code/modules/mob/living/simple_animal/hostile/syndicate.dm index 6eb56766229..bd6d0723a0e 100644 --- a/code/modules/mob/living/simple_animal/hostile/syndicate.dm +++ b/code/modules/mob/living/simple_animal/hostile/syndicate.dm @@ -18,7 +18,7 @@ melee_damage_upper = 10 attacktext = "punches" attack_sound = 'sound/weapons/punch1.ogg' - a_intent = "harm" + a_intent = I_HARM var/corpse = /obj/effect/landmark/mobcorpse/syndicatesoldier var/weapon1 var/weapon2 diff --git a/code/modules/mob/living/simple_animal/simple_animal.dm b/code/modules/mob/living/simple_animal/simple_animal.dm index dbd87107f1e..b1d584777ad 100644 --- a/code/modules/mob/living/simple_animal/simple_animal.dm +++ b/code/modules/mob/living/simple_animal/simple_animal.dm @@ -87,9 +87,9 @@ return /mob/living/simple_animal/Life() - if(paralysis || stunned || weakened || buckled || resting) + if(paralysis || stunned || weakened || buckled || resting) canmove = 0 - else + else canmove = 1 //Health @@ -107,7 +107,7 @@ if(health > maxHealth) health = maxHealth - + if(resting && icon_resting && stat != DEAD) icon_state = icon_resting else if(icon_resting && stat != DEAD) @@ -292,12 +292,12 @@ switch(M.a_intent) - if("help") + if(I_HELP) if (health > 0) visible_message(" [M] [response_help] [src].") playsound(loc, 'sound/weapons/thudswoosh.ogg', 50, 1, -1) - if("grab") + if(I_GRAB) if (M == src || anchored) return if (!(status_flags & CANPUSH)) @@ -314,7 +314,7 @@ visible_message("[M] has grabbed [src] passively!") playsound(loc, 'sound/weapons/thudswoosh.ogg', 50, 1, -1) - if("harm", "disarm") + if(I_HARM, I_DISARM) M.do_attack_animation(src) visible_message("[M] [response_harm] [src]!") playsound(loc, "punch", 25, 1, -1) @@ -326,26 +326,13 @@ switch(M.a_intent) - if ("help") + if (I_HELP) visible_message("[M] caresses [src] with its scythe like arm.") - if ("grab") - if(M == src || anchored) - return - if(!(status_flags & CANPUSH)) - return + if (I_GRAB) + grabbedby(M) - var/obj/item/weapon/grab/G = new /obj/item/weapon/grab(M, src ) - - M.put_in_active_hand(G) - - G.synch() - LAssailant = M - - playsound(loc, 'sound/weapons/thudswoosh.ogg', 50, 1, -1) - visible_message("[M] has grabbed [src] passively!") - - if("harm", "disarm") + if(I_HARM, I_DISARM) M.do_attack_animation(src) var/damage = rand(15, 30) visible_message("[M] has slashed at [src]!", \ @@ -358,7 +345,7 @@ /mob/living/simple_animal/attack_larva(mob/living/carbon/alien/larva/L as mob) switch(L.a_intent) - if("help") + if(I_HELP) visible_message("[L] rubs its head against [src].") diff --git a/code/modules/mob/living/simple_animal/slaughter/slaughter.dm b/code/modules/mob/living/simple_animal/slaughter/slaughter.dm index 96a2b832860..a54b0e0e1e2 100644 --- a/code/modules/mob/living/simple_animal/slaughter/slaughter.dm +++ b/code/modules/mob/living/simple_animal/slaughter/slaughter.dm @@ -14,7 +14,7 @@ icon_state = "daemon" icon_living = "daemon" speed = 1 - a_intent = "harm" + a_intent = I_HARM stop_automated_movement = 1 status_flags = CANPUSH attack_sound = 'sound/misc/demon_attack1.ogg' diff --git a/code/modules/mob/mob_defines.dm b/code/modules/mob/mob_defines.dm index 9e406738a1b..cee943541d3 100644 --- a/code/modules/mob/mob_defines.dm +++ b/code/modules/mob/mob_defines.dm @@ -114,7 +114,7 @@ var/losebreath = 0.0//Carbon var/intent = null//Living var/shakecamera = 0 - var/a_intent = "help"//Living + var/a_intent = I_HELP//Living var/m_int = null//Living var/m_intent = "run"//Living var/lastKnownIP = null diff --git a/code/modules/mob/mob_grab.dm b/code/modules/mob/mob_grab.dm index 0b8c6949029..2f50994b4b9 100644 --- a/code/modules/mob/mob_grab.dm +++ b/code/modules/mob/mob_grab.dm @@ -316,7 +316,7 @@ var/mob/living/carbon/human/affected = affecting var/mob/living/carbon/human/attacker = assailant switch(assailant.a_intent) - if("help") + if(I_HELP) /*if(force_down) assailant << "You no longer pin [affecting] to the ground." force_down = 0 @@ -324,10 +324,10 @@ //This specific example would allow you to stop pinning people to the floor without moving away from them. return - if("grab") + if(I_GRAB) return - if("harm") //This checks that the user is on harm intent. + if(I_HARM) //This checks that the user is on harm intent. if(last_hit_zone == "head") //This checks the hitzone the user has selected. In this specific case, they have the head selected. if(affecting.lying) return @@ -367,7 +367,7 @@ M << "\red You go blind!"*///This is a demonstration of adding a new damaging type based on intent as well as hitzone. //This specific example would allow you to squish people's eyes with a GRAB_NECK. - if("disarm") //This checks that the user is on disarm intent. + if(I_DISARM) //This checks that the user is on disarm intent. /* if(state < GRAB_AGGRESSIVE) assailant << "You require a better grab to do this." return diff --git a/code/modules/mob/mob_helpers.dm b/code/modules/mob/mob_helpers.dm index b3101543291..52fc729c121 100644 --- a/code/modules/mob/mob_helpers.dm +++ b/code/modules/mob/mob_helpers.dm @@ -96,7 +96,7 @@ proc/isembryo(A) if(istype(A, /mob/living/silicon/ai)) return 1 return 0 - + /mob/proc/isSynthetic() return 0 @@ -174,17 +174,17 @@ proc/isAntag(A) if(C.mind && C.mind.special_role) return 1 return 0 - + proc/isNonCrewAntag(A) if(!isAntag(A)) return 0 - + var/mob/living/carbon/C = A var/special_role = C.mind.special_role var/list/crew_roles = list("traitor", "Changeling", "Vampire", "Cultist", "Head Revolutionary", "Revolutionary", "malfunctioning AI", "Shadowling", "loyalist", "mutineer", "Response Team") if((special_role in crew_roles)) return 0 - + return 1 proc/isnewplayer(A) @@ -394,20 +394,20 @@ proc/Gibberish(t, p)//t is the inputted message, and any value higher than 70 fo return 0 //converts intent-strings into numbers and back -var/list/intents = list("help","disarm","grab","harm") +var/list/intents = list(I_HELP,I_DISARM,I_GRAB,I_HARM) /proc/intent_numeric(argument) if(istext(argument)) switch(argument) - if("help") return 0 - if("disarm") return 1 - if("grab") return 2 + if(I_HELP) return 0 + if(I_DISARM) return 1 + if(I_GRAB) return 2 else return 3 else switch(argument) - if(0) return "help" - if(1) return "disarm" - if(2) return "grab" - else return "harm" + if(0) return I_HELP + if(1) return I_DISARM + if(2) return I_GRAB + else return I_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) @@ -416,7 +416,7 @@ var/list/intents = list("help","disarm","grab","harm") if(ishuman(src) || isalienadult(src) || isbrain(src)) switch(input) - if("help","disarm","grab","harm") + if(I_HELP,I_DISARM,I_GRAB,I_HARM) a_intent = input if("right") a_intent = intent_numeric((intent_numeric(a_intent)+1) % 4) @@ -427,14 +427,14 @@ var/list/intents = list("help","disarm","grab","harm") else if(isrobot(src) || islarva(src)) switch(input) - if("help") - a_intent = "help" - if("harm") - a_intent = "harm" + if(I_HELP) + a_intent = I_HELP + if(I_HARM) + a_intent = I_HARM if("right","left") a_intent = intent_numeric(intent_numeric(a_intent) - 3) if(hud_used && hud_used.action_intent) - if(a_intent == "harm") + if(a_intent == I_HARM) hud_used.action_intent.icon_state = "harm" else hud_used.action_intent.icon_state = "help" @@ -527,7 +527,7 @@ var/list/intents = list("help","disarm","grab","harm") O << "[message]" if(ghost_sound) O << sound(ghost_sound) - + /mob/proc/switch_to_camera(var/obj/machinery/camera/C) if (!C.can_use() || stat || (get_dist(C, src) > 1 || machine != src || blinded || !canmove)) return 0 @@ -541,4 +541,3 @@ var/list/intents = list("help","disarm","grab","harm") eyeobj.setLoc(get_turf(C)) client.eye = eyeobj return 1 - \ No newline at end of file diff --git a/code/modules/mob/transform_procs.dm b/code/modules/mob/transform_procs.dm index 5616b617125..a77f3d81f8b 100644 --- a/code/modules/mob/transform_procs.dm +++ b/code/modules/mob/transform_procs.dm @@ -40,7 +40,7 @@ O.dna.SetSEValueRange(MONKEYBLOCK,0xDAC, 0xFFF) O.loc = loc O.viruses = viruses - O.a_intent = "harm" + O.a_intent = I_HARM if (client) @@ -259,7 +259,7 @@ if("Drone") new_xeno = new /mob/living/carbon/alien/humanoid/drone(loc) - new_xeno.a_intent = "harm" + new_xeno.a_intent = I_HARM new_xeno.key = key new_xeno << "You are now an alien." @@ -318,7 +318,7 @@ qdel(t) var/mob/living/simple_animal/pet/corgi/new_corgi = new /mob/living/simple_animal/pet/corgi (loc) - new_corgi.a_intent = "harm" + new_corgi.a_intent = I_HARM new_corgi.key = key new_corgi << "You are now a Corgi. Yap Yap!" @@ -353,7 +353,7 @@ var/mob/new_mob = new mobpath(src.loc) new_mob.key = key - new_mob.a_intent = "harm" + new_mob.a_intent = I_HARM new_mob << "You suddenly feel more... animalistic." @@ -374,7 +374,7 @@ var/mob/new_mob = new mobpath(src.loc) new_mob.key = key - new_mob.a_intent = "harm" + new_mob.a_intent = I_HARM new_mob << "You feel more... animalistic" new_mob.update_pipe_vision() diff --git a/code/modules/organs/organ.dm b/code/modules/organs/organ.dm index 7dff264aa53..a9a410df238 100644 --- a/code/modules/organs/organ.dm +++ b/code/modules/organs/organ.dm @@ -25,7 +25,7 @@ var/list/organ_cache = list() /obj/item/organ/attack_self(mob/user as mob) // Convert it to an edible form, yum yum. - if(!robotic && user.a_intent == "harm") + if(!robotic && user.a_intent == I_HARM) bitten(user) return @@ -71,8 +71,8 @@ var/list/organ_cache = list() //dead already, no need for more processing if(status & ORGAN_DEAD) - return - + return + // Don't process if we're in a freezer, an MMI or a stasis bag. //TODO: ambient temperature? if(istype(loc,/obj/item/device/mmi) || istype(loc,/obj/item/bodybag/cryobag) || istype(loc,/obj/structure/closet/crate/freezer)) return @@ -81,7 +81,7 @@ var/list/organ_cache = list() if ((status & ORGAN_ROBOT) || (owner && owner.species && (owner.species.flags & IS_PLANT))) germ_level = 0 return - + if(!owner) if(reagents) var/datum/reagent/blood/B = locate(/datum/reagent/blood) in reagents.reagent_list @@ -97,16 +97,16 @@ var/list/organ_cache = list() if(damage >= max_damage) die() - + else if(owner.bodytemperature >= 170) //cryo stops germs from moving and doing their bad stuffs //** Handle antibiotics and curing infections handle_antibiotics() handle_germ_effects() - + //check if we've hit max_damage if(damage >= max_damage) die() - + /obj/item/organ/examine(mob/user) ..(user) if(status & ORGAN_DEAD) diff --git a/code/modules/power/apc.dm b/code/modules/power/apc.dm index dd0fbd2fc7e..88478fec1e9 100644 --- a/code/modules/power/apc.dm +++ b/code/modules/power/apc.dm @@ -54,7 +54,7 @@ var/areastring = null var/obj/item/weapon/stock_parts/cell/cell var/start_charge = 90 // initial cell charge % - var/cell_type = 2500 + var/cell_type = 2500 var/opened = 0 //0=closed, 1=opened, 2=cover removed var/shorted = 0 var/lighting = 3 @@ -99,9 +99,9 @@ var/global/list/status_overlays_lighting var/global/list/status_overlays_environ var/indestructible = 0 // If set, prevents aliens from destroying it - + var/report_power_alarm = 1 - + /obj/machinery/power/apc/noalarm report_power_alarm = 0 @@ -143,7 +143,7 @@ src.update_icon() spawn(5) src.update() - + /obj/machinery/power/apc/Destroy() apcs -= src if(malfai && operating) @@ -378,7 +378,7 @@ results += 2 return results -// Used in process so it doesn't update the icon too much +// Used in process so it doesn't update the icon too much /obj/machinery/power/apc/proc/queue_icon_update() if(!updating_icon) @@ -644,7 +644,7 @@ //Synthetic human mob goes here. if(istype(user,/mob/living/carbon/human)) var/mob/living/carbon/human/H = user - if(!isnull(H.internal_organs_by_name["cell"]) && H.a_intent == "grab") + if(!isnull(H.internal_organs_by_name["cell"]) && H.a_intent == I_GRAB) if(emagged || stat & BROKEN) var/datum/effect/effect/system/spark_spread/s = new /datum/effect/effect/system/spark_spread s.set_up(3, 1, src) @@ -661,9 +661,9 @@ src.cell.charge = 0 user << "You slot your fingers into the APC interface and siphon off some of the stored charge for your own use." - if(src.cell.charge < 0) + if(src.cell.charge < 0) src.cell.charge = 0 - if(H.nutrition > 500) + if(H.nutrition > 500) H.nutrition = 500 src.charging = 1 else @@ -879,7 +879,7 @@ return 1 else return !locked - + /obj/machinery/power/apc/proc/is_locked(mob/user as mob) if(isobserver(user) && check_rights(R_ADMIN, 0, user)) return 0 @@ -1095,8 +1095,8 @@ //Returns 1 if the APC should attempt to charge /obj/machinery/power/apc/proc/attempt_charging() - return (chargemode && charging == 1 && operating) - + return (chargemode && charging == 1 && operating) + /obj/machinery/power/apc/draw_power(var/amount) if(terminal && terminal.powernet) return terminal.powernet.draw_power(amount) @@ -1258,7 +1258,7 @@ update() else if (last_ch != charging) queue_icon_update() - + /obj/machinery/power/apc/proc/autoset(var/val, var/on) if(on==0) if(val==2) // if on, return off @@ -1275,7 +1275,7 @@ return 1 return val - + // damage and destruction acts /obj/machinery/power/apc/emp_act(severity) @@ -1317,7 +1317,7 @@ set_broken() if (cell && prob(5)) cell.blob_act() - + /obj/machinery/power/apc/disconnect_terminal() if(terminal) diff --git a/code/modules/power/cable.dm b/code/modules/power/cable.dm index f35d0f6353b..27974f6a922 100644 --- a/code/modules/power/cable.dm +++ b/code/modules/power/cable.dm @@ -506,7 +506,7 @@ obj/structure/cable/proc/cableColor(var/colorC) if(!S) return - if(!(S.status & ORGAN_ROBOT) || user.a_intent != "help" || S.open == 2) + if(!(S.status & ORGAN_ROBOT) || user.a_intent != I_HELP || S.open == 2) return ..() if(S.burn_dam) diff --git a/code/modules/power/lighting.dm b/code/modules/power/lighting.dm index 709bd0cbaff..a209a127da9 100644 --- a/code/modules/power/lighting.dm +++ b/code/modules/power/lighting.dm @@ -706,7 +706,7 @@ if(!proximity) return if(istype(target, /obj/machinery/light)) return - if(user.a_intent != "harm") + if(user.a_intent != I_HARM) return shatter() diff --git a/code/modules/projectiles/gun.dm b/code/modules/projectiles/gun.dm index 8e3fd960123..61fb6ba0020 100644 --- a/code/modules/projectiles/gun.dm +++ b/code/modules/projectiles/gun.dm @@ -295,7 +295,7 @@ if (src.process_chambered()) //Point blank shooting if on harm intent or target we were targeting. - if(user.a_intent == "harm") + if(user.a_intent == I_HARM) user.visible_message("\red \The [user] fires \the [src] point blank at [M]!") if(istype(in_chamber)) in_chamber.damage *= 1.3 Fire(M,user,0,0,1) diff --git a/code/modules/projectiles/projectile/magic.dm b/code/modules/projectiles/projectile/magic.dm index 9772d42dd99..63a3f2a3a79 100644 --- a/code/modules/projectiles/projectile/magic.dm +++ b/code/modules/projectiles/projectile/magic.dm @@ -232,7 +232,7 @@ proc/wabbajack(mob/living/M) M.attack_log += text("\[[time_stamp()]\] [M.real_name] ([M.ckey]) became [new_mob.real_name].") new_mob.attack_log = M.attack_log - new_mob.a_intent = "harm" + new_mob.a_intent = I_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 238724c0b09..a97068fde56 100644 --- a/code/modules/reagents/Chemistry-Reagents.dm +++ b/code/modules/reagents/Chemistry-Reagents.dm @@ -434,7 +434,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 = "harm" + new_mob.a_intent = I_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 205837633de..b02289784a6 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 != "harm" || !isGlass) + if(user.a_intent != I_HARM || !isGlass) return ..() diff --git a/code/modules/reagents/reagent_containers/food/drinks/drinkingglass.dm b/code/modules/reagents/reagent_containers/food/drinks/drinkingglass.dm index 0338cc9ff89..74d939bb49a 100644 --- a/code/modules/reagents/reagent_containers/food/drinks/drinkingglass.dm +++ b/code/modules/reagents/reagent_containers/food/drinks/drinkingglass.dm @@ -27,7 +27,7 @@ if(!target) return - if(user.a_intent != "harm") + if(user.a_intent != I_HARM) return ..() force = 5 diff --git a/code/modules/reagents/reagent_containers/syringes.dm b/code/modules/reagents/reagent_containers/syringes.dm index 408076341ee..0ecae953abe 100644 --- a/code/modules/reagents/reagent_containers/syringes.dm +++ b/code/modules/reagents/reagent_containers/syringes.dm @@ -62,7 +62,7 @@ user << "\red This syringe is broken!" return -/* if (user.a_intent == "harm" && ismob(target)) +/* if (user.a_intent == I_HARM && ismob(target)) if((CLUMSY in user.mutations) && prob(50)) target = user syringestab(target, user) @@ -168,7 +168,7 @@ if(target.reagents.total_volume >= target.reagents.maximum_volume) user << "\red [target] is full." return - + var/mob/living/carbon/human/H = target if(istype(H)) var/obj/item/organ/external/affected = H.get_organ(user.zone_sel.selecting) diff --git a/code/modules/surgery/surgery.dm b/code/modules/surgery/surgery.dm index e24c5c629af..19425d3a3c5 100644 --- a/code/modules/surgery/surgery.dm +++ b/code/modules/surgery/surgery.dm @@ -80,7 +80,7 @@ proc/spread_germs_to_organ(obj/item/organ/external/E, mob/living/carbon/human/us proc/do_surgery(mob/living/carbon/M, mob/living/user, obj/item/tool) if(!istype(M)) return 0 - if (user.a_intent == "harm") //check for Hippocratic Oath + if (user.a_intent == I_HARM) //check for Hippocratic Oath return 0 var/zone = user.zone_sel.selecting if(zone in M.op_stage.in_progress) //Can't operate on someone repeatedly. @@ -105,7 +105,7 @@ proc/do_surgery(mob/living/carbon/M, mob/living/user, obj/item/tool) M.op_stage.in_progress -= zone // Clear the in-progress flag. return 1 //don't want to do weapony things after surgery - if (user.a_intent == "help") + if (user.a_intent == I_HELP) user << "\red You can't see any useful way to use [tool] on [M]." return 1 return 0