[READY] Social Service Mood Boosts Part 1: Clown and Mime Fan quirks (#47254)

* Adds mutually exclusive Clown and Mime Fan traits based off of Spiritual quirk

* Adds positive moodlets for sitting in rooms, adds pins and moodlets for pins

Need to figure out why the progress bar for being buckled doesn't show up.

* I forgot that Spiritual is 1 point.

* Reverts examining for mood boost and room mood boost events
This commit is contained in:
RaveRadbury
2019-11-02 19:34:00 -04:00
committed by moo
parent b2be5e5dca
commit daf3db97de
8 changed files with 88 additions and 2 deletions
+2
View File
@@ -167,6 +167,8 @@ Remember to update _globalvars/traits.dm if you're adding/removing/renaming trai
#define TRAIT_NIGHT_VISION "night_vision"
#define TRAIT_LIGHT_STEP "light_step"
#define TRAIT_SPIRITUAL "spiritual"
#define TRAIT_FAN_CLOWN "fan_clown"
#define TRAIT_FAN_MIME "fan_mime"
#define TRAIT_VORACIOUS "voracious"
#define TRAIT_SELF_AWARE "self_aware"
#define TRAIT_FREERUNNING "freerunning"
@@ -17,7 +17,7 @@ PROCESSING_SUBSYSTEM_DEF(quirks)
if(!quirks.len)
SetupQuirks()
quirk_blacklist = list(list("Blind","Nearsighted"),list("Jolly","Depression","Apathetic","Hypersensitive"),list("Ageusia","Vegetarian","Deviant Tastes"),list("Ananas Affinity","Ananas Aversion"),list("Alcohol Tolerance","Light Drinker"))
quirk_blacklist = list(list("Blind","Nearsighted"),list("Jolly","Depression","Apathetic","Hypersensitive"),list("Ageusia","Vegetarian","Deviant Tastes"),list("Ananas Affinity","Ananas Aversion"),list("Alcohol Tolerance","Light Drinker"),list("Clown Fan","Mime Fan"))
return ..()
/datum/controller/subsystem/processing/quirks/proc/SetupQuirks()
@@ -100,6 +100,14 @@
description = "<span class='nicegreen'>My family heirloom is safe with me.</span>\n"
mood_change = 1
/datum/mood_event/fan_clown_pin
description = "<span class='nicegreen'>I love showing off my clown pin!</span>\n"
mood_change = 1
/datum/mood_event/fan_mime_pin
description = "<span class='nicegreen'>I love showing off my mime pin!</span>\n"
mood_change = 1
/datum/mood_event/goodmusic
description = "<span class='nicegreen'>There is something soothing about this music.</span>\n"
mood_change = 3
+36
View File
@@ -59,6 +59,42 @@
lose_text = "<span class='danger'>You feel isolated from others.</span>"
medical_record_text = "Patient is highly perceptive of and sensitive to social cues, or may possibly have ESP. Further testing needed."
datum/quirk/fan_clown
name = "Clown Fan"
desc = "You enjoy the clown's antics and get a mood boost when you see them."
value = 1
mob_trait = TRAIT_FAN_CLOWN
gain_text = "<span class='notice'>You are a big fan of the Clown.</span>"
lose_text = "<span class='danger'>The clown doesn't seem so great.</span>"
medical_record_text = "Patient reports being a big fan of the Clown."
/datum/quirk/fan_clown/on_spawn()
var/mob/living/carbon/human/H = quirk_holder
var/obj/item/clothing/accessory/fan_clown_pin/B = new(get_turf(H))
var/list/slots = list (
"backpack" = SLOT_IN_BACKPACK,
"hands" = SLOT_HANDS,
)
H.equip_in_one_of_slots(B, slots , qdel_on_fail = TRUE)
datum/quirk/fan_mime
name = "Mime Fan"
desc = "You enjoy the Mime's antics and get a mood boost when you see them."
value = 1
mob_trait = TRAIT_FAN_MIME
gain_text = "<span class='notice'>You are a big fan of the Mime.</span>"
lose_text = "<span class='danger'>The mime doesn't seem so great.</span>"
medical_record_text = "Patient reports being a big fan of the Mime."
/datum/quirk/fan_mime/on_spawn()
var/mob/living/carbon/human/H = quirk_holder
var/obj/item/clothing/accessory/fan_mime_pin/B = new(get_turf(H))
var/list/slots = list (
"backpack" = SLOT_IN_BACKPACK,
"hands" = SLOT_HANDS,
)
H.equip_in_one_of_slots(B, slots , qdel_on_fail = TRUE)
/datum/quirk/freerunning
name = "Freerunning"
desc = "You're great at quick moves! You can climb tables more quickly."
+1 -1
View File
@@ -23,7 +23,7 @@
/atom/movable/MouseDrop_T(mob/living/M, mob/living/user)
. = ..()
return mouse_buckle_handling(M, user)
/atom/movable/proc/mouse_buckle_handling(mob/living/M, mob/living/user)
if(can_buckle && istype(M) && istype(user))
if(user_buckle_mob(M, user))
@@ -314,6 +314,46 @@
for(var/i in 1 to 3)
new /obj/item/lipstick/random(src)
////////////////
//REAL BIG FAN//
////////////////
/obj/item/clothing/accessory/fan_clown_pin
name = "Clown Pin"
desc = "A pin to show off your appreciation for clowns and clowning"
icon_state = "fan_clown_pin"
above_suit = TRUE
minimize_when_attached = TRUE
attachment_slot = CHEST
/obj/item/clothing/accessory/fan_clown_pin/on_uniform_equip(obj/item/clothing/under/U, user)
var/mob/living/L = user
if(HAS_TRAIT(L, TRAIT_FAN_CLOWN))
SEND_SIGNAL(L, COMSIG_ADD_MOOD_EVENT, "fan_clown_pin", /datum/mood_event/fan_clown_pin)
/obj/item/clothing/accessory/fan_clown_pin/on_uniform_dropped(obj/item/clothing/under/U, user)
var/mob/living/L = user
if(HAS_TRAIT(L, TRAIT_FAN_CLOWN))
SEND_SIGNAL(L, COMSIG_CLEAR_MOOD_EVENT, "fan_clown_pin")
/obj/item/clothing/accessory/fan_mime_pin
name = "Mime Pin"
desc = "A pin to show off your appreciation for mimes and miming"
icon_state = "fan_mime_pin"
above_suit = TRUE
minimize_when_attached = TRUE
attachment_slot = CHEST
/obj/item/clothing/accessory/fan_clown_pin/on_uniform_equip(obj/item/clothing/under/U, user)
var/mob/living/L = user
if(HAS_TRAIT(L, TRAIT_FAN_MIME))
SEND_SIGNAL(L, COMSIG_ADD_MOOD_EVENT, "fan_mime_pin", /datum/mood_event/fan_mime_pin)
/obj/item/clothing/accessory/fan_clown_pin/on_uniform_dropped(obj/item/clothing/under/U, user)
var/mob/living/L = user
if(HAS_TRAIT(L, TRAIT_FAN_MIME))
SEND_SIGNAL(L, COMSIG_CLEAR_MOOD_EVENT, "fan_clown_pin")
////////////////
//OONGA BOONGA//
////////////////
Binary file not shown.

Before

Width:  |  Height:  |  Size: 8.6 KiB

After

Width:  |  Height:  |  Size: 8.2 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 8.4 KiB

After

Width:  |  Height:  |  Size: 9.0 KiB