From 22a2df111531b300feccc7eb639a8ad28e83700d Mon Sep 17 00:00:00 2001 From: Rob Nelson Date: Tue, 21 Jan 2014 13:51:44 -0800 Subject: [PATCH] Standardize HULK. Conflicts: code/game/mecha/mecha.dm code/game/objects/items/weapons/swords_axes_etc.dm --- code/_onclick/item_attack.dm | 2 +- code/datums/spells/wizard.dm | 4 ++-- code/game/atoms_movable.dm | 2 +- code/game/dna/dna2_domutcheck.dm | 4 ++-- code/game/dna/genes/powers.dm | 6 +++--- code/game/gamemodes/cult/runes.dm | 4 ++-- code/game/gamemodes/events/ninja_equipment.dm | 2 +- code/game/machinery/OpTable.dm | 6 +++--- code/game/machinery/bots/ed209bot.dm | 2 +- code/game/machinery/bots/secbot.dm | 2 +- code/game/machinery/wishgranter.dm | 4 ++-- code/game/mecha/mecha.dm | 7 ++++++- code/game/objects/effects/aliens.dm | 2 +- code/game/objects/effects/effect_system.dm | 2 +- code/game/objects/items/weapons/grenades/flashbang.dm | 2 +- code/game/objects/items/weapons/swords_axes_etc.dm | 4 ++-- code/game/objects/structures/grille.dm | 2 +- code/game/objects/structures/tables_racks.dm | 8 ++++---- code/game/objects/structures/window.dm | 2 +- code/game/turfs/simulated/walls.dm | 4 ++-- code/game/turfs/simulated/walls_reinforced.dm | 2 +- code/modules/mob/living/carbon/alien/humanoid/humanoid.dm | 2 +- code/modules/mob/living/carbon/alien/larva/larva.dm | 2 +- code/modules/mob/living/carbon/human/human_attackhand.dm | 4 ++-- code/modules/mob/living/carbon/human/human_damage.dm | 6 +++--- code/modules/mob/living/carbon/human/say.dm | 2 +- code/modules/mob/living/carbon/human/update_icons.dm | 4 ++-- code/modules/mob/living/carbon/metroid/metroid.dm | 2 +- code/modules/mob/living/carbon/monkey/life.dm | 4 ++-- code/modules/mob/living/carbon/monkey/monkey.dm | 2 +- code/modules/mob/living/living.dm | 4 ++-- code/modules/projectiles/gun.dm | 2 +- code/setup.dm | 2 +- code/unused/Agouri_stuff.dm | 4 ++-- code/unused/spells.dm | 6 +++--- 35 files changed, 62 insertions(+), 57 deletions(-) diff --git a/code/_onclick/item_attack.dm b/code/_onclick/item_attack.dm index 46b73d0cf4a..bd3bee2839d 100644 --- a/code/_onclick/item_attack.dm +++ b/code/_onclick/item_attack.dm @@ -51,7 +51,7 @@ ///////////////////////// var/power = force - if(HULK in user.mutations) + if(M_HULK in user.mutations) power *= 2 if(!istype(M, /mob/living/carbon/human)) diff --git a/code/datums/spells/wizard.dm b/code/datums/spells/wizard.dm index a2789cecd8e..80d5f5d339a 100644 --- a/code/datums/spells/wizard.dm +++ b/code/datums/spells/wizard.dm @@ -45,7 +45,7 @@ range = -1 include_user = 1 - mutations = list(LASER, HULK) + mutations = list(LASER, M_HULK) duration = 300 cooldown_min = 300 //25 deciseconds reduction per rank @@ -260,4 +260,4 @@ ex_severe = -1 ex_heavy = -1 ex_light = 2 - ex_flash = 5 \ No newline at end of file + ex_flash = 5 diff --git a/code/game/atoms_movable.dm b/code/game/atoms_movable.dm index 400da3cc439..65c14ffd4fa 100644 --- a/code/game/atoms_movable.dm +++ b/code/game/atoms_movable.dm @@ -72,7 +72,7 @@ src.throwing = 1 if(usr) - if(HULK in usr.mutations) + if(M_HULK in usr.mutations) src.throwing = 2 // really strong throw! var/dist_x = abs(target.x - src.x) diff --git a/code/game/dna/dna2_domutcheck.dm b/code/game/dna/dna2_domutcheck.dm index 7d847dc4b73..27892cc5071 100644 --- a/code/game/dna/dna2_domutcheck.dm +++ b/code/game/dna/dna2_domutcheck.dm @@ -125,9 +125,9 @@ if (M.dna.GetSEState(HULKBLOCK)) - if(forced || probinj(5,inj) || (HULK in old_mutations)) + if(forced || probinj(5,inj) || (M_HULK in old_mutations)) M << "\blue Your muscles hurt." - M.mutations.Add(HULK) + M.mutations.Add(M_HULK) if (M.dna.GetSEState(HEADACHEBLOCK)) M.disabilities |= EPILEPSY M << "\red You get a headache." diff --git a/code/game/dna/genes/powers.dm b/code/game/dna/genes/powers.dm index f339bb73733..e92917f2f7e 100644 --- a/code/game/dna/genes/powers.dm +++ b/code/game/dna/genes/powers.dm @@ -126,7 +126,7 @@ can_activate(var/mob/M,var/flags) // Can't be big and small. - if(HULK in M.mutations) + if(M_HULK in M.mutations) return 0 return ..(M,flags) @@ -137,7 +137,7 @@ /datum/dna/gene/basic/hulk name="Hulk" activation_messages=list("Your muscles hurt.") - mutation=HULK + mutation=M_HULK New() block=HULKBLOCK @@ -158,7 +158,7 @@ OnMobLife(var/mob/living/carbon/human/M) if(!istype(M)) return if(M.health <= 25) - M.mutations.Remove(HULK) + M.mutations.Remove(M_HULK) M.update_mutations() //update our mutation overlays M << "\red You suddenly feel very weak." M.Weaken(3) diff --git a/code/game/gamemodes/cult/runes.dm b/code/game/gamemodes/cult/runes.dm index 8c373aa1a78..f8c6c3e1810 100644 --- a/code/game/gamemodes/cult/runes.dm +++ b/code/game/gamemodes/cult/runes.dm @@ -988,7 +988,7 @@ var/list/sacrificed = list() if(iscarbon(L)) var/mob/living/carbon/C = L flick("e_flash", C.flash) - if(C.stuttering < 1 && (!(HULK in C.mutations))) + if(C.stuttering < 1 && (!(M_HULK in C.mutations))) C.stuttering = 1 C.Weaken(1) C.Stun(1) @@ -1015,7 +1015,7 @@ var/list/sacrificed = list() else if(iscarbon(T)) var/mob/living/carbon/C = T flick("e_flash", C.flash) - if (!(HULK in C.mutations)) + if (!(M_HULK in C.mutations)) C.silent += 15 C.Weaken(25) C.Stun(25) diff --git a/code/game/gamemodes/events/ninja_equipment.dm b/code/game/gamemodes/events/ninja_equipment.dm index b6a28204197..e46db6d4329 100644 --- a/code/game/gamemodes/events/ninja_equipment.dm +++ b/code/game/gamemodes/events/ninja_equipment.dm @@ -1541,7 +1541,7 @@ It is possible to destroy the net by the occupant or someone else. return attack_hand() - if (HULK in usr.mutations) + if (M_HULK in usr.mutations) usr << text("\blue You easily destroy the energy net.") for(var/mob/O in oviewers(src)) O.show_message(text("\red [] rips the energy net apart!", usr), 1) diff --git a/code/game/machinery/OpTable.dm b/code/game/machinery/OpTable.dm index bf557f6c5cf..c11cece56cb 100644 --- a/code/game/machinery/OpTable.dm +++ b/code/game/machinery/OpTable.dm @@ -46,7 +46,7 @@ del(src) /obj/machinery/optable/attack_paw(mob/user as mob) - if ((HULK in usr.mutations)) + if ((M_HULK in usr.mutations)) usr << text("\blue You destroy the operating table.") visible_message("\red [usr] destroys the operating table!") src.density = 0 @@ -59,7 +59,7 @@ return /obj/machinery/optable/attack_hand(mob/user as mob) - if (HULK in usr.mutations) + if (M_HULK in usr.mutations) usr << text("\blue You destroy the table.") visible_message("\red [usr] destroys the operating table!") src.density = 0 @@ -144,4 +144,4 @@ return /obj/machinery/optable/slime - icon_state = "table-slime" \ No newline at end of file + icon_state = "table-slime" diff --git a/code/game/machinery/bots/ed209bot.dm b/code/game/machinery/bots/ed209bot.dm index 7a77f2c87d4..a2b0dcaa037 100644 --- a/code/game/machinery/bots/ed209bot.dm +++ b/code/game/machinery/bots/ed209bot.dm @@ -281,7 +281,7 @@ Auto Patrol: []"}, var/mob/living/carbon/M = src.target var/maxstuns = 4 if (istype(M, /mob/living/carbon/human)) - if (M.stuttering < 10 && (!(HULK in M.mutations)) /*&& (!istype(M:wear_suit, /obj/item/clothing/suit/judgerobe))*/) + if (M.stuttering < 10 && (!(M_HULK in M.mutations)) /*&& (!istype(M:wear_suit, /obj/item/clothing/suit/judgerobe))*/) M.stuttering = 10 M.Stun(10) M.Weaken(10) diff --git a/code/game/machinery/bots/secbot.dm b/code/game/machinery/bots/secbot.dm index 8f2fededd7e..f37df2fe13c 100644 --- a/code/game/machinery/bots/secbot.dm +++ b/code/game/machinery/bots/secbot.dm @@ -230,7 +230,7 @@ Auto Patrol: []"}, var/mob/living/carbon/M = src.target var/maxstuns = 4 if(istype(M, /mob/living/carbon/human)) - if(M.stuttering < 10 && (!(HULK in M.mutations))) + if(M.stuttering < 10 && (!(M_HULK in M.mutations))) M.stuttering = 10 M.Stun(10) M.Weaken(10) diff --git a/code/game/machinery/wishgranter.dm b/code/game/machinery/wishgranter.dm index fde7b0d076a..01431d9c4b5 100644 --- a/code/game/machinery/wishgranter.dm +++ b/code/game/machinery/wishgranter.dm @@ -36,8 +36,8 @@ charges-- insisting = 0 - if (!(HULK in user.mutations)) - user.mutations.Add(HULK) + if (!(M_HULK in user.mutations)) + user.mutations.Add(M_HULK) if (!(LASER in user.mutations)) user.mutations.Add(LASER) diff --git a/code/game/mecha/mecha.dm b/code/game/mecha/mecha.dm index ed91e4e4bfa..c718f17e33a 100644 --- a/code/game/mecha/mecha.dm +++ b/code/game/mecha/mecha.dm @@ -418,7 +418,12 @@ /obj/mecha/attack_hand(mob/user as mob) src.log_message("Attack by hand/paw. Attacker - [user].",1) - if ((HULK in user.mutations) && !prob(src.deflect_chance)) + if(ishuman(user)) + if(istype(user:gloves, /obj/item/clothing/gloves/space_ninja)&&user:gloves:candrain&&!user:gloves:draining) + call(/obj/item/clothing/gloves/space_ninja/proc/drain)("MECHA",src,user:wear_suit) + return + + if ((M_HULK in user.mutations) && !prob(src.deflect_chance)) src.take_damage(15) src.check_for_internal_damage(list(MECHA_INT_TEMP_CONTROL,MECHA_INT_TANK_BREACH,MECHA_INT_CONTROL_LOST)) user.visible_message("[user] hits [src.name], doing some damage.", "You hit [src.name] with all your might. The metal creaks and bends.") diff --git a/code/game/objects/effects/aliens.dm b/code/game/objects/effects/aliens.dm index afb0532ef60..60f392c57ea 100644 --- a/code/game/objects/effects/aliens.dm +++ b/code/game/objects/effects/aliens.dm @@ -107,7 +107,7 @@ return /obj/effect/alien/resin/attack_hand() - if (HULK in usr.mutations) + if (M_HULK in usr.mutations) usr << "\blue You easily destroy the [name]." for(var/mob/O in oviewers(src)) O.show_message("\red [usr] destroys the [name]!", 1) diff --git a/code/game/objects/effects/effect_system.dm b/code/game/objects/effects/effect_system.dm index 38fcb5e88ed..d8df24484f2 100644 --- a/code/game/objects/effects/effect_system.dm +++ b/code/game/objects/effects/effect_system.dm @@ -1019,7 +1019,7 @@ steam.start() -- spawns the effect return attack_hand(var/mob/user) - if ((HULK in user.mutations) || (prob(75 - metal*25))) + if ((M_HULK in user.mutations) || (prob(75 - metal*25))) user << "\blue You smash through the metal foam wall." for(var/mob/O in oviewers(user)) if ((O.client && !( O.blinded ))) diff --git a/code/game/objects/items/weapons/grenades/flashbang.dm b/code/game/objects/items/weapons/grenades/flashbang.dm index 4024e5275e9..f6528df3013 100644 --- a/code/game/objects/items/weapons/grenades/flashbang.dm +++ b/code/game/objects/items/weapons/grenades/flashbang.dm @@ -40,7 +40,7 @@ if(ishuman(M)) if(istype(M:l_ear, /obj/item/clothing/ears/earmuffs) || istype(M:r_ear, /obj/item/clothing/ears/earmuffs)) ear_safety += 2 - if(HULK in M.mutations) + if(M_HULK in M.mutations) ear_safety += 1 if(istype(M:head, /obj/item/clothing/head/helmet)) ear_safety += 1 diff --git a/code/game/objects/items/weapons/swords_axes_etc.dm b/code/game/objects/items/weapons/swords_axes_etc.dm index 13e62990c56..54b7038af8c 100644 --- a/code/game/objects/items/weapons/swords_axes_etc.dm +++ b/code/game/objects/items/weapons/swords_axes_etc.dm @@ -100,8 +100,8 @@ */ 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))*/) + playsound(get_turf(src), "swing_hit", 50, 1, -1) + if (M.stuttering < 8 && (!(M_HULK in M.mutations)) /*&& (!istype(H:wear_suit, /obj/item/clothing/suit/judgerobe))*/) M.stuttering = 8 M.Stun(8) M.Weaken(8) diff --git a/code/game/objects/structures/grille.dm b/code/game/objects/structures/grille.dm index af44f38e20b..b6c1017a67f 100644 --- a/code/game/objects/structures/grille.dm +++ b/code/game/objects/structures/grille.dm @@ -64,7 +64,7 @@ if(shock(user, 70)) return - if(HULK in user.mutations) + if(M_HULK in user.mutations) health -= 5 else health -= 3 diff --git a/code/game/objects/structures/tables_racks.dm b/code/game/objects/structures/tables_racks.dm index aac9d4b6910..f8cb733e30f 100644 --- a/code/game/objects/structures/tables_racks.dm +++ b/code/game/objects/structures/tables_racks.dm @@ -380,7 +380,7 @@ destroy() /obj/structure/table/attack_paw(mob/user) - if(HULK in user.mutations) + if(M_HULK in user.mutations) user.say(pick(";RAAAAAAAARGH!", ";HNNNNNNNNNGGGGGGH!", ";GWAAAAAAAARRRHHH!", "NNNNNNNNGGGGGGGGHH!", ";AAAAAAARRRGH!" )) visible_message("[user] smashes the [src] apart!") destroy() @@ -398,7 +398,7 @@ /obj/structure/table/attack_hand(mob/user) - if(HULK in user.mutations) + if(M_HULK in user.mutations) visible_message("[user] smashes [src] apart!") user.say(pick(";RAAAAAAAARGH!", ";HNNNNNNNNNGGGGGGH!", ";GWAAAAAAAARRRHHH!", "NNNNNNNNGGGGGGGGHH!", ";AAAAAAARRRGH!" )) destroy() @@ -848,14 +848,14 @@ /obj/structure/table/attack_hand(mob/user) - if(HULK in user.mutations) + if(M_HULK in user.mutations) visible_message("[user] smashes [src] apart!") user.say(pick(";RAAAAAAAARGH!", ";HNNNNNNNNNGGGGGGH!", ";GWAAAAAAAARRRHHH!", "NNNNNNNNGGGGGGGGHH!", ";AAAAAAARRRGH!" )) destroy() /obj/structure/rack/attack_paw(mob/user) - if(HULK in user.mutations) + if(M_HULK in user.mutations) user.say(pick(";RAAAAAAAARGH!", ";HNNNNNNNNNGGGGGGH!", ";GWAAAAAAAARRRHHH!", "NNNNNNNNGGGGGGGGHH!", ";AAAAAAARRRGH!" )) visible_message("[user] smashes [src] apart!") destroy() diff --git a/code/game/objects/structures/window.dm b/code/game/objects/structures/window.dm index 484ea7e1945..8e9984dcba1 100644 --- a/code/game/objects/structures/window.dm +++ b/code/game/objects/structures/window.dm @@ -122,7 +122,7 @@ /obj/structure/window/attack_hand(mob/user as mob) - if(HULK in user.mutations) + if(M_HULK in user.mutations) user.say(pick(";RAAAAAAAARGH!", ";HNNNNNNNNNGGGGGGH!", ";GWAAAAAAAARRRHHH!", "NNNNNNNNGGGGGGGGHH!", ";AAAAAAARRRGH!")) user.visible_message("[user] smashes through [src]!") new /obj/item/weapon/shard(loc) diff --git a/code/game/turfs/simulated/walls.dm b/code/game/turfs/simulated/walls.dm index 381de85cae2..67a74c8acca 100644 --- a/code/game/turfs/simulated/walls.dm +++ b/code/game/turfs/simulated/walls.dm @@ -91,7 +91,7 @@ dismantle_wall() /turf/simulated/wall/attack_paw(mob/user as mob) - if ((HULK in user.mutations)) + if ((M_HULK in user.mutations)) if (prob(40)) usr << text("\blue You smash through the wall.") usr.say(pick(";RAAAAAAAARGH!", ";HNNNNNNNNNGGGGGGH!", ";GWAAAAAAAARRRHHH!", "NNNNNNNNGGGGGGGGHH!", ";AAAAAAARRRGH!" )) @@ -122,7 +122,7 @@ return /turf/simulated/wall/attack_hand(mob/user as mob) - if (HULK in user.mutations) + if (M_HULK in user.mutations) if (prob(40) || rotting) usr << text("\blue You smash through the wall.") usr.say(pick(";RAAAAAAAARGH!", ";HNNNNNNNNNGGGGGGH!", ";GWAAAAAAAARRRHHH!", "NNNNNNNNGGGGGGGGHH!", ";AAAAAAARRRGH!" )) diff --git a/code/game/turfs/simulated/walls_reinforced.dm b/code/game/turfs/simulated/walls_reinforced.dm index f70322ee575..6bfb2966e2a 100644 --- a/code/game/turfs/simulated/walls_reinforced.dm +++ b/code/game/turfs/simulated/walls_reinforced.dm @@ -10,7 +10,7 @@ var/d_state = 0 /turf/simulated/wall/r_wall/attack_hand(mob/user as mob) - if (HULK in user.mutations) + if (M_HULK in user.mutations) if (prob(10) || rotting) usr << text("\blue You smash through the wall.") usr.say(pick(";RAAAAAAAARGH!", ";HNNNNNNNNNGGGGGGH!", ";GWAAAAAAAARRRHHH!", "NNNNNNNNGGGGGGGGHH!", ";AAAAAAARRRGH!" )) diff --git a/code/modules/mob/living/carbon/alien/humanoid/humanoid.dm b/code/modules/mob/living/carbon/alien/humanoid/humanoid.dm index a12b9a4b464..dbe53a4b6ed 100644 --- a/code/modules/mob/living/carbon/alien/humanoid/humanoid.dm +++ b/code/modules/mob/living/carbon/alien/humanoid/humanoid.dm @@ -287,7 +287,7 @@ if ("harm") var/damage = rand(1, 9) if (prob(90)) - if (HULK in M.mutations)//HULK SMASH + if (M_HULK in M.mutations)//M_HULK SMASH damage += 14 spawn(0) Weaken(damage) // Why can a hulk knock an alien out but not knock out a human? Damage is robust enough. diff --git a/code/modules/mob/living/carbon/alien/larva/larva.dm b/code/modules/mob/living/carbon/alien/larva/larva.dm index 2e514519aea..96ebe49b794 100644 --- a/code/modules/mob/living/carbon/alien/larva/larva.dm +++ b/code/modules/mob/living/carbon/alien/larva/larva.dm @@ -261,7 +261,7 @@ else var/damage = rand(1, 9) if (prob(90)) - if (HULK in M.mutations) + if (M_HULK in M.mutations) damage += 5 spawn(0) Paralyse(1) diff --git a/code/modules/mob/living/carbon/human/human_attackhand.dm b/code/modules/mob/living/carbon/human/human_attackhand.dm index 8f7d714dc05..702d6c89bf2 100644 --- a/code/modules/mob/living/carbon/human/human_attackhand.dm +++ b/code/modules/mob/living/carbon/human/human_attackhand.dm @@ -27,7 +27,7 @@ var/datum/organ/external/affecting = get_organ(ran_zone(M.zone_sel.selecting)) var/armor_block = run_armor_check(affecting, "melee") - if(HULK in M.mutations) damage += 5 + if(M_HULK in M.mutations) damage += 5 playsound(loc, "punch", 25, 1, -1) @@ -137,7 +137,7 @@ var/datum/organ/external/affecting = get_organ(ran_zone(M.zone_sel.selecting)) var/armor_block = run_armor_check(affecting, "melee") - if(HULK in M.mutations) damage += 5 + if(M_HULK in M.mutations) damage += 5 if(M.species.attack_verb == "punch") diff --git a/code/modules/mob/living/carbon/human/human_damage.dm b/code/modules/mob/living/carbon/human/human_damage.dm index ac4dcf9c946..d9adfe9aa0e 100644 --- a/code/modules/mob/living/carbon/human/human_damage.dm +++ b/code/modules/mob/living/carbon/human/human_damage.dm @@ -53,15 +53,15 @@ heal_overall_damage(0, -amount) /mob/living/carbon/human/Stun(amount) - if(HULK in mutations) return + if(M_HULK in mutations) return ..() /mob/living/carbon/human/Weaken(amount) - if(HULK in mutations) return + if(M_HULK in mutations) return ..() /mob/living/carbon/human/Paralyse(amount) - if(HULK in mutations) return + if(M_HULK in mutations) return ..() /mob/living/carbon/human/adjustCloneLoss(var/amount) diff --git a/code/modules/mob/living/carbon/human/say.dm b/code/modules/mob/living/carbon/human/say.dm index 1bb59e5801e..e7cf18a51c1 100644 --- a/code/modules/mob/living/carbon/human/say.dm +++ b/code/modules/mob/living/carbon/human/say.dm @@ -77,7 +77,7 @@ if(!(copytext(message, 1, 2) == "*" || (mind && mind.changeling && department_radio_keys[copytext(message, 1, 3)] != "changeling"))) message = pick("NEEIIGGGHHHH!", "NEEEIIIIGHH!", "NEIIIGGHH!", "HAAWWWWW!", "HAAAWWW!") - if ((HULK in mutations) && health >= 25 && length(message)) + if ((M_HULK in mutations) && health >= 25 && length(message)) if(copytext(message, 1, 2) != "*") message = "[uppertext(message)]!!" //because I don't know how to code properly in getting vars from other files -Bro diff --git a/code/modules/mob/living/carbon/human/update_icons.dm b/code/modules/mob/living/carbon/human/update_icons.dm index 8134ccd67fd..074416e039a 100644 --- a/code/modules/mob/living/carbon/human/update_icons.dm +++ b/code/modules/mob/living/carbon/human/update_icons.dm @@ -232,7 +232,7 @@ proc/get_damage_icon_part(damage_state, body_part) var/husk = (HUSK in src.mutations) //100% unnecessary -Agouri //nope, do you really want to iterate through src.mutations repeatedly? -Pete var/fat = (FAT in src.mutations) - var/hulk = (HULK in src.mutations) + var/hulk = (M_HULK in src.mutations) var/skeleton = (SKELETON in src.mutations) var/g = "m" @@ -394,7 +394,7 @@ proc/get_damage_icon_part(damage_state, body_part) for(var/mut in mutations) switch(mut) /* - if(HULK) + if(M_HULK) if(fat) standing.underlays += "hulk_[fat]_s" else diff --git a/code/modules/mob/living/carbon/metroid/metroid.dm b/code/modules/mob/living/carbon/metroid/metroid.dm index 5676d4c72d4..04d494ebcdf 100644 --- a/code/modules/mob/living/carbon/metroid/metroid.dm +++ b/code/modules/mob/living/carbon/metroid/metroid.dm @@ -460,7 +460,7 @@ attacked += 10 if (prob(90)) - if (HULK in M.mutations) + if (M_HULK in M.mutations) damage += 5 if(Victim) Victim = null diff --git a/code/modules/mob/living/carbon/monkey/life.dm b/code/modules/mob/living/carbon/monkey/life.dm index 8637787474d..0f6aa08a6a2 100644 --- a/code/modules/mob/living/carbon/monkey/life.dm +++ b/code/modules/mob/living/carbon/monkey/life.dm @@ -116,8 +116,8 @@ if(51 to 100) adjustFireLoss(-5) - if ((HULK in mutations) && health <= 25) - mutations.Remove(HULK) + if ((M_HULK in mutations) && health <= 25) + mutations.Remove(M_HULK) src << "\red You suddenly feel very weak." Weaken(3) emote("collapse") diff --git a/code/modules/mob/living/carbon/monkey/monkey.dm b/code/modules/mob/living/carbon/monkey/monkey.dm index 6ae487c2885..5e5f6a06ef3 100644 --- a/code/modules/mob/living/carbon/monkey/monkey.dm +++ b/code/modules/mob/living/carbon/monkey/monkey.dm @@ -128,7 +128,7 @@ now_pushing = 1 if(ismob(AM)) var/mob/tmob = AM - if(istype(tmob, /mob/living/carbon/human) && (HULK in tmob.mutations)) + if(istype(tmob, /mob/living/carbon/human) && (M_HULK in tmob.mutations)) if(prob(70)) usr << "\red You fail to push [tmob]'s fat ass out of the way." now_pushing = 0 diff --git a/code/modules/mob/living/living.dm b/code/modules/mob/living/living.dm index 7fbaf581775..be03e96784e 100644 --- a/code/modules/mob/living/living.dm +++ b/code/modules/mob/living/living.dm @@ -591,7 +591,7 @@ if(CM.handcuffed && CM.canmove && (CM.last_special <= world.time)) CM.next_move = world.time + 100 CM.last_special = world.time + 100 - if(isalienadult(CM) || (HULK in usr.mutations))//Don't want to do a lot of logic gating here. + if(isalienadult(CM) || (M_HULK in usr.mutations))//Don't want to do a lot of logic gating here. usr << "\red You attempt to break your handcuffs. (This will take around 5 seconds and you need to stand still)" for(var/mob/O in viewers(CM)) O.show_message(text("\red [] is trying to break the handcuffs!", CM), 1) @@ -629,7 +629,7 @@ else if(CM.legcuffed && CM.canmove && (CM.last_special <= world.time)) CM.next_move = world.time + 100 CM.last_special = world.time + 100 - if(isalienadult(CM) || (HULK in usr.mutations))//Don't want to do a lot of logic gating here. + if(isalienadult(CM) || (M_HULK in usr.mutations))//Don't want to do a lot of logic gating here. usr << "\red You attempt to break your legcuffs. (This will take around 5 seconds and you need to stand still)" for(var/mob/O in viewers(CM)) O.show_message(text("\red [] is trying to break the legcuffs!", CM), 1) diff --git a/code/modules/projectiles/gun.dm b/code/modules/projectiles/gun.dm index d2f1ac878ea..6dde2bec907 100644 --- a/code/modules/projectiles/gun.dm +++ b/code/modules/projectiles/gun.dm @@ -87,7 +87,7 @@ return if(istype(user, /mob/living)) var/mob/living/M = user - if (HULK in M.mutations) + if (M_HULK in M.mutations) M << "\red Your meaty finger is much too large for the trigger guard!" return if(ishuman(user)) diff --git a/code/setup.dm b/code/setup.dm index 34eefde7662..335faa73e03 100644 --- a/code/setup.dm +++ b/code/setup.dm @@ -324,7 +324,7 @@ var/MAX_EXPLOSION_RANGE = 14 #define M_TK 1 #define M_RESIST_COLD 2 #define M_XRAY 3 -#define HULK 4 +#define M_HULK 4 #define CLUMSY 5 #define FAT 6 #define HUSK 7 diff --git a/code/unused/Agouri_stuff.dm b/code/unused/Agouri_stuff.dm index de3fa1a031e..391c44229bc 100644 --- a/code/unused/Agouri_stuff.dm +++ b/code/unused/Agouri_stuff.dm @@ -726,7 +726,7 @@ dismantle_wall() /turf/simulated/wall/attack_paw(mob/user as mob) - if ((user.mutations & HULK)) + if ((user.mutations & M_HULK)) if (prob(40)) usr << text("\blue You smash through the wall.") dismantle_wall(1) @@ -756,7 +756,7 @@ return /turf/simulated/wall/attack_hand(mob/user as mob) - if ((user.mutations & HULK)) + if ((user.mutations & M_HULK)) if (prob(40)) usr << text("\blue You smash through the wall.") dismantle_wall(1) diff --git a/code/unused/spells.dm b/code/unused/spells.dm index 84414c114f2..cf6e2685e1f 100644 --- a/code/unused/spells.dm +++ b/code/unused/spells.dm @@ -500,13 +500,13 @@ usr.say("BIRUZ BENNAR") usr << text("\blue You feel strong! You feel pressure building behind your eyes!") - if (!(HULK in usr.mutations)) - usr.mutations.Add(HULK) + if (!(M_HULK in usr.mutations)) + usr.mutations.Add(M_HULK) if (!(LASER in usr.mutations)) usr.mutations.Add(LASER) spawn (300) if (LASER in usr.mutations) usr.mutations.Remove(LASER) - if (HULK in usr.mutations) usr.mutations.Remove(HULK) + if (M_HULK in usr.mutations) usr.mutations.Remove(M_HULK) return //BODY SWAP /N