Skip to content
This repository was archived by the owner on May 22, 2025. It is now read-only.

Commit fef2a63

Browse files
authored
boop (#22974)
1 parent 078f7a6 commit fef2a63

File tree

5 files changed

+29
-13
lines changed

5 files changed

+29
-13
lines changed

code/datums/mutations/body.dm

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -254,12 +254,16 @@
254254

255255
/datum/mutation/human/thickskin/on_acquiring(mob/living/carbon/human/owner)
256256
. = ..()
257+
if(.)
258+
return
257259
if(owner.physiology)
258260
owner.physiology.brute_mod *= 0.8
259261
owner.physiology.burn_mod *= 0.9
260262

261263
/datum/mutation/human/thickskin/on_losing(mob/living/carbon/human/owner)
262264
. = ..()
265+
if(.)
266+
return
263267
if(owner.physiology)
264268
owner.physiology.brute_mod /= 0.8
265269
owner.physiology.burn_mod /= 0.9
@@ -471,15 +475,17 @@
471475
power_coeff = 1
472476

473477
/datum/mutation/human/densebones/on_acquiring(mob/living/carbon/human/owner)
474-
if(..())
478+
. = ..()
479+
if(.)
475480
return
476481
owner.physiology.armor.melee += 5
477482
owner.physiology.armor.wound += 10
478483
if(GET_MUTATION_POWER(src) > 1)
479484
ADD_TRAIT(owner, TRAIT_HARDLY_WOUNDED, "genetics")
480485

481486
/datum/mutation/human/densebones/on_losing(mob/living/carbon/human/owner)
482-
if(..())
487+
. = ..()
488+
if(.)
483489
return
484490
owner.physiology.armor.melee -= 5
485491
owner.physiology.armor.wound -= 10
@@ -496,13 +502,15 @@
496502
instability = 70
497503

498504
/datum/mutation/human/cerebral/on_acquiring(mob/living/carbon/human/owner)
499-
if(..())
505+
. = ..()
506+
if(.)
500507
return
501508
owner.physiology.stamina_mod *= 0.7
502509
owner.physiology.stun_mod *= 0.85
503510

504511
/datum/mutation/human/cerebral/on_losing(mob/living/carbon/human/owner)
505-
if(..())
512+
. = ..()
513+
if(.)
506514
return
507515
owner.physiology.stamina_mod /= 0.7
508516
owner.physiology.stun_mod /= 0.85

code/datums/mutations/radproof.dm

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,15 @@
77
difficulty = 8
88

99
/datum/mutation/human/radproof/on_acquiring(mob/living/carbon/human/owner)
10-
if(..())
10+
. = ..()
11+
if(.)
1112
return
1213
ADD_TRAIT(owner, TRAIT_RADIMMUNE, type)
1314
owner.physiology.tox_mod *= 1.5
1415

1516
/datum/mutation/human/radproof/on_losing(mob/living/carbon/human/owner)
16-
if(..())
17+
. = ..()
18+
if(.)
1719
return
1820
REMOVE_TRAIT(owner, TRAIT_RADIMMUNE, type)
1921
owner.physiology.tox_mod /= 1.5

code/datums/mutations/ravenous.dm

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,14 +9,16 @@
99
instability = 10 //could be an upside maybe, or could force it on some poor sap while stabilized
1010

1111
/datum/mutation/human/ravenous/on_acquiring(mob/living/carbon/human/owner)
12-
if(..())
12+
. = ..()
13+
if(.)
1314
return
1415
ADD_TRAIT(owner, TRAIT_EAT_MORE, "ravenous")
1516
ADD_TRAIT(owner, TRAIT_BOTTOMLESS_STOMACH, "ravenous")
1617
ADD_TRAIT(owner, TRAIT_VORACIOUS, "ravenous")
1718

1819
/datum/mutation/human/ravenous/on_losing(mob/living/carbon/human/owner)
19-
if(..())
20+
. = ..()
21+
if(.)
2022
return
2123
REMOVE_TRAIT(owner, TRAIT_EAT_MORE, "ravenous")
2224
REMOVE_TRAIT(owner, TRAIT_BOTTOMLESS_STOMACH, "ravenous")

code/datums/mutations/sapblood.dm

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,15 @@
1212
var/passive_bleed_modifier = 0.6
1313

1414
/datum/mutation/human/sapblood/on_acquiring(mob/living/carbon/human/owner)
15-
if(..())
15+
. = ..()
16+
if(.)
1617
return
1718
ADD_TRAIT(owner, TRAIT_COAGULATING, GENETIC_MUTATION)
1819
owner.physiology?.bleed_mod *= passive_bleed_modifier
1920

2021
/datum/mutation/human/sapblood/on_losing(mob/living/carbon/human/owner)
21-
if(..())
22+
. = ..()
23+
if(.)
2224
return
2325
REMOVE_TRAIT(owner, TRAIT_COAGULATING, GENETIC_MUTATION)
2426
owner.physiology?.bleed_mod /= passive_bleed_modifier

yogstation/code/datums/mutations/alcohol.dm

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,14 @@
77
instability = 5
88

99
/datum/mutation/human/alcohol_tolerance/on_acquiring(mob/living/carbon/human/owner)
10-
if(..())
10+
. = ..()
11+
if(.)
1112
return
1213
ADD_TRAIT(owner, TRAIT_ALCOHOL_TOLERANCE, GENETIC_MUTATION)
1314

1415
/datum/mutation/human/alcohol_tolerance/on_losing(mob/living/carbon/human/owner)
15-
if(..())
16+
. = ..()
17+
if(.)
1618
return
1719
REMOVE_TRAIT(owner, TRAIT_ALCOHOL_TOLERANCE, GENETIC_MUTATION)
1820

@@ -25,4 +27,4 @@
2527

2628
/datum/mutation/human/alcohol_generate/on_life()
2729
if(prob(15))
28-
owner.reagents.add_reagent(/datum/reagent/consumable/ethanol, 3)
30+
owner.reagents.add_reagent(/datum/reagent/consumable/ethanol, 3)

0 commit comments

Comments
 (0)