Skip to content

Commit

Permalink
Removes clown/mime fan quirks (#2986)
Browse files Browse the repository at this point in the history
<!-- Write **BELOW** The Headers and **ABOVE** The comments else it may
not be viewable. -->
<!-- You can view Contributing.MD for a detailed description of the pull
request process. -->

## About The Pull Request
Does as it says in the title
Removes the quirks, their mood buffs and their accessories.
<!-- Describe The Pull Request. Please be sure every change is
documented or this can delay review and even discourage maintainers from
merging your PR! -->

## Why It's Good For The Game
Clowns and mimes are no longer in the spotlight, and these quirks are
kind of incompatible with the server. Because there are no clowns and
mimes around. They serve no purpose.
<!-- Please add a short description of why you think these changes would
benefit the game. If you can't justify it in words, it might not be
worth adding. -->

## Changelog

:cl:
del: Clown and mime fan quirks have been removed
del: Removes the clown and mime fan pins
/:cl:

<!-- Both :cl:'s are required for the changelog to work! You can put
your name to the right of the first :cl: if you want to overwrite your
GitHub username as author ingame. -->
<!-- You can use multiple of the same prefix (they're only used for the
icon ingame) and delete the unneeded ones. Despite some of the tags,
changelogs should generally represent how a player might be affected by
the changes rather than a summary of the PR's contents. -->
  • Loading branch information
Zevotech authored May 27, 2024
1 parent 6e0dbe6 commit 32c81da
Show file tree
Hide file tree
Showing 10 changed files with 0 additions and 118 deletions.
2 changes: 0 additions & 2 deletions code/__DEFINES/traits.dm
Original file line number Diff line number Diff line change
Expand Up @@ -294,8 +294,6 @@ 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_FAN_RILENA "fan_rilena"
#define TRAIT_VORACIOUS "voracious"
#define TRAIT_SELF_AWARE "self_aware"
Expand Down
2 changes: 0 additions & 2 deletions code/_globalvars/traits.dm
Original file line number Diff line number Diff line change
Expand Up @@ -125,8 +125,6 @@ GLOBAL_LIST_INIT(traits_by_type, list(
"TRAIT_NIGHT_VISION" = TRAIT_NIGHT_VISION,
"TRAIT_LIGHT_STEP" = TRAIT_LIGHT_STEP,
"TRAIT_SPIRITUAL" = TRAIT_SPIRITUAL,
"TRAIT_FAN_CLOWN" = TRAIT_FAN_CLOWN,
"TRAIT_FAN_MIME" = TRAIT_FAN_MIME,
"TRAIT_VORACIOUS" = TRAIT_VORACIOUS,
"TRAIT_SELF_AWARE" = TRAIT_SELF_AWARE,
"TRAIT_FREERUNNING" = TRAIT_FREERUNNING,
Expand Down
1 change: 0 additions & 1 deletion code/controllers/subsystem/processing/quirks.dm
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@ PROCESSING_SUBSYSTEM_DEF(quirks)
list("Ageusia","Vegetarian","Deviant Tastes"), \
list("Ananas Affinity","Ananas Aversion"), \
list("Alcohol Tolerance","Light Drinker"), \
list("Clown Fan","Mime Fan", "RILENA Super Fan"), \
list("Bad Touch", "Friendly"))

species_blacklist = list("Blood Deficiency" = list(SPECIES_IPC, SPECIES_JELLYPERSON, SPECIES_PLASMAMAN, SPECIES_VAMPIRE))
Expand Down
8 changes: 0 additions & 8 deletions code/datums/mood_events/generic_positive_events.dm
Original file line number Diff line number Diff line change
Expand Up @@ -105,14 +105,6 @@
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/rilena_fan
description = "<span class='nicegreen'>I love my RILENA merch!</span>\n"
mood_change = 1
Expand Down
40 changes: 0 additions & 40 deletions code/datums/traits/good.dm
Original file line number Diff line number Diff line change
Expand Up @@ -62,26 +62,6 @@
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 clown antics and get a mood boost from wearing your clown pin."
value = 1
mob_traits = list(TRAIT_FAN_CLOWN)
gain_text = "<span class='notice'>You are a big fan of clowns.</span>"
lose_text = "<span class='danger'>The clown doesn't seem so great.</span>"
medical_record_text = "Patient reports being a big fan of clowns."

/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" = ITEM_SLOT_BACKPACK,
"hands" = ITEM_SLOT_HANDS,
)
H.equip_in_one_of_slots(B, slots , qdel_on_fail = TRUE)
var/datum/atom_hud/fan = GLOB.huds[DATA_HUD_FAN]
fan.add_hud_to(H)

/datum/quirk/fan_rilena
name = "RILENA Super Fan"
desc = "You are a major fan of the popular webseries RILENA: LMR. You get a mood boost from plushies of your favorite characters, and wearing your Xader pin."
Expand All @@ -102,26 +82,6 @@
var/datum/atom_hud/fan = GLOB.huds[DATA_HUD_FAN]
fan.add_hud_to(H)

/datum/quirk/fan_mime
name = "Mime Fan"
desc = "You enjoy mime antics and get a mood boost from wearing your mime pin."
value = 1
mob_traits = list(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 mimes."

/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" = ITEM_SLOT_BACKPACK,
"hands" = ITEM_SLOT_HANDS,
)
H.equip_in_one_of_slots(B, slots , qdel_on_fail = TRUE)
var/datum/atom_hud/fan = GLOB.huds[DATA_HUD_FAN]
fan.add_hud_to(H)

/datum/quirk/freerunning
name = "Freerunning"
desc = "You're great at quick moves! You can climb tables more quickly."
Expand Down
18 changes: 0 additions & 18 deletions code/game/data_huds.dm
Original file line number Diff line number Diff line change
Expand Up @@ -216,24 +216,6 @@ Medical HUD! Basic mode needs suit sensors on.
holder.icon_state = "hudhealthy"


/***********************************************
FAN HUDs! For identifying other fans on-sight.
************************************************/

//HOOKS

/mob/living/carbon/human/proc/fan_hud_set_fandom()
var/image/holder = hud_list[FAN_HUD]
var/icon/I = icon(icon, icon_state, dir)
holder.pixel_y = I.Height() - world.icon_size
holder.icon_state = "hudfan_no"
var/obj/item/clothing/under/U = get_item_by_slot(ITEM_SLOT_ICLOTHING)
if(U)
if(istype(U.attached_accessory, /obj/item/clothing/accessory/fan_mime_pin))
holder.icon_state = "fan_mime_pin"
else if(istype(U.attached_accessory, /obj/item/clothing/accessory/fan_clown_pin))
holder.icon_state = "fan_clown_pin"

/***********************************************
Security HUDs! Basic mode shows only the job.
************************************************/
Expand Down
4 changes: 0 additions & 4 deletions code/modules/clothing/under/_under.dm
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,6 @@
if(attached_accessory && slot != ITEM_SLOT_HANDS && ishuman(user))
var/mob/living/carbon/human/H = user
attached_accessory.on_uniform_equip(src, user)
H.fan_hud_set_fandom()
if(attached_accessory.above_suit)
H.update_inv_wear_suit()

Expand All @@ -101,7 +100,6 @@
attached_accessory.on_uniform_dropped(src, user)
if(ishuman(user))
var/mob/living/carbon/human/H = user
H.fan_hud_set_fandom()
if(attached_accessory.above_suit)
H.update_inv_wear_suit()

Expand Down Expand Up @@ -136,7 +134,6 @@
var/mob/living/carbon/human/H = loc
H.update_inv_w_uniform()
H.update_inv_wear_suit()
H.fan_hud_set_fandom()

return TRUE

Expand All @@ -158,7 +155,6 @@
var/mob/living/carbon/human/H = loc
H.update_inv_w_uniform()
H.update_inv_wear_suit()
H.fan_hud_set_fandom()


/obj/item/clothing/under/examine(mob/user)
Expand Down
39 changes: 0 additions & 39 deletions code/modules/clothing/under/accessories.dm
Original file line number Diff line number Diff line change
Expand Up @@ -376,45 +376,6 @@
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 = FALSE
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 = FALSE
minimize_when_attached = TRUE
attachment_slot = CHEST

/obj/item/clothing/accessory/fan_mime_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_mime_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_mime_pin")

////////////////
//OONGA BOONGA//
Expand Down
2 changes: 0 additions & 2 deletions code/modules/mob/living/carbon/human/human.dm
Original file line number Diff line number Diff line change
Expand Up @@ -52,8 +52,6 @@
sec_hud_set_ID()
sec_hud_set_implants()
sec_hud_set_security_status()
//...fan gear
fan_hud_set_fandom()
//...and display them.
add_to_all_human_data_huds()

Expand Down
2 changes: 0 additions & 2 deletions code/modules/vending/autodrobe.dm
Original file line number Diff line number Diff line change
Expand Up @@ -113,8 +113,6 @@
contraband = list(
/obj/item/clothing/suit/judgerobe = 1,
/obj/item/clothing/head/powdered_wig = 1,
/obj/item/clothing/accessory/fan_mime_pin = 1,
/obj/item/clothing/accessory/fan_clown_pin = 1,
/obj/item/gun/magic/wand/nothing = 2,
/obj/item/clothing/glasses/sunglasses/garb = 2,
/obj/item/clothing/glasses/blindfold = 1,
Expand Down

0 comments on commit 32c81da

Please sign in to comment.