cyberpresidentvanellope/Yogstation
1
0
Fork 0
mirror of https://github.com/yogstation13/Yogstation.git synced 2025-02-26 09:04:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #38937 from AnturK/morequirkshit

Browse Source 
Fixes quirk removal runtimes.
This commit is contained in:
Jordan Brown
2018-07-07 00:05:08 -04:00
committed by yogstation13-bot
parent 1d677b7b2f
commit 4f4e129bc2
2 changed files with 16 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
code/datums/traits/good.dm
View File

@@ -23,9 +23,10 @@
mood.mood_modifier = 0.8
/datum/quirk/apathetic/remove()
GET_COMPONENT_FROM(mood, /datum/component/mood, quirk_holder)
if(mood)
mood.mood_modifier = 1 //Change this once/if species get their own mood modifiers.
if(quirk_holder)
GET_COMPONENT_FROM(mood, /datum/component/mood, quirk_holder)
if(mood)
mood.mood_modifier = 1 //Change this once/if species get their own mood modifiers.

20
code/datums/traits/neutral.dm
View File

@@ -26,8 +26,9 @@
/datum/quirk/pineapple_liker/remove()
var/mob/living/carbon/human/H = quirk_holder
var/datum/species/species = H.dna.species
species.liked_food &= ~PINEAPPLE
if(H)
var/datum/species/species = H.dna.species
species.liked_food &= ~PINEAPPLE
/datum/quirk/pineapple_hater
name = "Ananas Aversion"
@@ -43,8 +44,9 @@
/datum/quirk/pineapple_hater/remove()
var/mob/living/carbon/human/H = quirk_holder
var/datum/species/species = H.dna.species
species.disliked_food &= ~PINEAPPLE
if(H)
var/datum/species/species = H.dna.species
species.disliked_food &= ~PINEAPPLE
/datum/quirk/deviant_tastes
name = "Deviant Tastes"
@@ -62,9 +64,10 @@
/datum/quirk/deviant_tastes/remove()
var/mob/living/carbon/human/H = quirk_holder
var/datum/species/species = H.dna.species
species.liked_food = initial(species.liked_food)
species.disliked_food = initial(species.disliked_food)
if(H)
var/datum/species/species = H.dna.species
species.liked_food = initial(species.liked_food)
species.disliked_food = initial(species.disliked_food)
@@ -83,4 +86,5 @@
quirk_holder.playsound_local(quirk_holder, 'sound/ambience/ambidet1.ogg', 50, FALSE)
/datum/quirk/monochromatic/remove()
quirk_holder.remove_client_colour(/datum/client_colour/monochrome)
if(quirk_holder)
quirk_holder.remove_client_colour(/datum/client_colour/monochrome)