Adds positive moods for headpatting, hugging box of hugs and playing with plush.
Also, you will now receive negative mood for butchering plush and trying to pet such plush.
This commit is contained in:
@@ -0,0 +1,11 @@
|
||||
// Citadel-specific negative moodlets
|
||||
|
||||
/datum/mood_event/plushjack
|
||||
description = "<span class='warning'>I have butchered the plush recently.</span>\n"
|
||||
mood_change = -1
|
||||
timeout = 1200
|
||||
|
||||
/datum/mood_event/plush_nostuffing
|
||||
description = "<span class='warning'>A plush i tried to pet had no stuffing...</span>\n"
|
||||
mood_change = -1
|
||||
timeout = 1200
|
||||
@@ -0,0 +1,21 @@
|
||||
// Citadel-specific positive moodlets
|
||||
|
||||
/datum/mood_event/headpat
|
||||
description = "<span class='nicegreen'>Headpats are nice.</span>\n"
|
||||
mood_change = 2
|
||||
timeout = 1200
|
||||
|
||||
/datum/mood_event/hugbox
|
||||
description = "<span class='nicegreen'>I hugged box of hugs recently.</span>\n"
|
||||
mood_change = 1
|
||||
timeout = 1200
|
||||
|
||||
/datum/mood_event/plushpet
|
||||
description = "<span class='nicegreen'>I have petted plush recently.</span>\n"
|
||||
mood_change = 1
|
||||
timeout = 3000
|
||||
|
||||
/datum/mood_event/plushplay
|
||||
description = "<span class='nicegreen'>I played with plushes recently.</span>\n"
|
||||
mood_change = 3
|
||||
timeout = 3000
|
||||
@@ -0,0 +1,41 @@
|
||||
// Modular stuff to use with Citadel-specific moods.
|
||||
|
||||
// box of hugs
|
||||
/obj/item/storage/box/hug/attack_self(mob/user)
|
||||
. = ..()
|
||||
GET_COMPONENT_FROM(mood, /datum/component/mood, user)
|
||||
if(mood)
|
||||
mood.add_event("hugbox", /datum/mood_event/hugbox)
|
||||
|
||||
// headpats (IMPORTANT)
|
||||
/mob/living/carbon/help_shake_act(mob/living/carbon/M)
|
||||
. = ..()
|
||||
GET_COMPONENT_FROM(mood, /datum/component/mood, src)
|
||||
if(mood)
|
||||
mood.add_event("headpat", /datum/mood_event/headpat)
|
||||
|
||||
// plush petting
|
||||
/obj/item/toy/plush/attack_self(mob/user)
|
||||
. = ..()
|
||||
if(stuffed || grenade)
|
||||
GET_COMPONENT_FROM(mood, /datum/component/mood, user)
|
||||
if(mood)
|
||||
mood.add_event("plushpet", /datum/mood_event/plushpet)
|
||||
else
|
||||
GET_COMPONENT_FROM(mood, /datum/component/mood, user)
|
||||
if(mood)
|
||||
mood.add_event("plush_nostuffing", /datum/mood_event/plush_nostuffing)
|
||||
|
||||
// Jack the Ripper starring plush
|
||||
/obj/item/toy/plush/attackby(obj/item/I, mob/living/user, params)
|
||||
. = ..()
|
||||
if(!grenade)
|
||||
GET_COMPONENT_FROM(mood, /datum/component/mood, user)
|
||||
if(mood)
|
||||
mood.add_event("plushjack", /datum/mood_event/plushjack)
|
||||
|
||||
// plush playing (plush-on-plush action)
|
||||
if(istype(I, /obj/item/toy/plush))
|
||||
GET_COMPONENT_FROM(mood, /datum/component/mood, user)
|
||||
if(mood)
|
||||
mood.add_event("plushplay", /datum/mood_event/plushplay)
|
||||
@@ -2590,6 +2590,9 @@
|
||||
#include "modular_citadel\code\controllers\subsystem\research.dm"
|
||||
#include "modular_citadel\code\controllers\subsystem\shuttle.dm"
|
||||
#include "modular_citadel\code\datums\uplink_items_cit.dm"
|
||||
#include "modular_citadel\code\datums\mood_events\generic_negative_events.dm"
|
||||
#include "modular_citadel\code\datums\mood_events\generic_positive_events.dm"
|
||||
#include "modular_citadel\code\datums\mood_events\moodular.dm"
|
||||
#include "modular_citadel\code\datums\mutations\hulk.dm"
|
||||
#include "modular_citadel\code\datums\traits\neutral.dm"
|
||||
#include "modular_citadel\code\datums\wires\airlock.dm"
|
||||
|
||||
Reference in New Issue
Block a user