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

[MIRROR] Converts several species traits into generic traits (#5710)

Browse Source 
* Converts several species traits into generic traits

* Update traits.dm

* Update mousetrap.dm

* Update corporate.dm

* Update jellypeople.dm

* snowflake fix
This commit is contained in:
CitadelStationBot
2018-03-05 12:34:01 -06:00
committed by Poojawa
parent 536537a0a4
commit 6134f79a26
48 changed files with 348 additions and 334 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/antagonists/highlander/highlander.dm
+5 -9
View File
@@ -5,16 +5,12 @@
show_name_in_check_antagonists = TRUE
/datum/antagonist/highlander/apply_innate_effects(mob/living/mob_override)
var/mob/living/carbon/human/H = owner.current || mob_override
if(!istype(H))
return
H.dna.species.species_traits |= NOGUNS //nice try jackass
var/mob/living/L = owner.current || mob_override
L.add_trait(TRAIT_NOGUNS, "highlander")
/datum/antagonist/highlander/remove_innate_effects(mob/living/mob_override)
var/mob/living/carbon/human/H = owner.current || mob_override
if(!istype(H))
return
H.dna.species.species_traits &= ~NOGUNS
var/mob/living/L = owner.current || mob_override
L.remove_trait(TRAIT_NOGUNS, "highlander")
/datum/antagonist/highlander/on_removal()
owner.objectives -= objectives
@@ -76,7 +72,7 @@
sword.admin_spawned = TRUE //To prevent announcing
sword.pickup(H) //For the stun shielding
H.put_in_hands(sword)
var/obj/item/bloodcrawl/antiwelder = new(H)
antiwelder.name = "compulsion of honor"