cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-01-01 20:42:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

Removed generate_uni_identity from randomize_human() proc since it's already called by ready_dna right after.

Browse Source 
Simplifies mutation overlay updating code.
This commit is contained in:
phil235
2015-09-14 00:58:25 +02:00
parent 428a28a440
commit c9588662f7
2 changed files with 4 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
code/datums/mutations.dm
View File

@@ -53,6 +53,8 @@
return 1 return 1
owner.dna.mutations.Add(src) owner.dna.mutations.Add(src)
owner << text_gain_indication owner << text_gain_indication
if(visual_indicators.len)
owner.update_mutation_overlays()
/datum/mutation/human/proc/get_visual_indicator(mob/living/carbon/human/owner) /datum/mutation/human/proc/get_visual_indicator(mob/living/carbon/human/owner)
return return
@@ -75,6 +77,8 @@
/datum/mutation/human/proc/on_losing(mob/living/carbon/human/owner) /datum/mutation/human/proc/on_losing(mob/living/carbon/human/owner)
if(owner && istype(owner) && (owner.dna.mutations.Remove(src))) if(owner && istype(owner) && (owner.dna.mutations.Remove(src)))
owner << text_lose_indication owner << text_lose_indication
if(visual_indicators.len)
owner.update_mutation_overlays()
return 0 return 0
return 1 return 1
@@ -102,7 +106,6 @@
if(..()) if(..())
return return
var/status = CANSTUN | CANWEAKEN | CANPARALYSE | CANPUSH var/status = CANSTUN | CANWEAKEN | CANPARALYSE | CANPUSH
owner.update_mutation_overlays()
owner.status_flags &= ~status owner.status_flags &= ~status
/datum/mutation/human/hulk/on_attack_hand(mob/living/carbon/human/owner, atom/target) /datum/mutation/human/hulk/on_attack_hand(mob/living/carbon/human/owner, atom/target)
@@ -123,7 +126,6 @@
if(..()) if(..())
return return
owner.status_flags |= CANSTUN | CANWEAKEN | CANPARALYSE | CANPUSH owner.status_flags |= CANSTUN | CANWEAKEN | CANPARALYSE | CANPUSH
owner.update_mutation_overlays()
/datum/mutation/human/hulk/say_mod(message) /datum/mutation/human/hulk/say_mod(message)
if(message) if(message)
@@ -145,16 +147,6 @@
/datum/mutation/human/telekinesis/get_visual_indicator(mob/living/carbon/human/owner) /datum/mutation/human/telekinesis/get_visual_indicator(mob/living/carbon/human/owner)
return visual_indicators[1] return visual_indicators[1]
/datum/mutation/human/telekinesis/on_acquiring(mob/living/carbon/human/owner)
if(..())
return
owner.update_mutation_overlays()
/datum/mutation/human/telekinesis/on_losing(mob/living/carbon/human/owner)
if(..())
return
owner.update_mutation_overlays()
/datum/mutation/human/telekinesis/on_ranged_attack(mob/living/carbon/human/owner, atom/target) /datum/mutation/human/telekinesis/on_ranged_attack(mob/living/carbon/human/owner, atom/target)
target.attack_tk(owner) target.attack_tk(owner)
@@ -173,16 +165,6 @@
/datum/mutation/human/cold_resistance/get_visual_indicator(mob/living/carbon/human/owner) /datum/mutation/human/cold_resistance/get_visual_indicator(mob/living/carbon/human/owner)
return visual_indicators[1] return visual_indicators[1]
/datum/mutation/human/cold_resistance/on_losing(mob/living/carbon/human/owner)
if(..())
return
owner.update_mutation_overlays()
/datum/mutation/human/cold_resistance/on_acquiring(mob/living/carbon/human/owner)
if(..())
return
owner.update_mutation_overlays()
/datum/mutation/human/cold_resistance/on_life(mob/living/carbon/human/owner) /datum/mutation/human/cold_resistance/on_life(mob/living/carbon/human/owner)
if(owner.getFireLoss()) if(owner.getFireLoss())
if(prob(1)) if(prob(1))

1
code/modules/admin/create_mob.dm
View File

@@ -20,6 +20,5 @@
H.facial_hair_color = H.hair_color H.facial_hair_color = H.hair_color
H.eye_color = random_eye_color() H.eye_color = random_eye_color()
H.dna.blood_type = random_blood_type() H.dna.blood_type = random_blood_type()
H.dna.generate_uni_identity(H)
H.update_body() H.update_body()
H.update_hair() H.update_hair()