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

[MIRROR] Makes highlander turn off pacifism (#703)

Browse Source 
* Makes highlander turn off pacifism (#53504)

Makes gaining the highlander antagonist status turn disable the pacifism quirk. It will re-enable if you lose the status, although that doesn't happen often.

* Makes highlander turn off pacifism

Co-authored-by: Coffee <63162339+CoffeeDragon16@users.noreply.github.com>
This commit is contained in:
SkyratBot
2020-09-09 08:16:13 +02:00
committed by GitHub
co-authored by Coffee
parent daf1e33515
commit c394191f0c
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/antagonists/highlander/highlander.dm
+3 -1
View File
@@ -9,12 +9,14 @@
var/mob/living/L = owner.current || mob_override
ADD_TRAIT(L, TRAIT_NOGUNS, "highlander")
ADD_TRAIT(L, TRAIT_NODISMEMBER, "highlander")
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")
if(L.has_quirk(/datum/quirk/nonviolent))
ADD_TRAIT(L, TRAIT_PACIFISM, ROUNDSTART_TRAIT)
/datum/antagonist/highlander/proc/forge_objectives()
var/datum/objective/steal/steal_objective = new
steal_objective.owner = owner