shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into meteor

Browse Source
This commit is contained in:
Trilbyspaceclone
2019-06-09 17:01:06 -04:00
committed by GitHub
parent a29aed136b b6d74cd495
commit 0d7b769eee
984 changed files with 24128 additions and 1008951 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/station_goals/dna_vault.dm
+6 -6
View File
@@ -258,25 +258,25 @@
var/obj/item/organ/lungs/L = H.internal_organs_slot[ORGAN_SLOT_LUNGS]
L.tox_breath_dam_min = 0
L.tox_breath_dam_max = 0
H.add_trait(TRAIT_VIRUSIMMUNE, "dna_vault")
ADD_TRAIT(H, TRAIT_VIRUSIMMUNE, "dna_vault")
if(VAULT_NOBREATH)
to_chat(H, "<span class='notice'>Your lungs feel great.</span>")
H.add_trait(TRAIT_NOBREATH, "dna_vault")
ADD_TRAIT(H, TRAIT_NOBREATH, "dna_vault")
if(VAULT_FIREPROOF)
to_chat(H, "<span class='notice'>You feel fireproof.</span>")
S.burnmod = 0.5
H.add_trait(TRAIT_RESISTHEAT, "dna_vault")
H.add_trait(TRAIT_NOFIRE, "dna_vault")
ADD_TRAIT(H, TRAIT_RESISTHEAT, "dna_vault")
ADD_TRAIT(H, TRAIT_NOFIRE, "dna_vault")
if(VAULT_STUNTIME)
to_chat(H, "<span class='notice'>Nothing can keep you down for long.</span>")
S.stunmod = 0.5
if(VAULT_ARMOUR)
to_chat(H, "<span class='notice'>You feel tough.</span>")
S.armor = 30
H.add_trait(TRAIT_PIERCEIMMUNE, "dna_vault")
ADD_TRAIT(H, TRAIT_PIERCEIMMUNE, "dna_vault")
if(VAULT_SPEED)
to_chat(H, "<span class='notice'>Your legs feel faster.</span>")
H.add_trait(TRAIT_GOTTAGOFAST, "dna_vault")
ADD_TRAIT(H, TRAIT_GOTTAGOFAST, "dna_vault")
if(VAULT_QUICK)
to_chat(H, "<span class='notice'>Your arms move as fast as lightning.</span>")
H.next_move_modifier = 0.5