cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-29 15:08:02 +01:00
Code Issues Packages Projects Releases Wiki Activity

Standardize mutations

Browse Source
This commit is contained in:
Markolie
2015-02-22 19:04:43 +01:00
parent 3b072b5a62
commit 982102a407
113 changed files with 282 additions and 282 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/_onclick/click.dm
+2 -2
View File
@@ -170,11 +170,11 @@
if(ishuman(src) && (istype(src:gloves, /obj/item/clothing/gloves/yellow/power)) && a_intent == "harm")
PowerGlove(A)
if(!mutations.len) return
if((M_LASER in mutations) && a_intent == "harm")
if((LASER in mutations) && a_intent == "harm")
LaserEyes(A) // moved into a proc below
return
else
if(M_TK in mutations)
if(TK in mutations)
A.attack_tk(src)
/*
Restrained ClickOn
code/_onclick/item_attack.dm
+2 -2
View File
@@ -51,7 +51,7 @@
/////////////////////////
var/power = force
if(M_HULK in user.mutations)
if(HULK in user.mutations)
power *= 2
if(!istype(M, /mob/living/carbon/human))
@@ -160,7 +160,7 @@
if (istype(location, /turf/simulated))
location:add_blood_floor(M)
if("fire")
if (!(M_RESIST_COLD in M.mutations))
if (!(RESIST_COLD in M.mutations))
M.take_organ_damage(0, power)
M << "Aargh it burns!"
M.updatehealth()
code/_onclick/oldcode.dm
+2 -2
View File
@@ -347,8 +347,8 @@
src.hand_al(usr, usr.hand)
else
// ------- YOU ARE CLICKING ON AN OBJECT THAT'S INACCESSIBLE TO YOU AND IS NOT YOUR HUD -------
if((M_LASER in usr:mutations) && usr:a_intent == "harm" && world.time >= usr.next_move)
// ------- YOU HAVE THE M_LASER MUTATION, YOUR INTENT SET TO HURT AND IT'S BEEN MORE THAN A DECISECOND SINCE YOU LAS TATTACKED -------
if((LASER in usr:mutations) && usr:a_intent == "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)
var/turf/U = get_turf(src)
code/_onclick/other_mobs.dm
+2 -2
View File
@@ -30,13 +30,13 @@
/mob/living/carbon/human/RangedAttack(var/atom/A)
if(!gloves && !mutations.len) return
var/obj/item/clothing/gloves/G = gloves
if((M_LASER in mutations) && a_intent == "harm")
if((LASER in mutations) && a_intent == "harm")
LaserEyes(A) // moved into a proc below
else if(istype(G) && G.Touch(A,0)) // for magic gloves
return
else if(M_TK in mutations)
else if(TK in mutations)
A.attack_tk(src)
*/
code/_onclick/telekinesis.dm
+4 -4
View File
@@ -39,13 +39,13 @@ var/const/tk_maxrange = 15
/obj/item/attack_tk(mob/user)
if(user.stat || !isturf(loc)) return
if((M_TK in user.mutations) && !user.get_active_hand()) // both should already be true to get here
if((TK in user.mutations) && !user.get_active_hand()) // both should already be true to get here
var/obj/item/tk_grab/O = new(src)
user.put_in_active_hand(O)
O.host = user
O.focus_object(src)
else
warning("Strange attack_tk(): TK([M_TK in user.mutations]) empty hand([!user.get_active_hand()])")
warning("Strange attack_tk(): TK([TK in user.mutations]) empty hand([!user.get_active_hand()])")
return
@@ -101,7 +101,7 @@ var/const/tk_maxrange = 15
if(!host || host != user)
del(src)
return
if(!(M_TK in host.mutations))
if(!(TK in host.mutations))
del(src)
return
if(isobj(target) && !isturf(target.loc))
@@ -189,7 +189,7 @@ var/const/tk_maxrange = 15
//equip_to_slot_or_del(obj/item/W, slot, del_on_fail = 1)
/*
if(istype(user, /mob/living/carbon))
if(user:mutations & M_TK && get_dist(source, user) <= 7)
if(user:mutations & TK && get_dist(source, user) <= 7)
if(user:get_active_hand()) return 0
var/X = source:x
var/Y = source:y
code/datums/spells/genetic.dm
+1 -1
View File
@@ -20,7 +20,7 @@
for(var/mob/living/target in targets)
for(var/x in mutations)
target.mutations.Add(x)
if(x == M_HULK && ishuman(target))
if(x == HULK && ishuman(target))
target:hulk_time=world.time + duration
target.disabilities |= disabilities
target.update_mutations() //update target's mutation overlays
code/datums/spells/wizard.dm
+1 -1
View File
@@ -48,7 +48,7 @@
include_user = 1
centcom_cancast = 0
mutations = list(M_LASER, M_HULK)
mutations = list(LASER, HULK)
duration = 300
cooldown_min = 300 //25 deciseconds reduction per rank
code/game/atoms.dm
+1 -1
View File
@@ -295,7 +295,7 @@ its easier to just keep the beam vertical.
add_fibers(M)
//He has no prints!
if (M_FINGERPRINTS in M.mutations)
if (FINGERPRINTS in M.mutations)
if(fingerprintslast != M.key)
fingerprintshidden += "(Has no fingerprints) Real name: [M.real_name], Key: [M.key]"
fingerprintslast = M.key
code/game/atoms_movable.dm
+1 -1
View File
@@ -108,7 +108,7 @@
src.throw_source = get_turf(src) //store the origin turf
if(usr)
if(M_HULK in usr.mutations)
if(HULK in usr.mutations)
src.throwing = 2 // really strong throw!
var/dist_x = abs(target.x - src.x)
code/game/dna/dna_modifier.dm
+2 -2
View File
@@ -504,7 +504,7 @@
occupantData["name"] = connected.occupant.name
occupantData["stat"] = connected.occupant.stat
occupantData["isViableSubject"] = 1
if ((M_NOCLONE in connected.occupant.mutations && connected.scan_level < 3) || !src.connected.occupant.dna)
if ((NOCLONE in connected.occupant.mutations && connected.scan_level < 3) || !src.connected.occupant.dna)
occupantData["isViableSubject"] = 0
occupantData["health"] = connected.occupant.health
occupantData["maxHealth"] = connected.occupant.maxHealth
@@ -843,7 +843,7 @@
return 1
if (bufferOption == "transfer")
if (!src.connected.occupant || (M_NOCLONE in src.connected.occupant.mutations && connected.scan_level < 3) || !src.connected.occupant.dna)
if (!src.connected.occupant || (NOCLONE in src.connected.occupant.mutations && connected.scan_level < 3) || !src.connected.occupant.dna)
return
irradiating = 2
code/game/dna/genes/disabilities.dm
+2 -2
View File
@@ -55,7 +55,7 @@
name="Hallucinate"
activation_message="Your mind says 'Hello'."
deactivation_message ="Sanity returns. Or does it?"
mutation=M_HALLUCINATE
mutation=HALLUCINATE
New()
block=HALLUCINATIONBLOCK
@@ -82,7 +82,7 @@
name="Clumsiness"
activation_message="You feel lightheaded."
deactivation_message ="You regain some control of your movements"
mutation=M_CLUMSY
mutation=CLUMSY
New()
block=CLUMSYBLOCK
code/game/dna/genes/goon_disabilities.dm
+3 -3
View File
@@ -57,7 +57,7 @@
activation_message = "You feel blubbery and lethargic!"
deactivation_message = "You feel fit!"
mutation = M_OBESITY
mutation = OBESITY
New()
..()
@@ -219,7 +219,7 @@
deactivation_message = "Your stomach stops acting up. Phew!"
instability=2
mutation = M_TOXIC_FARTS
mutation = TOXIC_FARTS
New()
..()
@@ -237,7 +237,7 @@
activation_message = "You feel buff!"
deactivation_message = "You feel wimpy and weak."
mutation = M_STRONG
mutation = STRONG
New()
..()
code/game/dna/genes/goon_powers.dm
+8 -8
View File
@@ -6,7 +6,7 @@
activation_messages=list("You feel unusually sober.")
deactivation_messages = list("You feel like you could use a stiff drink.")
mutation=M_SOBER
mutation=SOBER
New()
block=SOBERBLOCK
@@ -19,7 +19,7 @@
deactivation_messages = list("You feel oddly exposed.")
instability=2
mutation=M_PSY_RESIST
mutation=PSY_RESIST
New()
block=PSYRESISTBLOCK
@@ -149,7 +149,7 @@
usr << "\red This will only work on normal organic beings."
return
if (M_RESIST_COLD in C.mutations)
if (RESIST_COLD in C.mutations)
C.visible_message("\red A cloud of fine ice crystals engulfs [C.name], but disappears almost instantly!")
return
var/handle_suit = 0
@@ -392,7 +392,7 @@
else usr.pixel_y -= 8
sleep(1)
if (M_FAT in usr.mutations && prob(66))
if (FAT in usr.mutations && prob(66))
usr.visible_message("\red <b>[usr.name]</b> crashes due to their heavy weight!")
//playsound(usr.loc, 'zhit.wav', 50, 1)
usr.weakened += 10
@@ -481,7 +481,7 @@
activation_messages = list("You suddenly notice more about others than you did before.")
deactivation_messages = list("You no longer feel able to sense intentions.")
instability=1
mutation=M_EMPATH
mutation=EMPATH
New()
..()
@@ -514,7 +514,7 @@
usr << "\red You may only use this on other organic beings."
return
if (M_PSY_RESIST in M.mutations)
if (PSY_RESIST in M.mutations)
usr << "\red You can't see into [M.name]'s mind at all!"
return
@@ -578,7 +578,7 @@
usr << "\blue <b>Numbers</b>: You sense the number[numbers.len>1?"s":""] [english_list(numbers)] [numbers.len>1?"are":"is"] important to [M.name]."
usr << "\blue <b>Thoughts</b>: [M.name] is currently [thoughts]."
if (M_EMPATH in M.mutations)
if (EMPATH in M.mutations)
M << "\red You sense [usr.name] reading your mind."
else if (prob(5) || M.mind.assigned_role=="Chaplain")
M << "\red You sense someone intruding upon your thoughts..."
@@ -594,7 +594,7 @@
deactivation_messages = list("You no longer feel gassy. What a relief!")
instability=1
mutation = M_SUPER_FART
mutation = SUPER_FART
New()
..()
code/game/dna/genes/powers.dm
+13 -13
View File
@@ -5,7 +5,7 @@
/datum/dna/gene/basic/nobreath
name="No Breathing"
activation_messages=list("You feel no need to breathe.")
mutation=M_NO_BREATH
mutation=NO_BREATH
instability=2
New()
@@ -15,7 +15,7 @@
/datum/dna/gene/basic/regenerate
name="Regenerate"
activation_messages=list("You feel better.")
mutation=M_REGEN
mutation=REGEN
instability=2
New()
@@ -24,7 +24,7 @@
/datum/dna/gene/basic/increaserun
name="Super Speed"
activation_messages=list("Your leg muscles pulsate.")
mutation=M_RUN
mutation=RUN
instability=1
New()
@@ -34,7 +34,7 @@
/datum/dna/gene/basic/heat_resist
name="Heat Resistance"
activation_messages=list("Your skin is icy to the touch.")
mutation=M_RESIST_HEAT
mutation=RESIST_HEAT
instability=2
New()
@@ -45,7 +45,7 @@
return !(/datum/dna/gene/basic/cold_resist in M.active_genes)
// Probability check
var/_prob = 15
if(M_RESIST_COLD in M.mutations)
if(RESIST_COLD in M.mutations)
_prob=5
if(probinj(_prob,(flags&MUTCHK_FORCED)))
return 1
@@ -56,7 +56,7 @@
/datum/dna/gene/basic/cold_resist
name="Cold Resistance"
activation_messages=list("Your body is filled with warmth.")
mutation=M_RESIST_COLD
mutation=RESIST_COLD
instability=2
New()
@@ -67,7 +67,7 @@
return !(/datum/dna/gene/basic/heat_resist in M.active_genes)
// Probability check
var/_prob=30
if(M_RESIST_HEAT in M.mutations)
if(RESIST_HEAT in M.mutations)
_prob=5
if(probinj(_prob,(flags&MUTCHK_FORCED)))
return 1
@@ -78,7 +78,7 @@
/datum/dna/gene/basic/noprints
name="No Prints"
activation_messages=list("Your fingers feel numb.")
mutation=M_FINGERPRINTS
mutation=FINGERPRINTS
instability=1
New()
@@ -87,7 +87,7 @@
/datum/dna/gene/basic/noshock
name="Shock Immunity"
activation_messages=list("Your skin feels strange.")
mutation=M_NO_SHOCK
mutation=NO_SHOCK
instability=2
New()
@@ -96,7 +96,7 @@
/datum/dna/gene/basic/midget
name="Midget"
activation_messages=list("Your skin feels rubbery.")
mutation=M_DWARF
mutation=DWARF
instability=1
New()
@@ -104,7 +104,7 @@
can_activate(var/mob/M,var/flags)
// Can't be big and small.
if(M_HULK in M.mutations)
if(HULK in M.mutations)
return 0
return ..(M,flags)
@@ -115,7 +115,7 @@
/datum/dna/gene/basic/xray
name="X-Ray Vision"
activation_messages=list("The walls suddenly disappear.")
mutation=M_XRAY
mutation=XRAY
instability=2
New()
@@ -124,7 +124,7 @@
/datum/dna/gene/basic/tk
name="Telekenesis"
activation_messages=list("You feel smarter.")
mutation=M_TK
mutation=TK
activation_prob=15
instability=5
code/game/dna/genes/vg_disabilities.dm
+2 -2
View File
@@ -30,7 +30,7 @@
can_activate(var/mob/M,var/flags)
// No loud whispering.
if(M_LOUD in M.mutations)
if(LOUD in M.mutations)
return 0
return ..(M,flags)
@@ -51,5 +51,5 @@
OnMobLife(var/mob/living/carbon/human/M)
if(!istype(M)) return
if(M_DIZZY in M.mutations)
if(DIZZY in M.mutations)
M.Dizzy(300)
code/game/dna/genes/vg_powers.dm
+11 -11
View File
@@ -26,12 +26,12 @@ Obviously, requires DNA2.
can_activate(var/mob/M,var/flags)
// Can't be big AND small.
if(M_DWARF in M.mutations)
if(DWARF in M.mutations)
return 0
return ..(M,flags)
OnDrawUnderlays(var/mob/M,var/g,var/fat)
if(M_HULK in M.mutations)
if(HULK in M.mutations)
if(fat)
return "hulk_[fat]_s"
else
@@ -40,11 +40,11 @@ Obviously, requires DNA2.
OnMobLife(var/mob/living/carbon/human/M)
if(!istype(M)) return
if(M_HULK in M.mutations)
if(HULK in M.mutations)
var/timeleft=M.hulk_time - world.time
if(M.health <= 25 || timeleft <= 0)
M.hulk_time=0 // Just to be sure.
M.mutations.Remove(M_HULK)
M.mutations.Remove(HULK)
//M.dna.SetSEState(HULKBLOCK,0)
M.update_mutations() //update our mutation overlays
M.update_body()
@@ -78,7 +78,7 @@ Obviously, requires DNA2.
return
var/mob/living/carbon/human/M=usr
M.hulk_time = world.time + HULK_DURATION
M.mutations.Add(M_HULK)
M.mutations.Add(HULK)
M.update_mutations() //update our mutation overlays
M.update_body()
//M.say(pick("",";")+pick("HULK MAD","YOU MADE HULK ANGRY")) // Just a note to security.
@@ -98,7 +98,7 @@ Obviously, requires DNA2.
deactivation_messages = list("You body feels normal.")
mutation=M_MORPH
mutation=MORPH
instability=2
New()
@@ -197,7 +197,7 @@ Obviously, requires DNA2.
/datum/dna/gene/basic/grant_spell/remotetalk
name="Telepathy"
activation_messages=list("You expand your mind outwards.")
mutation=M_REMOTE_TALK
mutation=REMOTE_TALK
instability=1
spelltype =/obj/effect/proc_holder/spell/wizard/targeted/remotetalk
@@ -244,7 +244,7 @@ Obviously, requires DNA2.
var/say = strip_html(input("What do you wish to say"))
for(var/mob/living/target in targets)
if(M_REMOTE_TALK in target.mutations)
if(REMOTE_TALK in target.mutations)
target.show_message("\blue You hear [usr.real_name]'s voice: [say]")
else
target.show_message("\blue You hear a voice that seems to echo around the room: [say]")
@@ -257,7 +257,7 @@ Obviously, requires DNA2.
/datum/dna/gene/basic/grant_spell/remoteview
name="Remote Viewing"
activation_messages=list("Your mind expands.")
mutation=M_REMOTE_VIEW
mutation=REMOTE_VIEW
instability=3
spelltype =/obj/effect/proc_holder/spell/wizard/targeted/remoteview
@@ -283,7 +283,7 @@ Obviously, requires DNA2.
var/list/targets = living_mob_list
var/list/remoteviewers = new /list()
for(var/mob/M in targets)
if(M_REMOTE_VIEW in M.mutations)
if(REMOTE_VIEW in M.mutations)
remoteviewers += M
if(!remoteviewers.len || remoteviewers.len == 1)
usr << "<span class='warning'>No valid targets with remote view were found!</span>"
@@ -316,7 +316,7 @@ Obviously, requires DNA2.
for(var/mob/living/L in targets)
if(ishuman(L))
var/mob/living/carbon/human/H = L
if(M_PSY_RESIST in H.mutations)
if(PSY_RESIST in H.mutations)
continue
target = L
code/game/gamemodes/changeling/changeling.dm
+2 -2
View File
@@ -148,7 +148,7 @@ var/list/possible_changeling_IDs = list("Alpha","Beta","Gamma","Delta","Epsilon"
if (changeling.current.mind)
if (changeling.current.mind.assigned_role == "Clown")
changeling.current << "You have evolved beyond your clownish nature, allowing you to wield weapons without harming yourself."
changeling.current.mutations.Remove(M_CLUMSY)
changeling.current.mutations.Remove(CLUMSY)
var/obj_count = 1
for(var/datum/objective/objective in changeling.objectives)
@@ -294,7 +294,7 @@ var/list/possible_changeling_IDs = list("Alpha","Beta","Gamma","Delta","Epsilon"
user << "<span class='warning'>[T] is not compatible with our biology.</span>"
return
if((M_NOCLONE || SKELETON || M_HUSK) in T.mutations)
if((NOCLONE || SKELETON || HUSK) in T.mutations)
user << "<span class='warning'>DNA of [target] is ruined beyond usability!</span>"
return
code/game/gamemodes/changeling/powers/tiny_prick.dm
+1 -1
View File
@@ -82,7 +82,7 @@
/obj/effect/proc_holder/changeling/sting/transformation/can_sting(var/mob/user, var/mob/target)
if(!..())
return
if((M_HUSK in target.mutations) || (!ishuman(target) && !ismonkey(target)))
if((HUSK in target.mutations) || (!ishuman(target) && !ismonkey(target)))
user << "<span class='warning'>Our sting appears ineffective against its DNA.</span>"
return 0
if(ishuman(target))
code/game/gamemodes/cult/cult.dm
+1 -1
View File
@@ -132,7 +132,7 @@
if (mob.mind)
if (mob.mind.assigned_role == "Clown")
mob << "Your training has allowed you to overcome your clownish nature, allowing you to wield weapons without harming yourself."
mob.mutations.Remove(M_CLUMSY)
mob.mutations.Remove(CLUMSY)
add_cult_viewpoint(mob) // give them a viewpoint
code/game/gamemodes/cult/runes.dm
+2 -2
View File
@@ -1019,7 +1019,7 @@ var/list/sacrificed = list()
if(iscarbon(L))
var/mob/living/carbon/C = L
flick("e_flash", C.flash)
if(C.stuttering < 1 && (!(M_HULK in C.mutations)))
if(C.stuttering < 1 && (!(HULK in C.mutations)))
C.stuttering = 1
C.Weaken(1)
C.Stun(1)
@@ -1046,7 +1046,7 @@ var/list/sacrificed = list()
else if(iscarbon(T))
var/mob/living/carbon/C = T
flick("e_flash", C.flash)
if (!(M_HULK in C.mutations))
if (!(HULK in C.mutations))
C.silent += 15
C.Weaken(25)
C.Stun(25)
code/game/gamemodes/events/ninja_equipment.dm
+1 -1
View File
@@ -1555,7 +1555,7 @@ It is possible to destroy the net by the occupant or someone else.
return
attack_hand()
if (M_HULK in usr.mutations)
if (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)
code/game/gamemodes/revolution/revolution.dm
+1 -1
View File
@@ -183,7 +183,7 @@
if (mob.mind)
if (mob.mind.assigned_role == "Clown")
mob << "Your training has allowed you to overcome your clownish nature, allowing you to wield weapons without harming yourself."
mob.mutations.Remove(M_CLUMSY)
mob.mutations.Remove(CLUMSY)
var/obj/item/device/flash/T = new(mob)
code/game/gamemodes/traitor/traitor.dm
+1 -1
View File
@@ -301,7 +301,7 @@
if (traitor_mob.mind)
if (traitor_mob.mind.assigned_role == "Clown")
traitor_mob << "Your training has allowed you to overcome your clownish nature, allowing you to wield weapons without harming yourself."
traitor_mob.mutations.Remove(M_CLUMSY)
traitor_mob.mutations.Remove(CLUMSY)
// find a radio! toolbox(es), backpack, belt, headset
var/obj/item/R = locate(/obj/item/device/pda) in traitor_mob.contents //Hide the uplink in a PDA if available, otherwise radio
code/game/gamemodes/vampire/vampire.dm
+1 -1
View File
@@ -193,7 +193,7 @@ You are weak to holy things and starlight. Don't go into space and avoid the Cha
if (vampire.current.mind)
if (vampire.current.mind.assigned_role == "Clown")
vampire.current << "Your lust for blood has allowed you to overcome your clumsy nature allowing you to wield weapons without harming yourself."
vampire.current.mutations.Remove(M_CLUMSY)
vampire.current.mutations.Remove(CLUMSY)
var/obj_count = 1
for(var/datum/objective/objective in vampire.objectives)
code/game/gamemodes/wizard/rightandwrong.dm
+2 -2
View File
@@ -111,8 +111,8 @@
new /obj/item/clothing/head/helmet/space/rig/wizard(get_turf(H))
if("scrying")
new /obj/item/weapon/scrying(get_turf(H))
if (!(M_XRAY in H.mutations))
H.mutations.Add(M_XRAY)
if (!(XRAY in H.mutations))
H.mutations.Add(XRAY)
H.sight |= (SEE_MOBS|SEE_OBJS|SEE_TURFS)
H.see_in_dark = 8
H.see_invisible = SEE_INVISIBLE_LEVEL_TWO
code/game/gamemodes/wizard/spellbook.dm
+2 -2
View File
@@ -366,8 +366,8 @@
if("scrying")
feedback_add_details("wizard_spell_learned","SO") //please do not change the abbreviation to keep data processing consistent. Add a unique id to any new spells
new /obj/item/weapon/scrying(get_turf(H))
if (!(M_XRAY in H.mutations))
H.mutations.Add(M_XRAY)
if (!(XRAY in H.mutations))
H.mutations.Add(XRAY)
H.sight |= (SEE_MOBS|SEE_OBJS|SEE_TURFS)
H.see_in_dark = 8
H.see_invisible = SEE_INVISIBLE_LEVEL_TWO
code/game/jobs/job/security.dm
+1 -1
View File
@@ -147,7 +147,7 @@
L.part = affected
H.dna.SetSEState(SOBERBLOCK,1)
H.mutations += M_SOBER
H.mutations += SOBER
H.check_mutations = 1
return 1
code/game/jobs/job/support.dm
+2 -2
View File
@@ -31,7 +31,7 @@
H.equip_or_collect(new /obj/item/weapon/storage/box/survival(H), slot_in_backpack)
H.dna.SetSEState(SOBERBLOCK,1)
H.mutations += M_SOBER
H.mutations += SOBER
H.check_mutations = 1
return 1
@@ -226,7 +226,7 @@
H.equip_or_collect(new /obj/item/toy/crayon/rainbow(H), slot_in_backpack)
H.equip_or_collect(new /obj/item/weapon/storage/fancy/crayons(H), slot_in_backpack)
H.equip_or_collect(new /obj/item/weapon/reagent_containers/spray/waterflower(H), slot_in_backpack)
H.mutations.Add(M_CLUMSY)
H.mutations.Add(CLUMSY)
return 1
code/game/machinery/OpTable.dm
+2 -2
View File
@@ -43,7 +43,7 @@
del(src)
/obj/machinery/optable/attack_paw(mob/user as mob)
if ((M_HULK in usr.mutations))
if ((HULK in usr.mutations))
usr << text("\blue You destroy the operating table.")
visible_message("\red [usr] destroys the operating table!")
src.density = 0
@@ -56,7 +56,7 @@
return
/obj/machinery/optable/attack_hand(mob/user as mob)
if (M_HULK in usr.mutations)
if (HULK in usr.mutations)
usr << text("\blue You destroy the table.")
visible_message("\red [usr] destroys the operating table!")
src.density = 0
code/game/machinery/bots/ed209bot.dm
+1 -1
View File
@@ -257,7 +257,7 @@ Auto Patrol[]"},
icon_state = "[lasercolor]ed209[on]"
var/mob/living/carbon/M = target
if(istype(M, /mob/living/carbon/human))
if( M.stuttering < 5 && !(M_HULK in M.mutations) )
if( M.stuttering < 5 && !(HULK in M.mutations) )
M.stuttering = 5
M.Stun(5)
M.Weaken(5)
code/game/machinery/bots/secbot.dm
+1 -1
View File
@@ -241,7 +241,7 @@ Auto Patrol: []"},
icon_state = "[base_icon][on]"
var/mob/living/carbon/M = target
if(istype(M, /mob/living/carbon/human))
if( M.stuttering < 5 && !(M_HULK in M.mutations) )
if( M.stuttering < 5 && !(HULK in M.mutations) )
M.stuttering = 5
if(harmbaton) // Bots with harmbaton enabled become shitcurity. - Dave
M.apply_damage(10)
code/game/machinery/computer/cloning.dm
+1 -1
View File
@@ -329,7 +329,7 @@
scantemp = "<span class=\"bad\">Error: Mental interface failure.</span>"
nanomanager.update_uis(src)
return
if ((M_NOCLONE in subject.mutations) && src.scanner.scan_level < 2)
if ((NOCLONE in subject.mutations) && src.scanner.scan_level < 2)
scantemp = "<span class=\"bad\">Error: Mental interface failure.</span>"
nanomanager.update_uis(src)
return
code/game/machinery/iv_drip.dm
+1 -1
View File
@@ -110,7 +110,7 @@
if(!istype(T)) return
if(!T.dna)
return
if(M_NOCLONE in T.mutations)
if(NOCLONE in T.mutations)
return
if(T.species && T.species.flags & NO_BLOOD)
code/game/machinery/machinery.dm
+1 -1
View File
@@ -218,7 +218,7 @@ Class Procs:
if(restrained() || lying || stat || stunned || weakened)
return
if(be_close && !in_range(M, src))
if(M_TK in mutations)
if(TK in mutations)
var/mob/living/carbon/human/H = M
if(istype(H.l_hand, /obj/item/tk_grab) || istype(H.r_hand, /obj/item/tk_grab))
return 1
code/game/machinery/programmable_unloader.dm
+1 -1
View File
@@ -510,7 +510,7 @@
return
playsound(loc, "punch", 25, 1, -1)
if(M_HULK in H.mutations) damage += 5
if(HULK in H.mutations) damage += 5
if(damage < 5)
visible_message("[H] gives \the [src] a weak punch.")
code/game/machinery/wishgranter.dm
+13 -13
View File
@@ -58,29 +58,29 @@
charges--
insisting = 0
if (!(M_HULK in user.mutations))
if (!(HULK in user.mutations))
user.dna.SetSEState(HULKBLOCK,1)
if (!(M_LASER in user.mutations))
user.mutations.Add(M_LASER)
if (!(LASER in user.mutations))
user.mutations.Add(LASER)
if (!(M_XRAY in user.mutations))
user.mutations.Add(M_XRAY)
if (!(XRAY in user.mutations))
user.mutations.Add(XRAY)
user.sight |= (SEE_MOBS|SEE_OBJS|SEE_TURFS)
user.see_in_dark = 8
user.see_invisible = SEE_INVISIBLE_LEVEL_TWO
if (!(M_RESIST_COLD in user.mutations))
user.mutations.Add(M_RESIST_COLD)
if (!(RESIST_COLD in user.mutations))
user.mutations.Add(RESIST_COLD)
if (!(M_RESIST_HEAT in user.mutations))
user.mutations.Add(M_RESIST_HEAT)
if (!(RESIST_HEAT in user.mutations))
user.mutations.Add(RESIST_HEAT)
if (!(M_TK in user.mutations))
user.mutations.Add(M_TK)
if (!(TK in user.mutations))
user.mutations.Add(TK)
if(!(M_REGEN in user.mutations))
user.mutations.Add(M_REGEN)
if(!(REGEN in user.mutations))
user.mutations.Add(REGEN)
user.update_mutations()
code/game/mecha/mecha.dm
+1 -1
View File
@@ -461,7 +461,7 @@
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))
if ((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("<font color='red'><b>[user] hits [src.name], doing some damage.</b></font>", "<font color='red'><b>You hit [src.name] with all your might. The metal creaks and bends.</b></font>")
code/game/objects/effects/aliens.dm
+1 -1
View File
@@ -101,7 +101,7 @@
/obj/structure/alien/resin/attack_hand(mob/living/user)
if(M_HULK in user.mutations)
if(HULK in user.mutations)
user.visible_message("<span class='danger'>[user] destroys [src]!</span>")
health = 0
healthcheck()
code/game/objects/effects/effect_system.dm
+1 -1
View File
@@ -1074,7 +1074,7 @@ steam.start() -- spawns the effect
return
attack_hand(var/mob/user)
if ((M_HULK in user.mutations) || (prob(75 - metal*25)))
if ((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 )))
code/game/objects/items.dm
+3 -3
View File
@@ -126,7 +126,7 @@
if(5.0)
size = "huge"
else
//if ((M_CLUMSY in usr.mutations) && prob(50)) t = "funny-looking"
//if ((CLUMSY in usr.mutations) && prob(50)) t = "funny-looking"
usr << "This is a [src.blood_DNA ? "bloody " : ""]\icon[src][src.name]. It is a [size] item."
if(src.desc)
usr << src.desc
@@ -300,7 +300,7 @@
if(istype(src, /obj/item/clothing/under) || istype(src, /obj/item/clothing/suit))
if(M_FAT in H.mutations)
if(FAT in H.mutations)
testing("[M] TOO FAT TO WEAR [src]!")
if(!(flags & ONESIZEFITSALL))
if(!disable_warning)
@@ -612,7 +612,7 @@
M.LAssailant = user
src.add_fingerprint(user)
//if((M_CLUMSY in user.mutations) && prob(50))
//if((CLUMSY in user.mutations) && prob(50))
// M = user
/*
M << "\red You stab yourself in the eye."
code/game/objects/items/devices/flash.dm
+1 -1
View File
@@ -16,7 +16,7 @@
/obj/item/device/flash/proc/clown_check(mob/user)
if(user && (M_CLUMSY in user.mutations) && prob(50))
if(user && (CLUMSY in user.mutations) && prob(50))
flash_carbon(user, user, 15, 0)
return 0
return 1
code/game/objects/items/devices/flashlight.dm
+2 -2
View File
@@ -49,7 +49,7 @@
add_fingerprint(user)
if(on && user.zone_sel.selecting == "eyes")
if(((M_CLUMSY in user.mutations) || user.getBrainLoss() >= 60) && prob(50)) //too dumb to use flashlight properly
if(((CLUMSY in user.mutations) || user.getBrainLoss() >= 60) && prob(50)) //too dumb to use flashlight properly
return ..() //just hit them in the head
if(!(istype(user, /mob/living/carbon/human) || ticker) && ticker.mode.name != "monkey") //don't have dexterity
@@ -77,7 +77,7 @@
if(istype(M, /mob/living/carbon/human) || istype(M, /mob/living/carbon/monkey)) //robots and aliens are unaffected
if(M.stat == DEAD || M.sdisabilities & BLIND) //mob is dead or fully blind
user << "<span class='notice'>[M] pupils does not react to the light!</span>"
else if(M_XRAY in M.mutations) //mob has X-RAY vision
else if(XRAY in M.mutations) //mob has X-RAY vision
flick("flash", M.flash) //Yes, you can still get flashed wit X-Ray.
user << "<span class='notice'>[M] pupils give an eerie glow!</span>"
else //they're okay!
code/game/objects/items/devices/scanners.dm
+1 -1
View File
@@ -110,7 +110,7 @@ REAGENT SCANNER
/obj/item/device/healthanalyzer/attack(mob/living/M as mob, mob/living/user as mob)
if (( (M_CLUMSY in user.mutations) || user.getBrainLoss() >= 60) && prob(50))
if (( (CLUMSY in user.mutations) || user.getBrainLoss() >= 60) && prob(50))
user << text("\red You try to analyze the floor's vitals!")
for(var/mob/O in viewers(M, null))
O.show_message(text("\red [user] has analyzed the floor's vitals!"), 1)
code/game/objects/items/weapons/defib.dm
+2 -2
View File
@@ -363,7 +363,7 @@
for(var/datum/organ/external/O in H.organs)
total_brute += O.brute_dam
total_burn += O.burn_dam
if(H.health <= config.health_threshold_dead && total_burn <= 180 && total_brute <= 180 && !H.suiciding && !ghost && tplus < tlimit && !(M_NOCLONE in H.mutations))
if(H.health <= config.health_threshold_dead && total_burn <= 180 && total_brute <= 180 && !H.suiciding && !ghost && tplus < tlimit && !(NOCLONE in H.mutations))
tobehealed = health + threshold
tobehealed -= 5 //They get 5 of each type of damage healed so excessive combined damage will not immediately kill them after they get revived
H.adjustOxyLoss(tobehealed)
@@ -471,7 +471,7 @@
for(var/datum/organ/external/O in H.organs)
total_brute += O.brute_dam
total_burn += O.burn_dam
if(H.health <= config.health_threshold_dead && total_burn <= 180 && total_brute <= 180 && !H.suiciding && !ghost && tplus < tlimit && !(M_NOCLONE in H.mutations))
if(H.health <= config.health_threshold_dead && total_burn <= 180 && total_brute <= 180 && !H.suiciding && !ghost && tplus < tlimit && !(NOCLONE in H.mutations))
tobehealed = health + threshold
tobehealed -= 5 //They get 5 of each type of damage healed so excessive combined damage will not immediately kill them after they get revived
H.adjustOxyLoss(tobehealed)
code/game/objects/items/weapons/dna_injector.dm
+1 -1
View File
@@ -67,7 +67,7 @@
if(istype(M,/mob/living))
M.apply_effect(rand(5,20),IRRADIATE,0)
if (!(M_NOCLONE in M.mutations)) // prevents drained people from having their DNA changed
if (!(NOCLONE in M.mutations)) // prevents drained people from having their DNA changed
// UI in syringe.
if (buf.types & DNA2_BUF_UI)
if (!block) //isolated block?
code/game/objects/items/weapons/grenades/grenade.dm
+1 -1
View File
@@ -14,7 +14,7 @@
var/display_timer = 1
/obj/item/weapon/grenade/proc/clown_check(var/mob/living/user)
if((M_CLUMSY in user.mutations) && prob(50))
if((CLUMSY in user.mutations) && prob(50))
user << "<span class='warning'>Huh? How does this thing work?</span>"
active = 1
icon_state = initial(icon_state) + "_active"
code/game/objects/items/weapons/handcuffs.dm
+1 -1
View File
@@ -17,7 +17,7 @@
var/trashtype = null //For disposable cuffs
/obj/item/weapon/restraints/handcuffs/attack(mob/living/carbon/C, mob/user)
if(M_CLUMSY in user.mutations && prob(50))
if(CLUMSY in user.mutations && prob(50))
user << "<span class='warning'>Uh... how do those things work?!</span>"
apply_cuffs(user,user)
code/game/objects/items/weapons/kitchen.dm
+5 -5
View File
@@ -42,7 +42,7 @@
if(user.a_intent != "help")
if(user.zone_sel.selecting == "head" || user.zone_sel.selecting == "eyes")
if((M_CLUMSY in user.mutations) && prob(50))
if((CLUMSY in user.mutations) && prob(50))
M = user
return eyestab(M,user)
else
@@ -103,7 +103,7 @@
return (BRUTELOSS)
/obj/item/weapon/kitchen/utensil/knife/attack(target as mob, mob/living/user as mob)
if ((M_CLUMSY in user.mutations) && prob(50))
if ((CLUMSY in user.mutations) && prob(50))
user << "\red You accidentally cut yourself with the [src]."
user.take_organ_damage(20)
return
@@ -118,7 +118,7 @@
throwforce = 10.0
/obj/item/weapon/kitchen/utensil/knife/attack(target as mob, mob/living/user as mob)
if ((M_CLUMSY in user.mutations) && prob(50))
if ((CLUMSY in user.mutations) && prob(50))
user << "\red You somehow managed to cut yourself with the [src]."
user.take_organ_damage(20)
return
@@ -216,7 +216,7 @@
attack_verb = list("bashed", "battered", "bludgeoned", "thrashed", "whacked") //I think the rollingpin attackby will end up ignoring this anyway.
/obj/item/weapon/kitchen/rollingpin/attack(mob/living/M as mob, mob/living/user as mob)
if ((M_CLUMSY in user.mutations) && prob(50))
if ((CLUMSY in user.mutations) && prob(50))
user << "\red The [src] slips out of your hand and hits your head."
user.take_organ_damage(10)
user.Paralyse(2)
@@ -303,7 +303,7 @@
sleep(rand(2,4))
if((M_CLUMSY in user.mutations) && prob(50)) //What if he's a clown?
if((CLUMSY in user.mutations) && prob(50)) //What if he's a clown?
M << "\red You accidentally slam yourself with the [src]!"
M.Weaken(1)
user.take_organ_damage(2)
code/game/objects/items/weapons/storage/bible.dm
+1 -1
View File
@@ -66,7 +66,7 @@
user.take_organ_damage(0,10)
return
if ((M_CLUMSY in user.mutations) && prob(50))
if ((CLUMSY in user.mutations) && prob(50))
user << "\red The [src] slips out of your hand and hits your head."
user.take_organ_damage(10)
user.Paralyse(20)
code/game/objects/items/weapons/storage/briefcase.dm
+1 -1
View File
@@ -19,7 +19,7 @@
/obj/item/weapon/storage/briefcase/attack(mob/living/M as mob, mob/living/user as mob)
//..()
if ((M_CLUMSY in user.mutations) && prob(50))
if ((CLUMSY in user.mutations) && prob(50))
user << "\red The [src] slips out of your hand and hits your head."
user.take_organ_damage(10)
user.Paralyse(2)
code/game/objects/items/weapons/storage/secure.dm
+1 -1
View File
@@ -179,7 +179,7 @@
//I consider this worthless but it isn't my code so whatever. Remove or uncomment.
/*attack(mob/M as mob, mob/living/user as mob)
if ((M_CLUMSY in user.mutations) && prob(50))
if ((CLUMSY in user.mutations) && prob(50))
user << "\red The [src] slips out of your hand and hits your head."
user.take_organ_damage(10)
user.Paralyse(2)
code/game/objects/items/weapons/stunbaton.dm
+1 -1
View File
@@ -101,7 +101,7 @@
add_fingerprint(user)
/obj/item/weapon/melee/baton/attack(mob/M, mob/living/user)
if(status && (M_CLUMSY in user.mutations) && prob(50))
if(status && (CLUMSY in user.mutations) && prob(50))
user.visible_message("<span class='danger'>[user] accidentally hits themself with [src]!</span>", \
"<span class='userdanger'>You accidentally hit yourself with [src]!</span>")
user.Weaken(stunforce*3)
code/game/objects/items/weapons/surgery_tools.dm
+3 -3
View File
@@ -401,9 +401,9 @@ LOOK FOR SURGERY.DM*/
if(!istype(M))
return ..()
//if(M.mutations & M_HUSK) return ..()
//if(M.mutations & HUSK) return ..()
if((M_CLUMSY in user.mutations) && prob(50))
if((CLUMSY in user.mutations) && prob(50))
M = user
return eyestab(M,user)
@@ -649,7 +649,7 @@ LOOK FOR SURGERY.DM*/
if(!istype(M))
return ..()
if((M_CLUMSY in user.mutations) && prob(50))
if((CLUMSY in user.mutations) && prob(50))
M = user
return eyestab(M,user)
code/game/objects/items/weapons/swords_axes_etc.dm
+5 -5
View File
@@ -27,7 +27,7 @@
blade_color = pick("red","blue","green","purple")
/obj/item/weapon/melee/energy/sword/attack_self(mob/living/user as mob)
if ((M_CLUMSY in user.mutations) && prob(50))
if ((CLUMSY in user.mutations) && prob(50))
user << "\red You accidentally cut yourself with [src]."
user.take_organ_damage(5,5)
active = !active
@@ -105,7 +105,7 @@
force = 10
/obj/item/weapon/melee/classic_baton/attack(mob/M as mob, mob/living/user as mob)
if ((M_CLUMSY in user.mutations) && prob(50))
if ((CLUMSY in user.mutations) && prob(50))
user << "\red You club yourself over the head."
user.Weaken(3 * force)
if(ishuman(user))
@@ -124,7 +124,7 @@
if (user.a_intent == "harm")
if(!..()) return
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))*/)
if (M.stuttering < 8 && (!(HULK in M.mutations)) /*&& (!istype(H:wear_suit, /obj/item/clothing/suit/judgerobe))*/)
M.stuttering = 8
M.Stun(8)
M.Weaken(8)
@@ -201,7 +201,7 @@
/obj/item/weapon/melee/telebaton/attack(mob/target as mob, mob/living/user as mob)
if(on)
add_fingerprint(user)
if((M_CLUMSY in user.mutations) && prob(50))
if((CLUMSY in user.mutations) && prob(50))
user << "<span class ='danger'>You club yourself over the head.</span>"
user.Weaken(3 * force)
if(ishuman(user))
@@ -295,7 +295,7 @@
return 0
/obj/item/weapon/shield/energy/attack_self(mob/living/user as mob)
if ((M_CLUMSY in user.mutations) && prob(50))
if ((CLUMSY in user.mutations) && prob(50))
user << "\red You beat yourself in the head with [src]."
user.take_organ_damage(5)
active = !active
code/game/objects/items/weapons/tools.dm
+1 -1
View File
@@ -87,7 +87,7 @@
if(!istype(M)) return ..()
if(user.zone_sel.selecting != "eyes" && user.zone_sel.selecting != "head")
return ..()
if((M_CLUMSY in user.mutations) && prob(50))
if((CLUMSY in user.mutations) && prob(50))
M = user
return eyestab(M,user)
code/game/objects/items/weapons/twohanded.dm
+1 -1
View File
@@ -227,7 +227,7 @@ obj/item/weapon/twohanded/
/obj/item/weapon/twohanded/dualsaber/attack(target as mob, mob/living/user as mob)
..()
if((M_CLUMSY in user.mutations) && (wielded) &&prob(40))
if((CLUMSY in user.mutations) && (wielded) &&prob(40))
user << "\red You twirl around a bit before losing your balance and impaling yourself on the [src]."
user.take_organ_damage(20,25)
return
code/game/objects/items/weapons/weaponry.dm
+1 -1
View File
@@ -47,7 +47,7 @@
user << "\red You don't have the dexterity to do this!"
return
if ((M_CLUMSY in user.mutations) && prob(50))
if ((CLUMSY in user.mutations) && prob(50))
user << "\red The rod slips out of your hand and hits your head."
user.take_organ_damage(10)
user.Paralyse(20)
code/game/objects/structures/grille.dm
+1 -1
View File
@@ -67,7 +67,7 @@
if(shock(user, 70))
return
if(M_HULK in user.mutations)
if(HULK in user.mutations)
health -= 5
else
health -= 1
code/game/objects/structures/tables_racks.dm
+4 -4
View File
@@ -279,7 +279,7 @@
destroy()
/obj/structure/table/attack_paw(mob/user)
if(M_HULK in user.mutations)
if(HULK in user.mutations)
user.say(pick(";RAAAAAAAARGH!", ";HNNNNNNNNNGGGGGGH!", ";GWAAAAAAAARRRHHH!", "NNNNNNNNGGGGGGGGHH!", ";AAAAAAARRRGH!" ))
visible_message("<span class='danger'>[user] smashes the [src] apart!</span>")
destroy()
@@ -297,7 +297,7 @@
/obj/structure/table/attack_hand(mob/user)
if(M_HULK in user.mutations)
if(HULK in user.mutations)
visible_message("<span class='danger'>[user] smashes [src] apart!</span>")
user.say(pick(";RAAAAAAAARGH!", ";HNNNNNNNNNGGGGGGH!", ";GWAAAAAAAARRRHHH!", "NNNNNNNNGGGGGGGGHH!", ";AAAAAAARRRGH!" ))
destroy()
@@ -760,14 +760,14 @@
/obj/structure/table/attack_hand(mob/user)
if(M_HULK in user.mutations)
if(HULK in user.mutations)
visible_message("<span class='danger'>[user] smashes [src] apart!</span>")
user.say(pick(";RAAAAAAAARGH!", ";HNNNNNNNNNGGGGGGH!", ";GWAAAAAAAARRRHHH!", "NNNNNNNNGGGGGGGGHH!", ";AAAAAAARRRGH!" ))
destroy()
/obj/structure/rack/attack_paw(mob/user)
if(M_HULK in user.mutations)
if(HULK in user.mutations)
user.say(pick(";RAAAAAAAARGH!", ";HNNNNNNNNNGGGGGGH!", ";GWAAAAAAAARRRHHH!", "NNNNNNNNGGGGGGGGHH!", ";AAAAAAARRRGH!" ))
visible_message("<span class='danger'>[user] smashes [src] apart!</span>")
destroy()
code/game/objects/structures/window.dm
+1 -1
View File
@@ -153,7 +153,7 @@ var/global/wcColored
/obj/structure/window/attack_hand(mob/user as mob)
if(M_HULK in user.mutations)
if(HULK in user.mutations)
user.say(pick(";RAAAAAAAARGH!", ";HNNNNNNNNNGGGGGGH!", ";GWAAAAAAAARRRHHH!", "NNNNNNNNGGGGGGGGHH!", ";AAAAAAARRRGH!"))
user.visible_message("<span class='danger'>[user] smashes through [src]!</span>")
var/pdiff=performWallPressureCheck(src.loc)
code/game/turfs/simulated/walls.dm
+2 -2
View File
@@ -242,7 +242,7 @@
/turf/simulated/wall/attack_paw(mob/user as mob)
user.changeNext_move(CLICK_CD_MELEE)
if ((M_HULK in user.mutations))
if ((HULK in user.mutations))
if (prob(40))
usr << text("\blue You smash through the wall.")
usr.say(pick(";RAAAAAAAARGH!", ";HNNNNNNNNNGGGGGGH!", ";GWAAAAAAAARRRHHH!", "NNNNNNNNGGGGGGGGHH!", ";AAAAAAARRRGH!" ))
@@ -272,7 +272,7 @@
/turf/simulated/wall/attack_hand(mob/user as mob)
user.changeNext_move(CLICK_CD_MELEE)
if (M_HULK in user.mutations)
if (HULK in user.mutations)
if (prob(40) || rotting)
user << text("\blue You smash through the wall.")
user.say(pick(";RAAAAAAAARGH!", ";HNNNNNNNNNGGGGGGH!", ";GWAAAAAAAARRRHHH!", "NNNNNNNNGGGGGGGGHH!", ";AAAAAAARRRGH!" ))
code/game/turfs/simulated/walls_reinforced.dm
+1 -1
View File
@@ -13,7 +13,7 @@
var/d_state = 0
/turf/simulated/wall/r_wall/attack_hand(mob/user as mob)
if (M_HULK in user.mutations)
if (HULK in user.mutations)
if (prob(10) || rotting)
usr << text("\blue You smash through the wall.")
usr.say(pick(";RAAAAAAAARGH!", ";HNNNNNNNNNGGGGGGH!", ";GWAAAAAAAARRRHHH!", "NNNNNNNNGGGGGGGGHH!", ";AAAAAAARRRGH!" ))
code/modules/admin/verbs/honksquad.dm
+1 -1
View File
@@ -119,7 +119,7 @@ var/global/sent_honksquad = 0
equip_to_slot_or_del(new /obj/item/toy/crayon/rainbow(src), slot_in_backpack)
equip_to_slot_or_del(new /obj/item/weapon/gun/energy/clown(src), slot_in_backpack)
equip_to_slot_or_del(new /obj/item/weapon/reagent_containers/spray/waterflower(src), slot_in_backpack)
src.mutations.Add(M_CLUMSY)
src.mutations.Add(CLUMSY)
code/modules/assembly/mousetrap.dm
+3 -3
View File
@@ -19,7 +19,7 @@
if(!armed)
if(ishuman(usr))
var/mob/living/carbon/human/user = usr
if(((user.getBrainLoss() >= 60 || (M_CLUMSY in user.mutations)) && prob(50)))
if(((user.getBrainLoss() >= 60 || (CLUMSY in user.mutations)) && prob(50)))
user << "Your hand slips, setting off the trigger."
pulse(0)
update_icon()
@@ -69,7 +69,7 @@
if(!armed)
user << "<span class='notice'>You arm [src].</span>"
else
if(((user.getBrainLoss() >= 60 || (M_CLUMSY in user.mutations)) && prob(50)))
if(((user.getBrainLoss() >= 60 || (CLUMSY in user.mutations)) && prob(50)))
var/which_hand = "l_hand"
if(!user.hand)
which_hand = "r_hand"
@@ -85,7 +85,7 @@
attack_hand(mob/living/user as mob)
if(armed)
if(((user.getBrainLoss() >= 60 || M_CLUMSY in user.mutations)) && prob(50))
if(((user.getBrainLoss() >= 60 || CLUMSY in user.mutations)) && prob(50))
var/which_hand = "l_hand"
if(!user.hand)
which_hand = "r_hand"
code/modules/awaymissions/mission_code/wildwest.dm
+3 -3
View File
@@ -77,9 +77,9 @@
if("Power")
user << "<B>Your wish is granted, but at a terrible cost...</B>"
user << "The Wish Granter punishes you for your selfishness, claiming your soul and warping your body to match the darkness in your heart."
user.mutations.Add(M_LASER)
user.mutations.Add(M_RESIST_COLD)
user.mutations.Add(M_XRAY)
user.mutations.Add(LASER)
user.mutations.Add(RESIST_COLD)
user.mutations.Add(XRAY)
user.dna.mutantrace = "shadow"
user.regenerate_icons()
if("Wealth")
code/modules/client/preferences.dm
+2 -2
View File
@@ -1464,8 +1464,8 @@ datum/preferences
else continue
if(disabilities & DISABILITY_FLAG_FAT && character.species.flags & CAN_BE_FAT)//character.species.flags & CAN_BE_FAT)
character.mutations += M_FAT
character.mutations += M_OBESITY
character.mutations += FAT
character.mutations += OBESITY
if(disabilities & DISABILITY_FLAG_NEARSIGHTED)
character.disabilities|=NEARSIGHTED
if(disabilities & DISABILITY_FLAG_EPILEPTIC)
code/modules/mob/living/carbon/alien/alien.dm
+1 -1
View File
@@ -125,7 +125,7 @@
/mob/living/carbon/alien/proc/handle_mutations_and_radiation()
if(getFireLoss())
if((M_RESIST_HEAT in mutations) || prob(5))
if((RESIST_HEAT in mutations) || prob(5))
adjustFireLoss(-1)
// Aliens love radiation nom nom nom
code/modules/mob/living/carbon/alien/humanoid/humanoid.dm
+1 -1
View File
@@ -250,7 +250,7 @@
if ("harm")
var/damage = rand(1, 9)
if (prob(90))
if (M_HULK in M.mutations)//M_HULK SMASH
if (HULK in M.mutations)//HULK SMASH
damage += 14
spawn(0)
Paralyse(1)
code/modules/mob/living/carbon/alien/humanoid/life.dm
+1 -1
View File
@@ -187,7 +187,7 @@
/mob/living/carbon/alien/humanoid/proc/handle_regular_hud_updates()
if (stat == 2 || (M_XRAY in mutations))
if (stat == 2 || (XRAY in mutations))
sight |= SEE_TURFS
sight |= SEE_MOBS
sight |= SEE_OBJS
code/modules/mob/living/carbon/alien/larva/larva.dm
+2 -2
View File
@@ -36,7 +36,7 @@
now_pushing = 1
if(ismob(AM))
var/mob/tmob = AM
if(istype(tmob, /mob/living/carbon/human) && (M_FAT in tmob.mutations))
if(istype(tmob, /mob/living/carbon/human) && (FAT in tmob.mutations))
if(prob(70))
src << "\red <B>You fail to push [tmob]'s fat ass out of the way.</B>"
now_pushing = 0
@@ -146,7 +146,7 @@
if(..())
var/damage = rand(1, 9)
if (prob(90))
if (M_HULK in M.mutations)
if (HULK in M.mutations)
damage += 5
spawn(0)
Paralyse(1)
code/modules/mob/living/carbon/alien/larva/life.dm
+1 -1
View File
@@ -135,7 +135,7 @@
/mob/living/carbon/alien/larva/proc/handle_regular_hud_updates()
if (stat == 2 || (M_XRAY in mutations))
if (stat == 2 || (XRAY in mutations))
sight |= SEE_TURFS
sight |= SEE_MOBS
sight |= SEE_OBJS
code/modules/mob/living/carbon/alien/life.dm
+1 -1
View File
@@ -101,7 +101,7 @@
breath.toxins -= toxins_used
breath.oxygen += toxins_used
if(breath.temperature > (T0C+66) && !(M_RESIST_COLD in mutations)) // Hot air hurts :(
if(breath.temperature > (T0C+66) && !(RESIST_COLD in mutations)) // Hot air hurts :(
if(prob(20))
src << "<span class='danger'>You feel a searing heat in your lungs!</span>"
fire_alert = max(fire_alert, 1)
code/modules/mob/living/carbon/alien/special/snakeman.dm
+1 -1
View File
@@ -33,7 +33,7 @@
M.client.mob = new/mob/living/carbon/alien/humanoid/special/snakeman(new/obj/effect/snake_egg(src.loc))
visible_message("[src] injects [M] with an egg.")
visible_message("The egg absorbs [M]")
M.mutations |= M_NOCLONE
M.mutations |= NOCLONE
M.update_body()
M.death()
else
code/modules/mob/living/carbon/brain/life.dm
+1 -1
View File
@@ -193,7 +193,7 @@
proc/handle_regular_hud_updates()
if (stat == 2 || (M_XRAY in src.mutations))
if (stat == 2 || (XRAY in src.mutations))
sight |= SEE_TURFS
sight |= SEE_MOBS
sight |= SEE_OBJS
code/modules/mob/living/carbon/carbon.dm
+1 -1
View File
@@ -17,7 +17,7 @@
src.nutrition -= HUNGER_FACTOR/10
if(src.m_intent == "run")
src.nutrition -= HUNGER_FACTOR/10
if((M_FAT in src.mutations) && src.m_intent == "run" && src.bodytemperature <= 360)
if((FAT in src.mutations) && src.m_intent == "run" && src.bodytemperature <= 360)
src.bodytemperature += 2
// Moving around increases germ_level faster
code/modules/mob/living/carbon/human/death.dm
+3 -3
View File
@@ -151,7 +151,7 @@
return
/mob/living/carbon/human/proc/ChangeToHusk()
if(M_HUSK in mutations) return
if(HUSK in mutations) return
if(f_style)
f_style = "Shaved" //we only change the icon_state of the hair datum, so it doesn't mess up their UI/UE
@@ -159,7 +159,7 @@
h_style = "Bald"
update_hair(0)
mutations.Add(M_HUSK)
mutations.Add(HUSK)
status_flags |= DISFIGURED //makes them unknown without fucking up other stuff like admintools
update_body(0)
update_mutantrace()
@@ -167,5 +167,5 @@
/mob/living/carbon/human/proc/Drain()
ChangeToHusk()
mutations |= M_NOCLONE
mutations |= NOCLONE
return
code/modules/mob/living/carbon/human/emote.dm
+4 -4
View File
@@ -636,7 +636,7 @@
if("fart")
if(world.time-lastFart >= 600)
// playsound(src.loc, 'sound/effects/fart.ogg', 50, 1, -3) //Admins still vote no to fun
if(M_TOXIC_FARTS in mutations)
if(TOXIC_FARTS in mutations)
message = "<b>[src]</b> unleashes a [pick("horrible","terrible","foul","disgusting","awful")] fart."
else
message = "<b>[src]</b> [pick("passes wind","farts")]."
@@ -644,7 +644,7 @@
var/turf/location = get_turf(src)
var/aoe_range=2 // Default
if(M_SUPER_FART in mutations)
if(SUPER_FART in mutations)
aoe_range+=3 //Was 5
/* // If we're wearing a suit, don't blast or gas those around us.
@@ -656,7 +656,7 @@
wearing_mask=1 */
// Process toxic farts first.
if(M_TOXIC_FARTS in mutations)
if(TOXIC_FARTS in mutations)
for(var/mob/M in range(location,aoe_range))
if (M.internal != null && M.wear_mask && (M.wear_mask.flags & MASKINTERNALS))
continue
@@ -681,7 +681,7 @@
sleep(10)
S.start()
*/
if(M_SUPER_FART in mutations)
if(SUPER_FART in mutations)
visible_message("\red <b>[name]</b> hunches down and grits their teeth!")
if(do_after(usr,30))
visible_message("\red <b>[name]</b> unleashes a [pick("tremendous","gigantic","colossal")] fart!","You hear a [pick("tremendous","gigantic","colossal")] fart.")
code/modules/mob/living/carbon/human/examine.dm
+1 -1
View File
@@ -205,7 +205,7 @@
if(suiciding)
msg += "<span class='warning'>[t_He] appears to have commited suicide... there is no hope of recovery.</span>\n"
if(M_DWARF in mutations)
if(DWARF in mutations)
msg += "[t_He] [t_is] a halfling!\n"
var/distance = get_dist(usr,src)
code/modules/mob/living/carbon/human/human.dm
+3 -3
View File
@@ -143,8 +143,8 @@
slime.UpdateFeed()
return
if(istype(tmob, /mob/living/carbon/human) && (M_FAT in tmob.mutations))
if(prob(40) && !(M_FAT in src.mutations))
if(istype(tmob, /mob/living/carbon/human) && (FAT in tmob.mutations))
if(prob(40) && !(FAT in src.mutations))
src << "\red <B>You fail to push [tmob]'s fat ass out of the way.</B>"
now_pushing = 0
return
@@ -590,7 +590,7 @@
//Returns "Unknown" if facially disfigured and real_name if not. Useful for setting name when polyacided or when updating a human's name variable
/mob/living/carbon/human/proc/get_face_name()
var/datum/organ/external/head/head = get_organ("head")
if( !head || head.disfigured || (head.status & ORGAN_DESTROYED) || !real_name || (M_HUSK in mutations) ) //disfigured. use id-name if possible
if( !head || head.disfigured || (head.status & ORGAN_DESTROYED) || !real_name || (HUSK in mutations) ) //disfigured. use id-name if possible
return "Unknown"
return real_name
code/modules/mob/living/carbon/human/human_attackhand.dm
+2 -2
View File
@@ -31,7 +31,7 @@
var/datum/organ/external/affecting = get_organ(ran_zone(M.zone_sel.selecting))
var/armor_block = run_armor_check(affecting, "melee")
if(M_HULK in M.mutations) damage += 5
if(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(M_HULK in M.mutations) damage += 5
if(HULK in M.mutations) damage += 5
playsound(loc, attack.attack_sound, 25, 1, -1)
code/modules/mob/living/carbon/human/human_damage.dm
+3 -3
View File
@@ -110,15 +110,15 @@
hud_updateflag |= 1 << HEALTH_HUD
/mob/living/carbon/human/Stun(amount)
if(M_HULK in mutations) return
if(HULK in mutations) return
..()
/mob/living/carbon/human/Weaken(amount)
if(M_HULK in mutations) return
if(HULK in mutations) return
..()
/mob/living/carbon/human/Paralyse(amount)
if(M_HULK in mutations) return
if(HULK in mutations) return
..()
code/modules/mob/living/carbon/human/human_movement.dm
+3 -3
View File
@@ -11,7 +11,7 @@
if(embedded_flag)
handle_embedded_objects() //Moving with objects stuck in you can cause bad times.
if((M_RUN in mutations)) return -1
if((RUN in mutations)) return -1
var/health_deficiency = (100 - health + staminaloss)
if(health_deficiency >= 40)
@@ -55,12 +55,12 @@
tally += back.slowdown
if(M_FAT in src.mutations)
if(FAT in src.mutations)
tally += 1.5
if (bodytemperature < 283.222)
tally += (283.222 - bodytemperature) / 10 * 1.75
if(M_RUN in mutations)
if(RUN in mutations)
tally = 0
return (tally+config.human_delay)
code/modules/mob/living/carbon/human/life.dm
+15 -15
View File
@@ -303,7 +303,7 @@ var/global/list/brutefireloss_overlays = list("1" = image("icon" = 'icons/mob/sc
return
if(getFireLoss())
if((M_RESIST_HEAT in mutations) || (prob(1)))
if((RESIST_HEAT in mutations) || (prob(1)))
heal_organ_damage(0,1)
@@ -389,7 +389,7 @@ var/global/list/brutefireloss_overlays = list("1" = image("icon" = 'icons/mob/sc
proc/breathe()
if(reagents.has_reagent("lexorin")) return
if(M_NO_BREATH in mutations) return // No breath mutation means no breathing.
if(NO_BREATH in mutations) return // No breath mutation means no breathing.
if(istype(loc, /obj/machinery/atmospherics/unary/cryo_cell)) return
if(species && (species.flags & NO_BREATHE)) return
@@ -618,7 +618,7 @@ var/global/list/brutefireloss_overlays = list("1" = image("icon" = 'icons/mob/sc
else if(adjusted_pressure >= species.hazard_low_pressure)
pressure_alert = -1
else
if( !(M_RESIST_COLD in mutations))
if( !(RESIST_COLD in mutations))
take_overall_damage(brute=LOW_PRESSURE_DAMAGE, used_weapon = "Low Pressure")
pressure_alert = -2
else
@@ -720,7 +720,7 @@ var/global/list/brutefireloss_overlays = list("1" = image("icon" = 'icons/mob/sc
var/thermal_protection_flags = get_heat_protection_flags(temperature)
var/thermal_protection = 0.0
if(M_RESIST_HEAT in mutations)
if(RESIST_HEAT in mutations)
return 1
if(thermal_protection_flags)
if(thermal_protection_flags & HEAD)
@@ -777,7 +777,7 @@ var/global/list/brutefireloss_overlays = list("1" = image("icon" = 'icons/mob/sc
proc/get_cold_protection(temperature)
if(M_RESIST_COLD in mutations)
if(RESIST_COLD in mutations)
return 1 //Fully protected from the cold.
temperature = max(temperature, 2.7) //There is an occasional bug where the temperature is miscalculated in ares with a small amount of gas on them, so this is necessary to ensure that that bug does not affect this calculation. Space's temperature is 2.7K and most suits that are intended to protect against any cold, protect down to 2.0K.
@@ -934,12 +934,12 @@ var/global/list/brutefireloss_overlays = list("1" = image("icon" = 'icons/mob/sc
else if (light_amount < 2) //heal in the dark
heal_overall_damage(1,1)
//The fucking M_FAT mutation is the greatest shit ever. It makes everyone so hot and bothered.
//The fucking FAT mutation is the greatest shit ever. It makes everyone so hot and bothered.
if(species.flags & CAN_BE_FAT)
if(M_FAT in mutations)
if(FAT in mutations)
if(overeatduration < 100)
src << "\blue You feel fit again!"
mutations.Remove(M_FAT)
mutations.Remove(FAT)
update_mutantrace(0)
update_mutations(0)
update_inv_w_uniform(0)
@@ -947,7 +947,7 @@ var/global/list/brutefireloss_overlays = list("1" = image("icon" = 'icons/mob/sc
else
if(overeatduration > 500)
src << "\red You suddenly feel blubbery!"
mutations.Add(M_FAT)
mutations.Add(FAT)
update_mutantrace(0)
update_mutations(0)
update_inv_w_uniform(0)
@@ -963,7 +963,7 @@ var/global/list/brutefireloss_overlays = list("1" = image("icon" = 'icons/mob/sc
else
if(overeatduration > 1)
if(M_OBESITY in mutations)
if(OBESITY in mutations)
overeatduration -= 1 // Those with obesity gene take twice as long to unfat
else
overeatduration -= 2
@@ -1006,7 +1006,7 @@ var/global/list/brutefireloss_overlays = list("1" = image("icon" = 'icons/mob/sc
silent = 0
else //ALIVE. LIGHTS ARE ON
if(M_REGEN in mutations)
if(REGEN in mutations)
if(nutrition)
if(prob(10))
var/randumb = rand(1,5)
@@ -1017,7 +1017,7 @@ var/global/list/brutefireloss_overlays = list("1" = image("icon" = 'icons/mob/sc
// Sobering multiplier.
// Sober block grants quadruple the alcohol metabolism.
// var/sober_str=!(M_SOBER in mutations)?1:4
// var/sober_str=!(SOBER in mutations)?1:4
updatehealth() //TODO
if(!in_stasis)
@@ -1298,7 +1298,7 @@ var/global/list/brutefireloss_overlays = list("1" = image("icon" = 'icons/mob/sc
sight |= SEE_TURFS|SEE_MOBS|SEE_OBJS
see_in_dark = 8
if(!druggy) see_invisible = SEE_INVISIBLE_LEVEL_TWO
if(M_XRAY in mutations)
if(XRAY in mutations)
sight |= SEE_TURFS|SEE_MOBS|SEE_OBJS
see_in_dark = 8
if(!druggy) see_invisible = SEE_INVISIBLE_LEVEL_TWO
@@ -1509,7 +1509,7 @@ var/global/list/brutefireloss_overlays = list("1" = image("icon" = 'icons/mob/sc
if(!machine.check_eye(src)) reset_view(null)
else
var/isRemoteObserve = 0
if((M_REMOTE_VIEW in mutations) && remoteview_target)
if((REMOTE_VIEW in mutations) && remoteview_target)
isRemoteObserve = 1
// Is he unconscious or dead?
if(remoteview_target.stat!=CONSCIOUS)
@@ -1517,7 +1517,7 @@ var/global/list/brutefireloss_overlays = list("1" = image("icon" = 'icons/mob/sc
isRemoteObserve = 0
// Does he have psy resist?
if(M_PSY_RESIST in remoteview_target.mutations)
if(PSY_RESIST in remoteview_target.mutations)
src << "\red Your mind is shut out!"
isRemoteObserve = 0
code/modules/mob/living/carbon/human/plasmaman/species.dm
+1 -1
View File
@@ -130,7 +130,7 @@
H.emote(pick("giggle", "laugh"))
SA.moles = 0
if( (abs(310.15 - breath.temperature) > 50) && !(M_RESIST_HEAT in H.mutations)) // Hot air hurts :(
if( (abs(310.15 - breath.temperature) > 50) && !(RESIST_HEAT in H.mutations)) // Hot air hurts :(
if(H.status_flags & GODMODE)
return 1 //godmode
if(breath.temperature < cold_level_1)
code/modules/mob/living/carbon/human/say.dm
+1 -1
View File
@@ -286,7 +286,7 @@
handled = 1
if(message != "")
if((M_HULK in mutations) && health >= 25 && length(message))
if((HULK in mutations) && health >= 25 && length(message))
message = "[uppertext(message)]!!!"
verb = pick("yells","roars","hollers")
handled = 1
code/modules/mob/living/carbon/human/update_icons.dm
+13 -13
View File
@@ -236,9 +236,9 @@ proc/get_damage_icon_part(damage_state, body_part)
var/hulk_color_mod = rgb(48,224,40)
var/necrosis_color_mod = rgb(10,50,0)
var/husk = (M_HUSK in src.mutations) //100% unnecessary -Agouri //nope, do you really want to iterate through src.mutations repeatedly? -Pete
var/fat = (M_FAT in src.mutations)
var/hulk = (M_HULK in src.mutations)
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/g = (gender == FEMALE ? "f" : "m")
var/has_head = 0
@@ -456,7 +456,7 @@ proc/get_damage_icon_part(damage_state, body_part)
/mob/living/carbon/human/update_mutations(var/update_icons=1)
var/fat
if(M_FAT in mutations)
if(FAT in mutations)
fat = "fat"
var/image/standing = image("icon" = 'icons/effects/genetics.dmi')
@@ -475,26 +475,26 @@ proc/get_damage_icon_part(damage_state, body_part)
for(var/mut in mutations)
switch(mut)
/*
if(M_HULK)
if(HULK)
if(fat)
standing.underlays += "hulk_[fat]_s"
else
standing.underlays += "hulk_[g]_s"
add_image = 1
if(M_RESIST_COLD)
if(RESIST_COLD)
standing.underlays += "fire[fat]_s"
add_image = 1
if(M_RESIST_HEAT)
if(RESIST_HEAT)
standing.underlays += "cold[fat]_s"
add_image = 1
if(TK)
standing.underlays += "telekinesishead[fat]_s"
add_image = 1
*/
if(M_LASER)
if(LASER)
standing.overlays += "lasereyes_s"
add_image = 1
if((M_RESIST_COLD in mutations) && (M_RESIST_HEAT in mutations))
if((RESIST_COLD in mutations) && (RESIST_HEAT in mutations))
standing.underlays -= "cold[fat]_s"
standing.underlays -= "fire[fat]_s"
standing.underlays += "coldfire[fat]_s"
@@ -507,7 +507,7 @@ proc/get_damage_icon_part(damage_state, body_part)
/mob/living/carbon/human/proc/update_mutantrace(var/update_icons=1)
var/fat
if( M_FAT in mutations )
if( FAT in mutations )
fat = "fat"
// var/g = "m"
// if (gender == FEMALE) g = "f"
@@ -594,9 +594,9 @@ proc/get_damage_icon_part(damage_state, body_part)
if(!t_color) t_color = icon_state
var/image/standing = image("icon_state" = "[t_color]_s")
if(M_FAT in mutations)
if(FAT in mutations)
if(w_uniform.flags&ONESIZEFITSALL)
standing.icon = 'icons/mob/uniform_fat.dmi'
standing.icon = 'icons/mob/uniforFAT.dmi'
else
src << "\red You burst out of \the [w_uniform]!"
unEquip(w_uniform)
@@ -815,7 +815,7 @@ proc/get_damage_icon_part(damage_state, body_part)
standing = image("icon" = wear_suit.icon_override, "icon_state" = "[wear_suit.icon_state]")
else if(wear_suit.sprite_sheets && wear_suit.sprite_sheets[species.name])
standing = image("icon" = wear_suit.sprite_sheets[species.name], "icon_state" = "[wear_suit.icon_state]")
else if(M_FAT in mutations)
else if(FAT in mutations)
if(wear_suit.flags&ONESIZEFITSALL)
standing = image("icon" = 'icons/mob/suit_fat.dmi', "icon_state" = "[wear_suit.icon_state]")
else
code/modules/mob/living/carbon/metroid/metroid.dm
+2 -2
View File
@@ -420,7 +420,7 @@
attacked += 10
if (prob(90))
if (M_HULK in M.mutations)
if (HULK in M.mutations)
damage += 5
if(Victim || Target)
Victim = null
@@ -958,7 +958,7 @@ mob/living/carbon/slime/var/temperature_resistance = T0C+75
max_heat_protection_temperature = FIRE_HELMET_MAX_HEAT_PROTECTION_TEMPERATURE
armor = list(melee = 80, bullet = 20, laser = 20, energy = 10, bomb = 0, bio = 0, rad = 0)
/obj/effect/golem_rune
/obj/effect/goleRUNe
anchored = 1
desc = "a strange rune used to create golems. It glows when spirits are nearby."
name = "rune"
code/modules/mob/living/carbon/monkey/life.dm
+5 -5
View File
@@ -112,15 +112,15 @@
proc/handle_mutations_and_radiation()
if(getFireLoss())
if((M_RESIST_HEAT in mutations) || prob(50))
if((RESIST_HEAT in mutations) || prob(50))
switch(getFireLoss())
if(1 to 50)
adjustFireLoss(-1)
if(51 to 100)
adjustFireLoss(-5)
if ((M_HULK in mutations) && health <= 25)
mutations.Remove(M_HULK)
if ((HULK in mutations) && health <= 25)
mutations.Remove(HULK)
src << "\red You suddenly feel very weak."
Weaken(3)
emote("collapse")
@@ -421,7 +421,7 @@
if(HAZARD_LOW_PRESSURE to WARNING_LOW_PRESSURE)
pressure_alert = -1
else
if( !(M_RESIST_COLD in mutations) )
if( !(RESIST_COLD in mutations) )
adjustBruteLoss( LOW_PRESSURE_DAMAGE )
pressure_alert = -2
else
@@ -561,7 +561,7 @@
proc/handle_regular_hud_updates()
if (stat == 2 || (M_XRAY in mutations))
if (stat == 2 || (XRAY in mutations))
sight |= SEE_TURFS
sight |= SEE_MOBS
sight |= SEE_OBJS
code/modules/mob/living/carbon/monkey/monkey.dm
+1 -1
View File
@@ -131,7 +131,7 @@
now_pushing = 1
if(ismob(AM))
var/mob/tmob = AM
if(istype(tmob, /mob/living/carbon/human) && (M_HULK in tmob.mutations))
if(istype(tmob, /mob/living/carbon/human) && (HULK in tmob.mutations))
if(prob(70))
usr << "\red <B>You fail to push [tmob]'s fat ass out of the way.</B>"
now_pushing = 0
code/modules/mob/living/carbon/species.dm
+4 -4
View File
@@ -208,7 +208,7 @@
spawn(0) H.emote(pick("giggle", "laugh"))
SA.moles = 0
if( (abs(310.15 - breath.temperature) > 50) && !(M_RESIST_HEAT in H.mutations)) // Hot air hurts :(
if( (abs(310.15 - breath.temperature) > 50) && !(RESIST_HEAT in H.mutations)) // Hot air hurts :(
if(H.status_flags & GODMODE) return 1 //godmode
if(breath.temperature < cold_level_1)
if(prob(20))
@@ -546,7 +546,7 @@
brute_mod = 1.25 //greys are fragile
default_genes = list(M_REMOTE_TALK)
default_genes = list(REMOTE_TALK)
primitive = /mob/living/carbon/monkey // TODO
@@ -555,11 +555,11 @@
/datum/species/grey/handle_dna(var/mob/living/carbon/C, var/remove)
if(!remove)
C.dna.SetSEState(REMOTETALKBLOCK,1,1)
C.mutations |= M_REMOTE_TALK
C.mutations |= REMOTE_TALK
genemutcheck(C,REMOTETALKBLOCK,null,MUTCHK_FORCED)
else
C.dna.SetSEState(REMOTETALKBLOCK,0,1)
C.mutations -= M_REMOTE_TALK
C.mutations -= REMOTE_TALK
genemutcheck(C,REMOTETALKBLOCK,null,MUTCHK_FORCED)
C.update_mutations()
..()
code/modules/mob/living/damage_procs.dm
+1 -1
View File
@@ -15,7 +15,7 @@
if(BRUTE)
adjustBruteLoss(damage * blocked)
if(BURN)
if(M_RESIST_HEAT in mutations) damage = 0
if(RESIST_HEAT in mutations) damage = 0
adjustFireLoss(damage * blocked)
if(TOX)
adjustToxLoss(damage * blocked)
code/modules/mob/living/living.dm
+5 -5
View File
@@ -47,9 +47,9 @@
/mob/living/proc/burn_skin(burn_amount)
if(istype(src, /mob/living/carbon/human))
//world << "DEBUG: burn_skin(), mutations=[mutations]"
if(M_NO_SHOCK in src.mutations) //shockproof
if(NO_SHOCK in src.mutations) //shockproof
return 0
if (M_RESIST_HEAT in src.mutations) //fireproof
if (RESIST_HEAT in src.mutations) //fireproof
return 0
var/mob/living/carbon/human/H = src //make this damage method divide the damage to be done among all the body parts, then burn each body part for that much damage. will have better effect then just randomly picking a body part
var/divided_damage = (burn_amount)/(H.organs.len)
@@ -61,7 +61,7 @@
H.updatehealth()
return 1
else if(istype(src, /mob/living/carbon/monkey))
if (M_RESIST_HEAT in src.mutations) //fireproof
if (RESIST_HEAT in src.mutations) //fireproof
return 0
var/mob/living/carbon/monkey/M = src
M.adjustFireLoss(burn_amount)
@@ -642,7 +642,7 @@
if(CM.handcuffed && CM.canmove && (CM.last_special <= world.time))
CM.changeNext_move(CLICK_CD_BREAKOUT)
CM.last_special = world.time + CLICK_CD_BREAKOUT
if(isalienadult(CM) || (M_HULK in usr.mutations))//Don't want to do a lot of logic gating here.
if(isalienadult(CM) || (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 <B>[] is trying to break the handcuffs!</B>", CM), 1)
@@ -679,7 +679,7 @@
else if(CM.legcuffed && CM.canmove && (CM.last_special <= world.time))
CM.changeNext_move(CLICK_CD_BREAKOUT)
CM.last_special = world.time + CLICK_CD_BREAKOUT
if(isalienadult(CM) || (M_HULK in usr.mutations))//Don't want to do a lot of logic gating here.
if(isalienadult(CM) || (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 <B>[] is trying to break the legcuffs!</B>", CM), 1)
code/modules/mob/living/silicon/mommi/life.dm
+1 -1
View File
@@ -133,7 +133,7 @@
/
/mob/living/silicon/robot/mommi/handle_regular_hud_updates()
if (src.stat == 2 || M_XRAY in mutations || src.sight_mode & BORGXRAY)
if (src.stat == 2 || XRAY in mutations || src.sight_mode & BORGXRAY)
src.sight |= SEE_TURFS
src.sight |= SEE_MOBS
src.sight |= SEE_OBJS
code/modules/mob/living/silicon/robot/component.dm
+1 -1
View File
@@ -183,7 +183,7 @@
var/mode = 1;
/obj/item/device/robotanalyzer/attack(mob/living/M as mob, mob/living/user as mob)
if(( (M_CLUMSY in user.mutations) || user.getBrainLoss() >= 60) && prob(50))
if(( (CLUMSY in user.mutations) || user.getBrainLoss() >= 60) && prob(50))
user << text("\red You try to analyze the floor's vitals!")
for(var/mob/O in viewers(M, null))
O.show_message(text("\red [user] has analyzed the floor's vitals!"), 1)
code/modules/mob/living/silicon/robot/life.dm
+1 -1
View File
@@ -154,7 +154,7 @@
/mob/living/silicon/robot/proc/handle_regular_hud_updates()
if (src.stat == 2 || M_XRAY in mutations || src.sight_mode & BORGXRAY)
if (src.stat == 2 || XRAY in mutations || src.sight_mode & BORGXRAY)
src.sight |= SEE_TURFS
src.sight |= SEE_MOBS
src.sight |= SEE_OBJS
code/modules/mob/living/silicon/robot/robot.dm
+1 -1
View File
@@ -566,7 +566,7 @@
now_pushing = 1
if(ismob(AM))
var/mob/tmob = AM
if(istype(tmob, /mob/living/carbon/human) && (M_FAT in tmob.mutations))
if(istype(tmob, /mob/living/carbon/human) && (FAT in tmob.mutations))
if(prob(20))
usr << "\red <B>You fail to push [tmob]'s fat ass out of the way.</B>"
now_pushing = 0
code/modules/mob/living/simple_animal/constructs.dm
+1 -1
View File
@@ -66,7 +66,7 @@
now_pushing = 1
if(ismob(AM))
var/mob/tmob = AM
if(istype(tmob, /mob/living/carbon/human) && (M_FAT in tmob.mutations))
if(istype(tmob, /mob/living/carbon/human) && (FAT in tmob.mutations))
if(prob(5))
src << "\red <B>You fail to push [tmob]'s fat ass out of the way.</B>"
now_pushing = 0
code/modules/mob/living/simple_animal/friendly/corgi.dm
+1 -1
View File
@@ -352,7 +352,7 @@
now_pushing = 1
if(ismob(AM))
var/mob/tmob = AM
if(istype(tmob, /mob/living/carbon/human) && (M_FAT in tmob.mutations))
if(istype(tmob, /mob/living/carbon/human) && (FAT in tmob.mutations))
if(prob(70))
src << "\red <B>You fail to push [tmob]'s fat ass out of the way.</B>"
now_pushing = 0
code/modules/mob/living/simple_animal/friendly/slime.dm
+1 -1
View File
@@ -23,7 +23,7 @@
now_pushing = 1
if(ismob(AM))
var/mob/tmob = AM
if(istype(tmob, /mob/living/carbon/human) && (M_FAT in tmob.mutations))
if(istype(tmob, /mob/living/carbon/human) && (FAT in tmob.mutations))
if(prob(70))
src << "\red <B>You fail to push [tmob]'s fat ass out of the way.</B>"
now_pushing = 0
code/modules/mob/mob.dm
+1 -1
View File
@@ -331,7 +331,7 @@ var/list/slot_equipment_priority = list( \
if(slot_w_uniform)
if( !(slot_flags & SLOT_ICLOTHING) )
return 0
if((M_FAT in H.mutations) && !(flags & ONESIZEFITSALL))
if((FAT in H.mutations) && !(flags & ONESIZEFITSALL))
return 0
if(H.w_uniform)
if(!(H.w_uniform.flags & NODROP))

Some files were not shown because too many files have changed in this diff Show More