cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-24 21:48:39 +01:00
Code Issues Packages Projects Releases Wiki Activity

[MIRROR] Tailed species now gain a negative moodlet for having their tail lost (#3456)

Browse Source 
* Tailed species now gain a negative moodlet for having their tail lost

* a

Co-authored-by: MrMelbert <51863163+MrMelbert@users.noreply.github.com>
Co-authored-by: Gandalf2k15 <jzo123@hotmail.com>
This commit is contained in:
SkyratBot
2021-02-17 17:14:18 +00:00
committed by GitHub
co-authored by MrMelbert Gandalf2k15
parent 18456cdb73
commit f2b1e99a73
5 changed files with 106 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/datums/mood_events/generic_negative_events.dm
+19
View File
@@ -315,6 +315,25 @@
mood_change = -3
timeout = 90 SECONDS
/datum/mood_event/tail_lost
description = "<span class='boldwarning'>My tail!! Why?!</span>\n"
mood_change = -8
timeout = 10 MINUTES
/datum/mood_event/tail_balance_lost
description = "<span class='warning'>I feel off-balance without my tail.</span>\n"
mood_change = -2
/datum/mood_event/tail_regained_right
description = "<span class='warning'>My tail is back, but that was traumatic...</span>\n"
mood_change = -2
timeout = 5 MINUTES
/datum/mood_event/tail_regained_wrong
description = "<span class='boldwarning'>Is this some kind of sick joke?! This is NOT the right tail.</span>\n"
mood_change = -12 // -8 for tail still missing + -4 bonus for being frakenstein's monster
timeout = 5 MINUTES
/datum/mood_event/burnt_wings
description = "<span class='boldwarning'>MY PRECIOUS WINGS!!</span>\n"
mood_change = -10
code/modules/mob/living/carbon/human/species.dm
+60 -1
View File
@@ -464,6 +464,7 @@ GLOBAL_LIST_EMPTY(roundstart_races)
C.dna.species.mutant_bodyparts -= "wings"
C.dna.features["wings"] = "None"
C.update_body()
clear_tail_moodlets(C)
C.remove_movespeed_modifier(/datum/movespeed_modifier/species)
@@ -2061,6 +2062,65 @@ GLOBAL_LIST_EMPTY(roundstart_races)
//Tail Wagging//
////////////////
/*
* This proc is called when a mob loses their tail.
*
* tail_owner - the owner of the tail (who holds our species datum)
* lost_tail - the tail that was removed
* on_species_init - whether or not this was called when the species was initialized, or if it was called due to an ingame means (like surgery)
*/
/datum/species/proc/on_tail_lost(mob/living/carbon/human/tail_owner, obj/item/organ/tail/lost_tail, on_species_init = FALSE)
SEND_SIGNAL(tail_owner, COMSIG_CLEAR_MOOD_EVENT, "right_tail_regained")
SEND_SIGNAL(tail_owner, COMSIG_CLEAR_MOOD_EVENT, "wrong_tail_regained")
stop_wagging_tail(tail_owner)
// If it's initializing the species, don't add moodlets
if(on_species_init)
return
// If we don't have a set tail, don't bother adding moodlets
if(!mutant_organs.len)
return
SEND_SIGNAL(tail_owner, COMSIG_ADD_MOOD_EVENT, "tail_lost", /datum/mood_event/tail_lost)
SEND_SIGNAL(tail_owner, COMSIG_ADD_MOOD_EVENT, "tail_balance_lost", /datum/mood_event/tail_balance_lost)
/*
* This proc is called when a mob gains a tail.
*
* tail_owner - the owner of the tail (who holds our species datum)
* lost_tail - the tail that was added
* on_species_init - whether or not this was called when the species was initialized, or if it was called due to an ingame means (like surgery)
*/
/datum/species/proc/on_tail_regain(mob/living/carbon/human/tail_owner, obj/item/organ/tail/found_tail, on_species_init = FALSE)
SEND_SIGNAL(tail_owner, COMSIG_CLEAR_MOOD_EVENT, "tail_lost")
SEND_SIGNAL(tail_owner, COMSIG_CLEAR_MOOD_EVENT, "tail_balance_lost")
// If it's initializing the species, don't add moodlets
if(on_species_init)
return
// If we don't have a set tail, don't add moodlets
if(!mutant_organs.len)
return
if(found_tail.type in mutant_organs)
SEND_SIGNAL(tail_owner, COMSIG_ADD_MOOD_EVENT, "right_tail_regained", /datum/mood_event/tail_regained_right)
else
SEND_SIGNAL(tail_owner, COMSIG_ADD_MOOD_EVENT, "wrong_tail_regained", /datum/mood_event/tail_regained_wrong)
/*
* Clears all tail related moodlets when they lose their species.
*
* former_tail_owner - the mob that was once a species with a tail and now is a different species
*/
/datum/species/proc/clear_tail_moodlets(mob/living/carbon/human/former_tail_owner)
SEND_SIGNAL(former_tail_owner, COMSIG_CLEAR_MOOD_EVENT, "tail_lost")
SEND_SIGNAL(former_tail_owner, COMSIG_CLEAR_MOOD_EVENT, "tail_balance_lost")
SEND_SIGNAL(former_tail_owner, COMSIG_CLEAR_MOOD_EVENT, "right_tail_regained")
SEND_SIGNAL(former_tail_owner, COMSIG_CLEAR_MOOD_EVENT, "wrong_tail_regained")
stop_wagging_tail(former_tail_owner)
//SKYRAT EDIT REMOVAL BEGIN - CUSTOMIZATION (moved to modular)
/*
/datum/species/proc/can_wag_tail(mob/living/carbon/human/H)
@@ -2068,7 +2128,6 @@ GLOBAL_LIST_EMPTY(roundstart_races)
/datum/species/proc/is_wagging_tail(mob/living/carbon/human/H)
return FALSE
/datum/species/proc/start_wagging_tail(mob/living/carbon/human/H)
/datum/species/proc/stop_wagging_tail(mob/living/carbon/human/H)
code/modules/mob/living/carbon/human/species_types/felinid.dm
+1 -1
View File
@@ -63,7 +63,7 @@
mutantears = /obj/item/organ/ears
if(H.dna.features["tail_human"] == "Cat")
var/obj/item/organ/tail/cat/tail = new
tail.Insert(H, drop_if_replaced = FALSE)
tail.Insert(H, special = TRUE, drop_if_replaced = FALSE)
else
mutant_organs = list()
return ..()
code/modules/surgery/organs/organ_internal.dm
+13 -2
View File
@@ -40,7 +40,13 @@
foodtypes = RAW | MEAT | GROSS,\
volume = reagent_vol,\
after_eat = CALLBACK(src, .proc/OnEatFrom))
/*
* Insert the organ into the select mob.
*
* M - the mob who will get our organ
* special - "quick swapping" an organ out - when TRUE, the mob will be unaffected by not having that organ for the moment
* drop_if_replaced - if there's an organ in the slot already, whether we drop it afterwards
*/
/obj/item/organ/proc/Insert(mob/living/carbon/M, special = FALSE, drop_if_replaced = TRUE)
if(!iscarbon(M) || owner == M)
return
@@ -64,7 +70,12 @@
A.Grant(M)
STOP_PROCESSING(SSobj, src)
//Special is for instant replacement like autosurgeons
/*
* Remove the organ from the select mob.
*
* M - the mob who owns our organ, that we're removing the organ from.
* special - "quick swapping" an organ out - when TRUE, the mob will be unaffected by not having that organ for the moment
*/
/obj/item/organ/proc/Remove(mob/living/carbon/M, special = FALSE)
owner = null
if(M)
code/modules/surgery/organs/tails.dm
+13 -10
View File
@@ -8,10 +8,13 @@
slot = ORGAN_SLOT_TAIL
var/tail_type = "None"
/obj/item/organ/tail/Remove(mob/living/carbon/human/H, special = 0)
..()
if(H && H.dna && H.dna.species)
H.dna.species.stop_wagging_tail(H)
/obj/item/organ/tail/Insert(mob/living/carbon/human/tail_owner, special = FALSE, drop_if_replaced = TRUE)
. = ..()
tail_owner?.dna?.species?.on_tail_regain(tail_owner, src, special)
/obj/item/organ/tail/Remove(mob/living/carbon/human/tail_owner, special = FALSE)
. = ..()
tail_owner?.dna?.species?.on_tail_lost(tail_owner, src, special)
/obj/item/organ/tail/cat
name = "cat tail"
@@ -20,7 +23,7 @@
//SKYRAT EDIT REMOVAL BEGIN - CUSTOMIZATION
/*
/obj/item/organ/tail/cat/Insert(mob/living/carbon/human/H, special = 0, drop_if_replaced = TRUE)
/obj/item/organ/tail/cat/Insert(mob/living/carbon/human/H, special = FALSE, drop_if_replaced = TRUE)
..()
if(istype(H))
var/default_part = H.dna.species.mutant_bodyparts["tail_human"]
@@ -28,7 +31,7 @@
H.dna.features["tail_human"] = H.dna.species.mutant_bodyparts["tail_human"] = tail_type
H.update_body()
/obj/item/organ/tail/cat/Remove(mob/living/carbon/human/H, special = 0)
/obj/item/organ/tail/cat/Remove(mob/living/carbon/human/H, special = FALSE)
..()
if(istype(H))
H.dna.features["tail_human"] = "None"
@@ -51,7 +54,7 @@
..()
color = "#"+ random_color()
/obj/item/organ/tail/lizard/Insert(mob/living/carbon/human/H, special = 0, drop_if_replaced = TRUE)
/obj/item/organ/tail/lizard/Insert(mob/living/carbon/human/H, special = FALSE, drop_if_replaced = TRUE)
..()
if(istype(H))
// Checks here are necessary so it wouldn't overwrite the tail of a lizard it spawned in
@@ -64,7 +67,7 @@
H.dna.features["spines"] = H.dna.species.mutant_bodyparts["spines"] = spines
H.update_body()
/obj/item/organ/tail/lizard/Remove(mob/living/carbon/human/H, special = 0)
/obj/item/organ/tail/lizard/Remove(mob/living/carbon/human/H, special = FALSE)
..()
if(istype(H))
H.dna.species.mutant_bodyparts -= "tail_lizard"
@@ -94,7 +97,7 @@
//SKYRAT EDIT REMOVAL BEGIN - CUSTOMIZATION
/*
/obj/item/organ/tail/monkey/Insert(mob/living/carbon/human/H, special = 0, drop_if_replaced = TRUE)
/obj/item/organ/tail/monkey/Insert(mob/living/carbon/human/H, special = FALSE, drop_if_replaced = TRUE)
..()
if(istype(H))
if(!("tail_monkey" in H.dna.species.mutant_bodyparts))
@@ -102,7 +105,7 @@
H.dna.features["tail_monkey"] = tail_type
H.update_body()
/obj/item/organ/tail/monkey/Remove(mob/living/carbon/human/H, special = 0)
/obj/item/organ/tail/monkey/Remove(mob/living/carbon/human/H, special = FALSE)
..()
if(istype(H))
H.dna.features["tail_monkey"] = "None"