Skip to content

Adds 2 quirks, hides some quirks from med records, fixes negative knockback #874

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

Open
BNGP0 wants to merge 4 commits into
base: master
Choose a base branch
from
+47 −2
Open

Adds 2 quirks, hides some quirks from med records, fixes negative knockback #874

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
65f2586
fixes negative knockback reseting, hides some quirks, adds 2 quirks
BNGP0 Feb 23, 2026
7c6f070
Merge remote-tracking branch 'upstream/master' into test
BNGP0 Feb 23, 2026
c0385b3
reflectionless icon change
BNGP0 Feb 24, 2026
f4a8a87
You no longer no longer reflect in mirrors
BNGP0 Feb 24, 2026
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
7 changes: 5 additions & 2 deletions code/datums/elements/knockback.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,8 +63,11 @@
var/atom/movable/throwee = target
if(throwee.anchored && !throw_anchored)
return
//IRIS EDIT - makes negative distance reset temporarily for the check, instead of being permanently set back to positive after one use
var/TD = throw_distance
if(throw_distance < 0)
throw_dir = REVERSE_DIR(throw_dir)
throw_distance *= -1
TD = throw_distance * -1
Copy link
Contributor

@prodirus prodirus Feb 23, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'd generally avoid using capitals in varnames, especially allcaps as that's used for defines, but it's not the hugest deal just a personal nitpick.

var/atom/throw_target = get_edge_target_turf(throwee, throw_dir)
throwee.safe_throw_at(throw_target, throw_distance, 1, thrower, gentle = throw_gentle)
throwee.safe_throw_at(throw_target, TD, 1, thrower, gentle = throw_gentle)
//IRIS EDIT END
8 changes: 8 additions & 0 deletions code/datums/quirks/_quirk.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,10 @@
/// A list of traits that should stop this quirk from processing.
/// Signals for adding and removing this trait will automatically be added to `process_update_signals`.
var/list/no_process_traits
// IRIS EDIT
// makes the quirk not show up in the medical records at all
var/hidden = FALSE
// IRIS EDIT END

/datum/quirk/New()
. = ..()
Expand Down Expand Up @@ -271,6 +275,10 @@
for(var/datum/quirk/candidate as anything in target_quirks) // NOVA EDIT CHANGE - ORIGINAL : for(var/datum/quirk/candidate as anything in quirks)
if(from_scan && (candidate.quirk_flags & QUIRK_HIDE_FROM_SCAN))
continue
//IRIS EDIT
if(candidate.hidden)
continue
//IRIS EDIT END
switch(category)
if(CAT_QUIRK_MAJOR_DISABILITY)
if(candidate.value >= -4)
Expand Down
1 change: 1 addition & 0 deletions modular_iris/modules/magic_quirk/magic_skills.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ You can also ask for custom rituals through prayers, but it's not guaranteed som
medical_record_text = "Subject possesses an innate ability for magic."
gain_text = span_notice("You feel like you understand magic!")
lose_text = span_danger("You feel like you no longer understand magic.")
hidden = TRUE
// mail_goodies = list(/obj/item/storage/fancy/nugget_box)
var/list/crafting_recipe_types = list(
/datum/crafting_recipe/canning_supplies,
Expand Down
8 changes: 8 additions & 0 deletions modular_iris/modules/quirks/_conceals.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
/datum/quirk/item_quirk/stowaway
hidden = TRUE

/datum/quirk/masquerade_food
hidden = TRUE

/datum/quirk/item_quirk/underworld_connections
hidden = TRUE
23 changes: 23 additions & 0 deletions modular_iris/modules/quirks/simple_traits.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
/datum/quirk/soulless
name = "Soulless"
desc = "You have sold or somehow lost your soul. This will affect some magical effects and chapel deity interactions. Death and revival might lead to unforeseen side effects."
icon = FA_ICON_FILE_CONTRACT
value = -3 // not sure if the bonus should be lower or higher. Having no soul might get you in some RP trobules but the mechanical effects are barely present
mob_trait = TRAIT_NO_SOUL
gain_text = span_notice("You feel like the sky's the limit!")
lose_text = span_danger("You feel a little bit more grounded.")
medical_record_text = "???"
hidden = TRUE

//FA_ICON_EGG FA_ICON_PERSON_CIRCLE_MINUS

/datum/quirk/no_reflection
name = "No mirror reflection"
desc = "You do not reflect in mirrors."
icon = FA_ICON_EGG //the egg looks similar enough to a mirror. change this if needed
Copy link
Contributor

@prodirus prodirus Feb 23, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Gonna need a different icon, it's already used by bald.

value = 0
mob_trait = TRAIT_NO_MIRROR_REFLECTION
gain_text = span_notice("You feel like the sky's the limit!")
lose_text = span_danger("You feel a little bit more grounded.")
medical_record_text = "???"
hidden = TRUE
2 changes: 2 additions & 0 deletions tgstation.dme
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7230,6 +7230,7 @@
#include "modular_iris\modules\provenance_ports\costumes\patho\code\patho.dm"
#include "modular_iris\modules\provenance_ports\costumes\softsuit\code\softsuit.dm"
#include "modular_iris\modules\provenance_ports\costumes\softsuit\code\softsuit_box.dm"
#include "modular_iris\modules\quirks\_conceals.dm"
#include "modular_iris\modules\quirks\blacklists.dm"
#include "modular_iris\modules\quirks\caffeine_dependence.dm"
#include "modular_iris\modules\quirks\colorblindness.dm"
Expand All @@ -7240,6 +7241,7 @@
#include "modular_iris\modules\quirks\paranoia.dm"
#include "modular_iris\modules\quirks\prescription.dm"
#include "modular_iris\modules\quirks\salt_vulnerability.dm"
#include "modular_iris\modules\quirks\simple_traits.dm"
#include "modular_iris\modules\quirks\somatic_volatility.dm"
#include "modular_iris\modules\quirks\stowaway.dm"
#include "modular_iris\modules\quirks\tunnel_vision.dm"
Expand Down
Loading