cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2025-12-11 10:11:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

[MIRROR] Mime Fan vs Clown Enjoyer [MDB IGNORE] (#8567)

Browse Source 
* Mime Fan vs Clown Enjoyer (#61818)

Changes the flavor of the clown fan quirk to something more appropriate

* Mime Fan vs Clown Enjoyer

* Update maint_loot_common.dm

Co-authored-by: Hulkamania <39933245+JetBrody@users.noreply.github.com>
Co-authored-by: Gandalf <jzo123@hotmail.com>
This commit is contained in:
SkyratBot
2021-10-03 00:17:21 +02:00
committed by GitHub
parent e4d36e6126
commit ccb3c3417a
9 changed files with 43 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
code/__DEFINES/traits.dm
View File

@@ -475,8 +475,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_CLOWN_ENJOYER "clown_enjoyer"
#define TRAIT_MIME_FAN "mime_fan"
#define TRAIT_VORACIOUS "voracious"
#define TRAIT_SELF_AWARE "self_aware"
#define TRAIT_FREERUNNING "freerunning"

4
code/_globalvars/traits.dm
View File

@@ -140,8 +140,8 @@ 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_CLOWN_ENJOYER" = TRAIT_CLOWN_ENJOYER,
"TRAIT_MIME_FAN" = TRAIT_MIME_FAN,
"TRAIT_VORACIOUS" = TRAIT_VORACIOUS,
"TRAIT_SELF_AWARE" = TRAIT_SELF_AWARE,
"TRAIT_FREERUNNING" = TRAIT_FREERUNNING,

2
code/datums/brain_damage/creepy_trauma.dm
View File

@@ -118,7 +118,7 @@
/datum/brain_trauma/special/obsessed/proc/find_obsession()
var/list/viable_minds = list() //The first list, which excludes hijinks
var/list/possible_targets = list() //The second list, which filters out silicons and simplemobs
var/static/list/trait_obsessions = list("Mime" = TRAIT_FAN_MIME, "Clown" = TRAIT_FAN_CLOWN, "Chaplain" = TRAIT_SPIRITUAL) //Jobs and their corresponding quirks
var/static/list/trait_obsessions = list("Mime" = TRAIT_MIME_FAN, "Clown" = TRAIT_CLOWN_ENJOYER, "Chaplain" = TRAIT_SPIRITUAL) //Jobs and their corresponding quirks
var/list/special_pool = list() //The special list, for quirk-based
var/chosen_victim //The obsession target

4
code/datums/mood_events/generic_positive_events.dm
View File

@@ -116,11 +116,11 @@
description = "<span class='nicegreen'>My family heirloom is safe with me.</span>\n"
mood_change = 1
/datum/mood_event/fan_clown_pin
/datum/mood_event/clown_enjoyer_pin
description = "<span class='nicegreen'>I love showing off my clown pin!</span>\n"
mood_change = 1
/datum/mood_event/fan_mime_pin
/datum/mood_event/mime_fan_pin
description = "<span class='nicegreen'>I love showing off my mime pin!</span>\n"
mood_change = 1

28
code/datums/quirks/good.dm
View File

@@ -62,37 +62,37 @@
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/item_quirk/fan_clown
name = "Clown Fan"
/datum/quirk/item_quirk/clown_enjoyer
name = "Clown Enjoyer"
desc = "You enjoy clown antics and get a mood boost from wearing your clown pin."
icon = "map-pin"
value = 2
mob_trait = TRAIT_FAN_CLOWN
gain_text = "<span class='notice'>You are a big fan of clowns.</span>"
mob_trait = TRAIT_CLOWN_ENJOYER
gain_text = "<span class='notice'>You are a big enjoyer 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."
medical_record_text = "Patient reports being a big enjoyer of clowns."
/datum/quirk/item_quirk/fan_clown/add_unique()
give_item_to_holder(/obj/item/clothing/accessory/fan_clown_pin, list(LOCATION_BACKPACK = ITEM_SLOT_BACKPACK, LOCATION_HANDS = ITEM_SLOT_HANDS))
/datum/quirk/item_quirk/clown_enjoyer/add_unique()
give_item_to_holder(/obj/item/clothing/accessory/clown_enjoyer_pin, list(LOCATION_BACKPACK = ITEM_SLOT_BACKPACK, LOCATION_HANDS = ITEM_SLOT_HANDS))
/datum/quirk/item_quirk/fan_clown/add()
/datum/quirk/item_quirk/clown_enjoyer/add()
var/datum/atom_hud/fan = GLOB.huds[DATA_HUD_FAN]
fan.add_hud_to(quirk_holder)
/datum/quirk/item_quirk/fan_mime
/datum/quirk/item_quirk/mime_fan
name = "Mime Fan"
desc = "You enjoy mime antics and get a mood boost from wearing your mime pin."
desc = "You're a fan of mime antics and get a mood boost from wearing your mime pin."
icon = "thumbtack"
value = 2
mob_trait = TRAIT_FAN_MIME
mob_trait = TRAIT_MIME_FAN
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/item_quirk/fan_mime/add_unique()
give_item_to_holder(/obj/item/clothing/accessory/fan_mime_pin, list(LOCATION_BACKPACK = ITEM_SLOT_BACKPACK, LOCATION_HANDS = ITEM_SLOT_HANDS))
/datum/quirk/item_quirk/mime_fan/add_unique()
give_item_to_holder(/obj/item/clothing/accessory/mime_fan_pin, list(LOCATION_BACKPACK = ITEM_SLOT_BACKPACK, LOCATION_HANDS = ITEM_SLOT_HANDS))
/datum/quirk/item_quirk/fan_mime/add()
/datum/quirk/item_quirk/mime_fan/add()
var/datum/atom_hud/fan = GLOB.huds[DATA_HUD_FAN]
fan.add_hud_to(quirk_holder)

8
code/game/data_huds.dm
View File

@@ -230,10 +230,10 @@ FAN HUDs! For identifying other fans on-sight.
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"
if(istype(U.attached_accessory, /obj/item/clothing/accessory/mime_fan_pin))
holder.icon_state = "mime_fan_pin"
else if(istype(U.attached_accessory, /obj/item/clothing/accessory/clown_enjoyer_pin))
holder.icon_state = "clown_enjoyer_pin"
/***********************************************
Security HUDs! Basic mode shows only the job.

32
code/modules/clothing/under/accessories.dm
View File

@@ -354,35 +354,35 @@
//REAL BIG FAN//
////////////////
/obj/item/clothing/accessory/fan_clown_pin
/obj/item/clothing/accessory/clown_enjoyer_pin
name = "\improper Clown Pin"
desc = "A pin to show off your appreciation for clowns and clowning!"
icon_state = "fan_clown_pin"
icon_state = "clown_enjoyer_pin"
/obj/item/clothing/accessory/fan_clown_pin/on_uniform_equip(obj/item/clothing/under/U, user)
/obj/item/clothing/accessory/clown_enjoyer_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)
if(HAS_TRAIT(L, TRAIT_CLOWN_ENJOYER))
SEND_SIGNAL(L, COMSIG_ADD_MOOD_EVENT, "clown_enjoyer_pin", /datum/mood_event/clown_enjoyer_pin)
/obj/item/clothing/accessory/fan_clown_pin/on_uniform_dropped(obj/item/clothing/under/U, user)
/obj/item/clothing/accessory/clown_enjoyer_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")
if(HAS_TRAIT(L, TRAIT_CLOWN_ENJOYER))
SEND_SIGNAL(L, COMSIG_CLEAR_MOOD_EVENT, "clown_enjoyer_pin")
/obj/item/clothing/accessory/fan_mime_pin
/obj/item/clothing/accessory/mime_fan_pin
name = "\improper Mime Pin"
desc = "A pin to show off your appreciation for mimes and miming!"
icon_state = "fan_mime_pin"
icon_state = "mime_fan_pin"
/obj/item/clothing/accessory/fan_mime_pin/on_uniform_equip(obj/item/clothing/under/U, user)
/obj/item/clothing/accessory/mime_fan_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)
if(HAS_TRAIT(L, TRAIT_MIME_FAN))
SEND_SIGNAL(L, COMSIG_ADD_MOOD_EVENT, "mime_fan_pin", /datum/mood_event/mime_fan_pin)
/obj/item/clothing/accessory/fan_mime_pin/on_uniform_dropped(obj/item/clothing/under/U, user)
/obj/item/clothing/accessory/mime_fan_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")
if(HAS_TRAIT(L, TRAIT_MIME_FAN))
SEND_SIGNAL(L, COMSIG_CLEAR_MOOD_EVENT, "mime_fan_pin")
////////////////
//OONGA BOONGA//

BIN
icons/obj/clothing/accessories.dmi
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 12 KiB

After

Width:  |  Height:  |  Size: 12 KiB

4
modular_skyrat/master_files/code/_globalvars/maint_loot_common.dm
View File

@@ -295,8 +295,8 @@ GLOBAL_LIST_INIT(common_loot, list( //common: basic items
/obj/item/instrument/violin = 1
) = 50,
list( //Unimportant clothing
/obj/item/clothing/accessory/fan_clown_pin = 25,
/obj/item/clothing/accessory/fan_mime_pin = 25,
/obj/item/clothing/accessory/clown_enjoyer_pin = 25,
/obj/item/clothing/accessory/mime_fan_pin = 25,
/obj/item/clothing/accessory/lawyers_badge = 5,
/obj/item/clothing/accessory/waistcoat = 25,
/obj/item/clothing/ears/headphones = 5,