Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Separate quirk code into individual files #1220

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions code/__SPLURTCODE/DEFINES/traits.dm
Original file line number Diff line number Diff line change
Expand Up @@ -51,3 +51,4 @@
#define TRAIT_MESSY "messy"
#define TRAIT_RESTORATIVE_METABOLISM "restorative_metabolism"
#define TRAIT_KISS_SLUT "kiss_slut"
#define TRAIT_HYDRA_HEADS "hydrahead" //Hydra head port.
26 changes: 21 additions & 5 deletions code/datums/traits/good.dm
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
/datum/quirk/empath
name = "Empath"
desc = "Whether it's a sixth sense or careful study of body language, it only takes you a quick glance at someone to understand how they feel."
value = 1 // SPLURT EDIT
value = 2
mob_trait = TRAIT_EMPATH
gain_text = "<span class='notice'>You feel in tune with those around you.</span>"
lose_text = "<span class='danger'>You feel isolated from others.</span>"
Expand All @@ -49,7 +49,7 @@
/datum/quirk/freerunning
name = "Freerunning"
desc = "You're great at quick moves! You can climb tables more quickly."
value = 1 // SPLURT EDIT
value = 2
mob_trait = TRAIT_FREERUNNING
gain_text = "<span class='notice'>You feel lithe on your feet!</span>"
lose_text = "<span class='danger'>You feel clumsy again.</span>"
Expand Down Expand Up @@ -90,7 +90,7 @@
/datum/quirk/quick_step
name = "Quick Step"
desc = "You walk with determined strides, and out-pace most people when walking."
value = 1 // SPLURT EDIT
value = 2
mob_trait = TRAIT_SPEEDY_STEP
gain_text = "<span class='notice'>You feel determined. No time to lose.</span>"
lose_text = "<span class='danger'>You feel less determined. What's the rush, man?</span>"
Expand All @@ -115,6 +115,22 @@
H.equip_to_slot_if_possible(musicaltuner, ITEM_SLOT_BACKPACK)
H.regenerate_icons()

/datum/quirk/photographer
name = "Photographer"
desc = "You know how to handle a camera, shortening the delay between each shot."
value = 1
mob_trait = TRAIT_PHOTOGRAPHER
gain_text = "<span class='notice'>You know everything about photography.</span>"
lose_text = "<span class='danger'>You forget how photo cameras work.</span>"
medical_record_text = "Patient mentions photography as a stress-relieving hobby."

/datum/quirk/photographer/on_spawn()
var/mob/living/carbon/human/H = quirk_holder
var/obj/item/camera/camera = new(get_turf(H))
H.put_in_hands(camera)
H.equip_to_slot(camera, ITEM_SLOT_NECK)
H.regenerate_icons()

/datum/quirk/selfaware
name = "Self-Aware"
desc = "You know your body well, and can accurately assess the extent of your wounds."
Expand All @@ -125,7 +141,7 @@
/datum/quirk/skittish
name = "Skittish"
desc = "You can conceal yourself in danger. Ctrl-shift-click a closed locker to jump into it, as long as you have access."
value = 1 // SPLURT EDIT
value = 2
mob_trait = TRAIT_SKITTISH
medical_record_text = "Patient demonstrates a high aversion to danger and has described hiding in containers out of fear."

Expand Down Expand Up @@ -156,7 +172,7 @@

/datum/quirk/voracious
name = "Voracious"
desc = "Nothing gets between you and your food. You eat twice as fast as everyone else, and won't get sad by being fat!"
desc = "Nothing gets between you and your food. You eat twice as fast as everyone else!"
value = 1
mob_trait = TRAIT_VORACIOUS
gain_text = "<span class='notice'>You feel HONGRY.</span>"
Expand Down
1 change: 0 additions & 1 deletion code/datums/traits/negative.dm
Original file line number Diff line number Diff line change
Expand Up @@ -354,7 +354,6 @@ GLOBAL_LIST_EMPTY(family_heirlooms)
gain_text = "<span class='danger'>You start worrying about what you're saying.</span>"
lose_text = "<span class='notice'>You feel easier about talking again.</span>" //if only it were that easy!
medical_record_text = "Patient is usually anxious in social encounters and prefers to avoid them."
mob_trait = TRAIT_ANXIOUS
var/dumb_thing = TRUE
processing_quirk = TRUE

Expand Down
42 changes: 0 additions & 42 deletions code/datums/traits/neutral.dm
Original file line number Diff line number Diff line change
Expand Up @@ -182,45 +182,3 @@

/datum/quirk/dullahan/post_add()
quirk_holder.AddComponent(/datum/component/dullahan)

/datum/quirk/photographer
name = "Photographer"
desc = "You carry your camera and personal photo album everywhere you go - and you're quicker at taking pictures."
value = 0
mob_trait = TRAIT_PHOTOGRAPHER
gain_text = "<span class='notice'>You know everything about photography.</span>"
lose_text = "<span class='danger'>You forget how photo cameras work.</span>"
medical_record_text = "Patient mentions photography as a stress-relieving hobby."

/datum/quirk/photographer/on_spawn()
var/mob/living/carbon/human/H = quirk_holder
var/obj/item/storage/photo_album/photo_album = new(get_turf(H))
H.put_in_hands(photo_album)
H.equip_to_slot(photo_album, ITEM_SLOT_BACKPACK)
photo_album.persistence_id = "personal_[H.mind.key]" // this is a persistent album, the ID is tied to the account's key to avoid tampering
photo_album.persistence_load()
photo_album.name = "[H.real_name]'s photo album"
var/obj/item/camera/camera = new(get_turf(H))
H.put_in_hands(camera)
H.equip_to_slot(camera, ITEM_SLOT_BACKPACK) //SPLURT Edit
H.regenerate_icons()

/datum/quirk/jiggly_ass
name = "Buns of Thunder"
desc = "That pants-stretching, seat-creaking, undie-devouring butt of yours is as satisfying as it is difficult to keep balanced when smacked!"
value = 0
mob_trait = TRAIT_JIGGLY_ASS
gain_text = span_notice("Your butt feels extremely smackable.")
lose_text = span_notice("Your butt feels normally smackable again.")

/datum/quirk/jiggly_ass/add()
// Add examine text
RegisterSignal(quirk_holder, COMSIG_PARENT_EXAMINE, PROC_REF(on_examine_holder))

/datum/quirk/jiggly_ass/remove()
// Remove examine text
UnregisterSignal(quirk_holder, COMSIG_PARENT_EXAMINE)

// Quirk examine text
/datum/quirk/jiggly_ass/proc/on_examine_holder(atom/examine_target, mob/living/carbon/human/examiner, list/examine_list)
examine_list += span_lewd("[quirk_holder.p_their(TRUE)] butt could use a firm smack.")
8 changes: 4 additions & 4 deletions modular_sand/code/datums/traits/negative.dm
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
/datum/quirk/sheltered
name = "Sheltered"
desc = "For one reason or another, you either can't or haven't learned the common tongue."
desc = "You never learned galactic common."
value = 0
mob_trait = TRAIT_SHELTERED
gain_text = span_danger("The words of others begin to blur together...")
lose_text = span_notice("You start putting together what people are saying!")
medical_record_text = "Patient has shown an inability to use common speaking languages."
gain_text = span_danger("You do not understand galactic common.")
lose_text = span_notice("You start to put together what people are saying in galactic common.")
medical_record_text = "Patient looks perplexed when questioned in galactic common."

/datum/quirk/sheltered/on_spawn()
var/mob/living/carbon/human/H = quirk_holder
Expand Down
9 changes: 0 additions & 9 deletions modular_splurt/code/datums/mood_events/needs_events.dm
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,3 @@
return
description = span_nicegreen("MORE FOOD!!! MORE FOOD!!! MORE FOOD!!!\n")
mood_change = 8

/datum/mood_event/cum_craving
description = span_warning("I... NEED... CUM...\n")
mood_change = -20

/datum/mood_event/cum_stuffed
description = span_nicegreen("The cum feels so good inside me!\n")
mood_change = 8
timeout = 5 MINUTES
2 changes: 0 additions & 2 deletions modular_splurt/code/datums/traits/defines.dm

This file was deleted.

Loading
Loading