From 77ef3dabeabb7d25bff36559a18f3a410085aab7 Mon Sep 17 00:00:00 2001
From: Ghommie <42542238+Ghommie@users.noreply.github.com>
Date: Wed, 4 Dec 2019 23:10:39 +0100
Subject: [PATCH] Demodularize moodlets.
---
code/datums/mood_events/drug_events.dm | 60 +++++++++++++++++++
.../mood_events/generic_negative_events.dm | 22 +++++++
.../mood_events/generic_positive_events.dm | 35 +++++++++++
code/game/objects/items/plushes.dm | 6 +-
code/game/objects/items/storage/boxes.dm | 1 +
.../code/datums/mood_events/chem_events.dm | 59 ------------------
.../mood_events/generic_negative_events.dm | 21 -------
.../mood_events/generic_positive_events.dm | 34 -----------
.../code/datums/mood_events/moodular.dm | 27 ---------
tgstation.dme | 4 --
10 files changed, 123 insertions(+), 146 deletions(-)
delete mode 100644 modular_citadel/code/datums/mood_events/chem_events.dm
delete mode 100644 modular_citadel/code/datums/mood_events/generic_negative_events.dm
delete mode 100644 modular_citadel/code/datums/mood_events/generic_positive_events.dm
delete mode 100644 modular_citadel/code/datums/mood_events/moodular.dm
diff --git a/code/datums/mood_events/drug_events.dm b/code/datums/mood_events/drug_events.dm
index 469bf80979..1a681a8a4d 100644
--- a/code/datums/mood_events/drug_events.dm
+++ b/code/datums/mood_events/drug_events.dm
@@ -53,3 +53,63 @@
mood_change = -20
timeout = 300
//special_screen_obj = "mood_happiness_bad" Originally in tg
+
+/datum/mood_event/eigenstate
+ mood_change = -3
+ description = "Where the hell am I? Is this an alternative dimension ?\n"
+
+/datum/mood_event/enthrall
+ mood_change = 5
+
+/datum/mood_event/enthrall/add_effects(message)
+ description = "[message]\n"
+
+/datum/mood_event/enthrallpraise
+ mood_change = 10
+ timeout = 1 MINUTES
+
+/datum/mood_event/enthrallpraise/add_effects(message)
+ description = "[message]\n"
+
+/datum/mood_event/enthrallscold
+ mood_change = -10
+ timeout = 1 MINUTES
+
+/datum/mood_event/enthrallscold/add_effects(message)
+ description = "[message]\n"//aaa I'm not kinky enough for this
+
+/datum/mood_event/enthrallmissing1
+ mood_change = -5
+
+/datum/mood_event/enthrallmissing1/add_effects(message)
+ description = "[message]\n"
+
+/datum/mood_event/enthrallmissing2
+ mood_change = -10
+
+/datum/mood_event/enthrallmissing2/add_effects(message)
+ description = "[message]\n"
+
+/datum/mood_event/enthrallmissing3
+ mood_change = -15
+
+/datum/mood_event/enthrallmissing3/add_effects(message)
+ description = "[message]\n"
+
+/datum/mood_event/enthrallmissing4
+ mood_change = -25
+
+/datum/mood_event/enthrallmissing4/add_effects(message)
+ description = "[message]\n"
+
+/datum/mood_event/InLove
+ mood_change = 10
+
+/datum/mood_event/InLove/add_effects(message)
+ description = "[message]\n"
+
+/datum/mood_event/MissingLove
+ mood_change = -10
+
+/datum/mood_event/MissingLove/add_effects(message)
+ description = "[message]\n"
diff --git a/code/datums/mood_events/generic_negative_events.dm b/code/datums/mood_events/generic_negative_events.dm
index f4ca3a8ebd..94a64c3bd4 100644
--- a/code/datums/mood_events/generic_negative_events.dm
+++ b/code/datums/mood_events/generic_negative_events.dm
@@ -176,3 +176,25 @@
/datum/mood_event/revenant_blight/add_effects()
description = "Just give up, [pick("no one will miss you", "there is nothing you can do to help", "even a clown would be more useful than you", "does it even matter in the end?")]...\n"
+
+/datum/mood_event/plushjack
+ description = "I have butchered a plush recently.\n"
+ mood_change = -1
+ timeout = 2 MINUTES
+
+/datum/mood_event/plush_nostuffing
+ description = "A plush I tried to pet had no stuffing...\n"
+ mood_change = -1
+ timeout = 2 MINUTES
+
+//Cursed stuff below
+
+/datum/mood_event/emptypred
+ description = "I had to let someone out.\n"
+ mood_change = -2
+ timeout = 1 MINUTES
+
+/datum/mood_event/emptyprey
+ description = "It feels quite cold out here.\n"
+ mood_change = -2
+ timeout = 1 MINUTES
diff --git a/code/datums/mood_events/generic_positive_events.dm b/code/datums/mood_events/generic_positive_events.dm
index 678802aed9..9ae7ba2289 100644
--- a/code/datums/mood_events/generic_positive_events.dm
+++ b/code/datums/mood_events/generic_positive_events.dm
@@ -113,3 +113,38 @@
/datum/mood_event/happy_empath/add_effects(var/mob/happytarget)
description = "[happytarget.name]'s happiness is infectious!\n"
+
+/datum/mood_event/headpat
+ description = "Headpats are nice.\n"
+ mood_change = 2
+ timeout = 2 MINUTES
+
+/datum/mood_event/hugbox
+ description = "I hugged a box of hugs recently.\n"
+ mood_change = 1
+ timeout = 2 MINUTES
+
+/datum/mood_event/plushpet
+ description = "I pet a plush recently.\n"
+ mood_change = 1
+ timeout = 3000
+
+/datum/mood_event/plushplay
+ description = "I've played with plushes recently.\n"
+ mood_change = 3
+ timeout = 3000
+
+//Cursed stuff below.
+
+/datum/mood_event/orgasm
+ description = "I came!\n" //funny meme haha
+ mood_change = 3
+ timeout = 100 SECONDS
+
+/datum/mood_event/fedpred
+ description = "I've devoured someone!\n"
+ mood_change = 3
+
+/datum/mood_event/fedprey
+ description = "It feels quite cozy in here.\n"
+ mood_change = 3
diff --git a/code/game/objects/items/plushes.dm b/code/game/objects/items/plushes.dm
index ffbbea84dc..78a15c8af4 100644
--- a/code/game/objects/items/plushes.dm
+++ b/code/game/objects/items/plushes.dm
@@ -113,8 +113,10 @@
return
log_game("[key_name(user)] activated a hidden grenade in [src].")
grenade.preprime(user, msg = FALSE, volume = 10)
+ SEND_SIGNAL(user, COMSIG_ADD_MOOD_EVENT,"plushpet", /datum/mood_event/plushpet)
else
to_chat(user, "You try to pet [src], but it has no stuffing. Aww...")
+ SEND_SIGNAL(user, COMSIG_ADD_MOOD_EVENT,"plush_nostuffing", /datum/mood_event/plush_nostuffing)
/obj/item/toy/plush/attackby(obj/item/I, mob/living/user, params)
if(I.get_sharpness())
@@ -125,6 +127,7 @@
user.visible_message("[user] tears out the stuffing from [src]!", "You rip a bunch of the stuffing from [src]. Murderer.")
I.play_tool_sound(src)
stuffed = FALSE
+ SEND_SIGNAL(user, COMSIG_ADD_MOOD_EVENT,"plushjack", /datum/mood_event/plushjack)
else
to_chat(user, "You remove the grenade from [src].")
user.put_in_hands(grenade)
@@ -147,6 +150,7 @@
return
if(istype(I, /obj/item/toy/plush))
love(I, user)
+ SEND_SIGNAL(user, COMSIG_ADD_MOOD_EVENT,"plushplay", /datum/mood_event/plushplay)
return
return ..()
@@ -1014,7 +1018,7 @@
icon_state = "maya"
item_state = "maya"
attack_verb = list("nuked", "arrested", "harmbatonned")
-
+
/obj/item/toy/plush/catgirl/marisa
desc = "An adorable stuffed toy that resembles a crew member, or maybe a witch. Having it makes you feel you can win."
icon_state = "marisa"
diff --git a/code/game/objects/items/storage/boxes.dm b/code/game/objects/items/storage/boxes.dm
index f9505fe948..b4f058eede 100644
--- a/code/game/objects/items/storage/boxes.dm
+++ b/code/game/objects/items/storage/boxes.dm
@@ -699,6 +699,7 @@
user.changeNext_move(CLICK_CD_MELEE)
playsound(loc, "rustle", 50, 1, -5)
user.visible_message("[user] hugs \the [src].","You hug \the [src].")
+ SEND_SIGNAL(user, COMSIG_ADD_MOOD_EVENT,"hugbox", /datum/mood_event/hugbox)
/////clown box & honkbot assembly
/obj/item/storage/box/clown
diff --git a/modular_citadel/code/datums/mood_events/chem_events.dm b/modular_citadel/code/datums/mood_events/chem_events.dm
deleted file mode 100644
index 94bfd86b6d..0000000000
--- a/modular_citadel/code/datums/mood_events/chem_events.dm
+++ /dev/null
@@ -1,59 +0,0 @@
-/datum/mood_event/eigenstate
- mood_change = -3
- description = "Where the hell am I? Is this an alternative dimension ?\n"
-
-/datum/mood_event/enthrall
- mood_change = 5
-
-/datum/mood_event/enthrall/add_effects(message)
- description = "[message]\n"
-
-/datum/mood_event/enthrallpraise
- mood_change = 10
- timeout = 1 MINUTES
-
-/datum/mood_event/enthrallpraise/add_effects(message)
- description = "[message]\n"
-
-/datum/mood_event/enthrallscold
- mood_change = -10
- timeout = 1 MINUTES
-
-/datum/mood_event/enthrallscold/add_effects(message)
- description = "[message]\n"//aaa I'm not kinky enough for this
-
-/datum/mood_event/enthrallmissing1
- mood_change = -5
-
-/datum/mood_event/enthrallmissing1/add_effects(message)
- description = "[message]\n"
-
-/datum/mood_event/enthrallmissing2
- mood_change = -10
-
-/datum/mood_event/enthrallmissing2/add_effects(message)
- description = "[message]\n"
-
-/datum/mood_event/enthrallmissing3
- mood_change = -15
-
-/datum/mood_event/enthrallmissing3/add_effects(message)
- description = "[message]\n"
-
-/datum/mood_event/enthrallmissing4
- mood_change = -25
-
-/datum/mood_event/enthrallmissing4/add_effects(message)
- description = "[message]\n"
-
-/datum/mood_event/InLove
- mood_change = 10
-
-/datum/mood_event/InLove/add_effects(message)
- description = "[message]\n"
-
-/datum/mood_event/MissingLove
- mood_change = -10
-
-/datum/mood_event/MissingLove/add_effects(message)
- description = "[message]\n"
diff --git a/modular_citadel/code/datums/mood_events/generic_negative_events.dm b/modular_citadel/code/datums/mood_events/generic_negative_events.dm
deleted file mode 100644
index bb04b0b283..0000000000
--- a/modular_citadel/code/datums/mood_events/generic_negative_events.dm
+++ /dev/null
@@ -1,21 +0,0 @@
-// Citadel-specific negative moodlets
-
-/datum/mood_event/plushjack
- description = "I have butchered a plush recently.\n"
- mood_change = -1
- timeout = 2 MINUTES
-
-/datum/mood_event/plush_nostuffing
- description = "A plush I tried to pet had no stuffing...\n"
- mood_change = -1
- timeout = 2 MINUTES
-
-/datum/mood_event/emptypred
- description = "I had to let someone out.\n"
- mood_change = -2
- timeout = 1 MINUTES
-
-/datum/mood_event/emptyprey
- description = "It feels quite cold out here.\n"
- mood_change = -2
- timeout = 1 MINUTES
diff --git a/modular_citadel/code/datums/mood_events/generic_positive_events.dm b/modular_citadel/code/datums/mood_events/generic_positive_events.dm
deleted file mode 100644
index ffa661e6e9..0000000000
--- a/modular_citadel/code/datums/mood_events/generic_positive_events.dm
+++ /dev/null
@@ -1,34 +0,0 @@
-// Citadel-specific positive moodlets
-
-/datum/mood_event/headpat
- description = "Headpats are nice.\n"
- mood_change = 2
- timeout = 2 MINUTES
-
-/datum/mood_event/hugbox
- description = "I hugged a box of hugs recently.\n"
- mood_change = 1
- timeout = 2 MINUTES
-
-/datum/mood_event/plushpet
- description = "I pet a plush recently.\n"
- mood_change = 1
- timeout = 3000
-
-/datum/mood_event/plushplay
- description = "I've played with plushes recently.\n"
- mood_change = 3
- timeout = 3000
-
-/datum/mood_event/orgasm
- description = "I came!\n" //funny meme haha
- mood_change = 3
- timeout = 1000
-
-/datum/mood_event/fedpred
- description = "I've devoured someone!\n"
- mood_change = 3
-
-/datum/mood_event/fedprey
- description = "It feels quite cozy in here.\n"
- mood_change = 3
diff --git a/modular_citadel/code/datums/mood_events/moodular.dm b/modular_citadel/code/datums/mood_events/moodular.dm
deleted file mode 100644
index ee502c7b39..0000000000
--- a/modular_citadel/code/datums/mood_events/moodular.dm
+++ /dev/null
@@ -1,27 +0,0 @@
-// Modular stuff to use with Citadel-specific moods.
-
-// box of hugs
-/obj/item/storage/box/hug/attack_self(mob/user)
- . = ..()
- SEND_SIGNAL(user, COMSIG_ADD_MOOD_EVENT,"hugbox", /datum/mood_event/hugbox)
-
-//Removed headpats here, duplicate code?
-
-// plush petting
-/obj/item/toy/plush/attack_self(mob/user)
- . = ..()
- if(stuffed || grenade)
- SEND_SIGNAL(user, COMSIG_ADD_MOOD_EVENT,"plushpet", /datum/mood_event/plushpet)
- else
- SEND_SIGNAL(user, COMSIG_ADD_MOOD_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(I.get_sharpness())
- if(!grenade)
- SEND_SIGNAL(user, COMSIG_ADD_MOOD_EVENT,"plushjack", /datum/mood_event/plushjack)
-
-// plush playing (plush-on-plush action)
- if(istype(I, /obj/item/toy/plush))
- SEND_SIGNAL(user, COMSIG_ADD_MOOD_EVENT,"plushplay", /datum/mood_event/plushplay)
diff --git a/tgstation.dme b/tgstation.dme
index 07915f2e04..e85c2c1111 100755
--- a/tgstation.dme
+++ b/tgstation.dme
@@ -2986,10 +2986,6 @@
#include "modular_citadel\code\_onclick\hud\stamina.dm"
#include "modular_citadel\code\datums\components\material_container.dm"
#include "modular_citadel\code\datums\components\souldeath.dm"
-#include "modular_citadel\code\datums\mood_events\chem_events.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\status_effects\chems.dm"
#include "modular_citadel\code\datums\status_effects\debuffs.dm"