From ee2d75ae2239aa5b3e3ef6c5764a018aae7a84da Mon Sep 17 00:00:00 2001 From: Fermi Date: Thu, 30 May 2019 20:05:06 +0100 Subject: [PATCH] Removed special screen obj, as I didn't like how they looked. --- code/datums/mood_events/drug_events.dm | 4 ++-- icons/mob/screen_gen.dmi | Bin 113920 -> 115810 bytes .../reagents/chemistry/recipes/fermi.dm | 6 ++---- 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/code/datums/mood_events/drug_events.dm b/code/datums/mood_events/drug_events.dm index 82e5a5718b..89e93d3361 100644 --- a/code/datums/mood_events/drug_events.dm +++ b/code/datums/mood_events/drug_events.dm @@ -46,10 +46,10 @@ description = "YES! YES!! YES!!!\n" mood_change = 100 timeout = 300 - //special_screen_obj = "mood_happiness_good" uncomment when added from tg + //special_screen_obj = "mood_happiness_good" Originally in tg, but I personally think they look dumb /datum/mood_event/happiness_drug_bad_od description = "NO! NO!! NO!!!\n" mood_change = -100 timeout = 300 - //special_screen_obj = "mood_happiness_bad" uncomment when added from tg + //special_screen_obj = "mood_happiness_bad" Originally in tg \ No newline at end of file diff --git a/icons/mob/screen_gen.dmi b/icons/mob/screen_gen.dmi index 14f5540f389fa2e201ee556a061beff21225a4c3..756dcfa981281eb26d9ad3afb712d8d5b1512ba7 100644 GIT binary patch delta 6264 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