Refactors DNA Mutations; Refactors Mutations to use Traits (#15483)

* Refactors Mutations

* traits

* more work

* styling fix

* yet even more work

* oh hush

* almost there

* it continues yet further

* and that's genetics done

* and that's it folks

* last bit and golem fixup

* oof

* oops

* tweaks and fixes

* styling
This commit is contained in:
Fox McCloud
2021-02-21 21:25:19 +00:00
committed by GitHub
parent 324af7454c
commit 02b9445b9b
223 changed files with 2908 additions and 3049 deletions
+9 -14
View File
@@ -239,25 +239,20 @@
/obj/item/organ/internal/honktumor/insert(mob/living/carbon/M, special = 0)
..()
M.mutations.Add(CLUMSY)
M.mutations.Add(GLOB.comicblock)
M.dna.SetSEState(GLOB.clumsyblock,1,1)
M.dna.SetSEState(GLOB.comicblock,1,1)
genemutcheck(M,GLOB.clumsyblock,null,MUTCHK_FORCED)
genemutcheck(M,GLOB.comicblock,null,MUTCHK_FORCED)
M.dna.SetSEState(GLOB.clumsyblock, TRUE, TRUE)
M.dna.SetSEState(GLOB.comicblock, TRUE, TRUE)
singlemutcheck(M, GLOB.clumsyblock, MUTCHK_FORCED)
singlemutcheck(M, GLOB.comicblock, MUTCHK_FORCED)
organhonked = world.time
M.AddElement(/datum/element/waddling)
squeak = M.AddComponent(/datum/component/squeak, list('sound/items/bikehorn.ogg' = 1), 50)
/obj/item/organ/internal/honktumor/remove(mob/living/carbon/M, special = 0)
. = ..()
M.mutations.Remove(CLUMSY)
M.mutations.Remove(GLOB.comicblock)
M.dna.SetSEState(GLOB.clumsyblock,0)
M.dna.SetSEState(GLOB.comicblock,0)
genemutcheck(M,GLOB.clumsyblock,null,MUTCHK_FORCED)
genemutcheck(M,GLOB.comicblock,null,MUTCHK_FORCED)
M.dna.SetSEState(GLOB.clumsyblock, FALSE)
M.dna.SetSEState(GLOB.comicblock, FALSE)
singlemutcheck(M, GLOB.clumsyblock, MUTCHK_FORCED)
singlemutcheck(M, GLOB.comicblock, MUTCHK_FORCED)
M.RemoveElement(/datum/element/waddling)
QDEL_NULL(squeak)
qdel(src)
@@ -268,7 +263,7 @@
to_chat(owner, "<font color='red' size='7'>HONK</font>")
owner.SetSleeping(0)
owner.Stuttering(20)
owner.MinimumDeafTicks(30)
owner.AdjustEarDamage(0, 30)
owner.Weaken(3)
owner << 'sound/items/airhorn.ogg'
if(prob(30))