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.

Sign up for GitHub

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

[MIRROR] Adds medical record descriptions for quirks without any #968

Merged
merged 2 commits into from
Dec 4, 2023
Merged

[MIRROR] Adds medical record descriptions for quirks without any #968

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
df3f19d
[MIRROR] Adds medical record descriptions for quirks without any [MDB…
SkyratBot Dec 4, 2023
94598c6
Merge branch 'master' of https://github.com/Fluffy-Frontier/FluffySTG…
Iajret Dec 4, 2023
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/datums/quirks/neutral_quirks/heretochromatic.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
desc = "One of your eyes is a different color than the other!"
icon = FA_ICON_EYE_LOW_VISION // Ignore the icon name, its actually a fairly good representation of different color eyes
quirk_flags = QUIRK_HUMAN_ONLY|QUIRK_CHANGES_APPEARANCE
medical_record_text = "Patient's irises are different colors."
value = 0
mail_goodies = list(/obj/item/clothing/glasses/eyepatch)

Expand Down
1 change: 1 addition & 0 deletions code/datums/quirks/positive_quirks/signer.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
icon = FA_ICON_HANDS
value = 4
quirk_flags = QUIRK_HUMAN_ONLY|QUIRK_CHANGES_APPEARANCE
medical_record_text = "Patient can communicate with sign language."
mail_goodies = list(/obj/item/clothing/gloves/radio)

/datum/quirk/item_quirk/signer/add_unique(client/client_source)
Expand Down
1 change: 1 addition & 0 deletions code/datums/quirks/positive_quirks/spacer.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
icon = FA_ICON_USER_ASTRONAUT
value = 7
quirk_flags = QUIRK_CHANGES_APPEARANCE //SKYRAT EDIT CHANGE - ORIGINAL: quirk_flags = QUIRK_HUMAN_ONLY|QUIRK_CHANGES_APPEARANCE
medical_record_text = "Patient is well-adapted to non-terrestrial environments."
mail_goodies = list(
/obj/item/storage/pill_bottle/ondansetron,
/obj/item/reagent_containers/pill/gravitum,
Expand Down
1 change: 1 addition & 0 deletions code/datums/quirks/positive_quirks/voracious.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,5 @@
mob_trait = TRAIT_VORACIOUS
gain_text = span_notice("You feel HONGRY.")
lose_text = span_danger("You no longer feel HONGRY.")
medical_record_text = "Patient has an above average appreciation for food and drink."
mail_goodies = list(/obj/effect/spawner/random/food_or_drink/dinner)
22 changes: 22 additions & 0 deletions code/modules/unit_tests/quirks.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,3 +19,25 @@
continue

used_icons[icon] = quirk_type

// Make sure all quirks start with a description in medical records
/datum/unit_test/quirk_initial_medical_records

/datum/unit_test/quirk_initial_medical_records/Run()
var/mob/living/carbon/human/patient = allocate(/mob/living/carbon/human/consistent)

for(var/datum/quirk/quirk_type as anything in subtypesof(/datum/quirk))
if (initial(quirk_type.abstract_parent_type) == quirk_type)
continue

if(!isnull(quirk_type.medical_record_text))
continue

//Add quirk to a patient - so we can pass quirks that add a medical record after being assigned someone
patient.add_quirk(quirk_type)

var/datum/quirk/quirk = patient.get_quirk(quirk_type)

TEST_ASSERT_NOTNULL(quirk.medical_record_text,"[quirk_type] has no medical record description!")

patient.remove_quirk(quirk_type)
2 changes: 2 additions & 0 deletions modular_skyrat/modules/modular_items/lewd_items/code/lewd_quirks.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -289,6 +289,7 @@
desc = "You love being tied up."
value = 0 //ERP Traits don't have price. They are priceless. Ba-dum-tss
mob_trait = TRAIT_ROPEBUNNY
medical_record_text = "Subject has a fondness for restraints."
gain_text = span_danger("You really want to be restrained for some reason.")
lose_text = span_notice("Being restrained doesn't arouse you anymore.")
icon = FA_ICON_HANDCUFFS
Expand All @@ -310,6 +311,7 @@
desc = "You find the weaving of rope knots on the body wonderful."
value = 0 //ERP Traits don't have price. They are priceless. Ba-dum-tss
mob_trait = TRAIT_RIGGER
medical_record_text = "Subject has a increased dexterity when tying knots."
gain_text = span_danger("Suddenly you understand rope weaving much better than before.")
lose_text = span_notice("Rope knots looks complicated again.")
icon = FA_ICON_CHAIN_BROKEN
Expand Down
1 change: 1 addition & 0 deletions modular_skyrat/modules/paycheck_rations/code/quirk.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
redeemed at a cargo console for food and other items."
icon = FA_ICON_DONATE
quirk_flags = QUIRK_HUMAN_ONLY|QUIRK_HIDE_FROM_SCAN
medical_record_text = "Has enrolled in the ration ticket program."
value = 0
hardcore_value = 0

Expand Down
Loading