cyberpresidentvanellope/S.P.L.U.R.T-Station-13
1
0
Fork 0
mirror of https://github.com/SPLURT-Station/S.P.L.U.R.T-Station-13.git synced 2026-08-30 08:07:03 +01:00
Code Issues Packages Projects Releases Wiki Activity

Quirk file separations

Browse Source 
This does the following:
- Separates all modular quirks into separate files, with no other changes.
- Modularizes some non-modular edits into a new file
- Fixes location of hydra trait definition
This commit is contained in:
Darius
2024-11-04 13:49:08 -05:00
parent 0d8acbb6c6
commit e70aeea39b
62 changed files with 3291 additions and 3278 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/datums/traits/good.dm
+21 -5
View File
@@ -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>"
@@ -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>"
@@ -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>"
@@ -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."
@@ -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."
@@ -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>"
code/datums/traits/negative.dm
-1
View File
@@ -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
code/datums/traits/neutral.dm
-42
View File
@@ -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.")