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

[MIRROR] Plasmaman won't burn or breath in Mafia/Highlander instead of being transformed into a Human. (#3177)

Browse Source 
* Plasmaman won't burn or breath in Mafia/Highlander instead of being transformed into a Human. (#56501)

NO_BREATH and NO_FIRE are added to Mafia/Highlander players and
plasmaman there won't be turned into Humans.
Also shifts Ashwalkers above Ethereals and under Lizards in human.dm
just too keep it in a pretty order.

* Plasmaman won't burn or breath in Mafia/Highlander instead of being transformed into a Human.

Co-authored-by: GuillaumePrata <55374212+GuillaumePrata@users.noreply.github.com>
This commit is contained in:
SkyratBot
2021-02-08 23:08:04 +00:00
committed by GitHub
co-authored by GuillaumePrata
parent e136889e92
commit 0a284aefdd
5 changed files with 20 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/antagonists/highlander/highlander.dm
+10 -9
View File
@@ -7,16 +7,20 @@
/datum/antagonist/highlander/apply_innate_effects(mob/living/mob_override)
var/mob/living/L = owner.current || mob_override
ADD_TRAIT(L, TRAIT_NOGUNS, "highlander")
ADD_TRAIT(L, TRAIT_NODISMEMBER, "highlander")
ADD_TRAIT(L, TRAIT_SHOCKIMMUNE, "highlander")
ADD_TRAIT(L, TRAIT_NOGUNS, HIGHLANDER_TRAIT)
ADD_TRAIT(L, TRAIT_NODISMEMBER, HIGHLANDER_TRAIT)
ADD_TRAIT(L, TRAIT_SHOCKIMMUNE, HIGHLANDER_TRAIT)
ADD_TRAIT(L, TRAIT_NOFIRE, HIGHLANDER_TRAIT)
ADD_TRAIT(L, TRAIT_NOBREATH, HIGHLANDER_TRAIT)
REMOVE_TRAIT(L, TRAIT_PACIFISM, ROUNDSTART_TRAIT)
/datum/antagonist/highlander/remove_innate_effects(mob/living/mob_override)
var/mob/living/L = owner.current || mob_override
REMOVE_TRAIT(L, TRAIT_NOGUNS, "highlander")
REMOVE_TRAIT(L, TRAIT_NODISMEMBER, "highlander")
REMOVE_TRAIT(L, TRAIT_SHOCKIMMUNE, "highlander")
REMOVE_TRAIT(L, TRAIT_NOGUNS, HIGHLANDER_TRAIT)
REMOVE_TRAIT(L, TRAIT_NODISMEMBER, HIGHLANDER_TRAIT)
REMOVE_TRAIT(L, TRAIT_SHOCKIMMUNE, HIGHLANDER_TRAIT)
REMOVE_TRAIT(L, TRAIT_NOFIRE, HIGHLANDER_TRAIT)
REMOVE_TRAIT(L, TRAIT_NOBREATH, HIGHLANDER_TRAIT)
if(L.has_quirk(/datum/quirk/nonviolent))
ADD_TRAIT(L, TRAIT_PACIFISM, ROUNDSTART_TRAIT)
@@ -32,9 +36,6 @@
/datum/antagonist/highlander/on_gain()
forge_objectives()
owner.special_role = "highlander"
var/mob/living/carbon/human/humanlander = owner.current
if(ishuman(humanlander) && humanlander.dna.species.outfit_important_for_life) //things that cannot live with the scottish kilt will be owned
humanlander.set_species(/datum/species/human)
give_equipment()
. = ..()