cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-07-19 11:05:03 +01:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
* 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 16:25:19 -05:00
committed by GitHub
parent 324af7454c
commit 02b9445b9b
223 changed files with 2908 additions and 3049 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/paperwork/contract.dm
+4 -2
View File
@@ -266,7 +266,7 @@
if(!user.dna)
return -1
user.dna.SetSEState(GLOB.hulkblock,1)
genemutcheck(user, GLOB.hulkblock,null,MUTCHK_FORCED)
singlemutcheck(user, GLOB.hulkblock, MUTCHK_FORCED)
// Demonic power gives you consequenceless hulk
user.gene_stability += GENE_INSTABILITY_MAJOR
if(ishuman(user))
@@ -321,7 +321,9 @@
/obj/item/paper/contract/infernal/knowledge/FulfillContract(mob/living/carbon/human/user = target.current, blood = 0)
if(!istype(user) || !user.mind)
return -1
user.mutations.Add(XRAY)
ADD_TRAIT(user, TRAIT_XRAY_VISION, "devils_bargain")
user.update_sight()
user.update_icons()
user.mind.AddSpell(new /obj/effect/proc_holder/spell/targeted/view_range(null))
return ..()
code/modules/paperwork/paper.dm
+3 -3
View File
@@ -97,7 +97,7 @@
set category = "Object"
set src in usr
if((CLUMSY in usr.mutations) && prob(50))
if(HAS_TRAIT(usr, TRAIT_CLUMSY) && prob(50))
to_chat(usr, "<span class='warning'>You cut yourself on the paper.</span>")
return
if(!usr.is_literate())
@@ -390,7 +390,7 @@
to_chat(user, "<span class='notice'>You stamp the paper with your rubber stamp.</span>")
if(is_hot(P))
if((CLUMSY in user.mutations) && prob(10))
if(HAS_TRAIT(user, TRAIT_CLUMSY) && prob(10))
user.visible_message("<span class='warning'>[user] accidentally ignites [user.p_them()]self!</span>", \
"<span class='userdanger'>You miss the paper and accidentally light yourself on fire!</span>")
user.unEquip(P)
@@ -686,7 +686,7 @@
target.adjustFireLoss(150) // hard crit, the burning takes care of the rest.
else if(myeffect == "Total Brain Death")
to_chat(target,"<span class='userdanger'>You see a message appear in front of you in bright red letters: <b>YHWH-3 ACTIVATED. TERMINATION IN 3 SECONDS</b></span>")
target.mutations.Add(NOCLONE)
ADD_TRAIT(target, TRAIT_BADDNA, "evil_fax")
target.adjustBrainLoss(125)
else if(myeffect == "Honk Tumor")
if(!target.get_int_organ(/obj/item/organ/internal/honktumor))
code/modules/paperwork/paperplane.dm
+1 -1
View File
@@ -72,7 +72,7 @@
update_icon()
else if(is_hot(P))
if((CLUMSY in user.mutations) && prob(10))
if(HAS_TRAIT(user, TRAIT_CLUMSY) && prob(10))
user.visible_message("<span class='warning'>[user] accidentally ignites [user.p_them()]self!</span>", \
"<span class='userdanger'>You miss [src] and accidentally light yourself on fire!</span>")
user.unEquip(P)
code/modules/paperwork/ticketmachine.dm
+1 -1
View File
@@ -215,7 +215,7 @@
/obj/item/ticket_machine_ticket/attackby(obj/item/P, mob/living/carbon/human/user, params) //Stolen from papercode
..()
if(is_hot(P))
if((CLUMSY in user.mutations) && prob(10))
if(HAS_TRAIT(user, TRAIT_CLUMSY) && prob(10))
user.visible_message("<span class='warning'>[user] accidentally ignites [user.p_them()]self!</span>", \
"<span class='userdanger'>You miss the paper and accidentally light yourself on fire!</span>")
user.drop_item()