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 a Touchy quirk #1937

Merged
merged 2 commits into from
Feb 13, 2024
Merged

[MIRROR] Adds a Touchy quirk #1937

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
91ab345
[MIRROR] Adds a Touchy quirk (#903)
NovaBot13 Feb 11, 2024
5247be6
Merge branch 'master' of https://github.com/Fluffy-Frontier/FluffySTG…
Iajret Feb 11, 2024
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/controllers/subsystem/processing/quirks.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
// Shifted to glob so they are generated at world start instead of risking players doing preference stuff before the subsystem inits
GLOBAL_LIST_INIT_TYPED(quirk_blacklist, /list/datum/quirk, list(
list(/datum/quirk/item_quirk/blindness, /datum/quirk/item_quirk/nearsighted),
list(/datum/quirk/item_quirk/blindness, /datum/quirk/touchy),
list(/datum/quirk/jolly, /datum/quirk/depression, /datum/quirk/apathetic, /datum/quirk/hypersensitive),
list(/datum/quirk/no_taste, /datum/quirk/vegetarian, /datum/quirk/deviant_tastes, /datum/quirk/gamer),
list(/datum/quirk/pineapple_liker, /datum/quirk/pineapple_hater, /datum/quirk/gamer),
Expand Down
22 changes: 22 additions & 0 deletions code/datums/quirks/negative_quirks/unusual.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
/datum/quirk/touchy
name = "Touchy"
desc = "You are very touchy and have to physically be able to touch something to examine it."
icon = FA_ICON_HAND
value = -2
gain_text = span_danger("You feel like you can't examine things from a distance.")
lose_text = span_notice("You feel like you can examine things from a distance.")
medical_record_text = "Patient is unable to tell objects apart from a distance."
hardcore_value = 4

/datum/quirk/touchy/add(client/client_source)
RegisterSignal(quirk_holder, COMSIG_CLICK_SHIFT, PROC_REF(examinate_check))

/datum/quirk/touchy/remove()
UnregisterSignal(quirk_holder, COMSIG_CLICK_SHIFT)

///Checks if the mob is besides the thing being examined, if they aren't then we cancel their examinate.
/datum/quirk/touchy/proc/examinate_check(mob/examiner, atom/examined)
SIGNAL_HANDLER

if(!examined.Adjacent(examiner))
return COMSIG_MOB_CANCEL_CLICKON
1 change: 1 addition & 0 deletions tgstation.dme
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1774,6 +1774,7 @@
#include "code\datums\quirks\negative_quirks\softspoken.dm"
#include "code\datums\quirks\negative_quirks\tin_man.dm"
#include "code\datums\quirks\negative_quirks\unstable.dm"
#include "code\datums\quirks\negative_quirks\unusual.dm"
#include "code\datums\quirks\neutral_quirks\bald.dm"
#include "code\datums\quirks\neutral_quirks\colorist.dm"
#include "code\datums\quirks\neutral_quirks\deviant_tastes.dm"
Expand Down
Loading