Skip to content
Open
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
10 changes: 8 additions & 2 deletions code/datums/elements/knockback.dm
Original file line number Diff line number Diff line change
Expand Up @@ -63,8 +63,14 @@
var/atom/movable/throwee = target
if(throwee.anchored && !throw_anchored)
return

//IRIS EDIT START - 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
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
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
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
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
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("Your soul is missing from your body.")
lose_text = span_danger("You have gained your soul back.")
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_PERSON_CIRCLE_MINUS //change this if you find both an icon better fitting no_reflection quirk and a quirk better fitting FA_ICON_PERSON_CIRCLE_MINUS icon
value = 0
mob_trait = TRAIT_NO_MIRROR_REFLECTION
gain_text = span_notice("You no longer reflect in mirrors.")
lose_text = span_danger("You no longer no longer reflect in mirrors.")
medical_record_text = "???"
hidden = TRUE
2 changes: 2 additions & 0 deletions tgstation.dme
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