diff --git a/code/__DEFINES/~skyrat_defines/jobs.dm b/code/__DEFINES/~skyrat_defines/jobs.dm index f67ca4aab6e..15f9fe88ef0 100644 --- a/code/__DEFINES/~skyrat_defines/jobs.dm +++ b/code/__DEFINES/~skyrat_defines/jobs.dm @@ -4,7 +4,7 @@ #define JOB_UNAVAILABLE_SPECIES JOB_UNAVAILABLE_QUIRK + 1 #define JOB_UNAVAILABLE_LANGUAGE JOB_UNAVAILABLE_SPECIES + 1 -#define SEC_RESTRICTED_QUIRKS "Blind" = TRUE, "Brain Tumor" = TRUE, "Deaf" = TRUE, "Paraplegic" = TRUE, "Mute" = TRUE, "Foreigner" = TRUE, "Pacifist" = TRUE, "Chunky Fingers" = TRUE +#define SEC_RESTRICTED_QUIRKS "Blind" = TRUE, "Brain Tumor" = TRUE, "Deaf" = TRUE, "Paraplegic" = TRUE, "Mute" = TRUE, "Foreigner" = TRUE, "Pacifist" = TRUE, "Chunky Fingers" = TRUE, "No Guns" = TRUE #define HEAD_RESTRICTED_QUIRKS "Blind" = TRUE, "Deaf" = TRUE, "Mute" = TRUE, "Foreigner" = TRUE, "Chunky Fingers" = TRUE #define TECH_RESTRICTED_QUIRKS "Chunky Fingers" = TRUE diff --git a/code/controllers/subsystem/processing/quirks.dm b/code/controllers/subsystem/processing/quirks.dm index 4030f5e7613..350cd475d75 100644 --- a/code/controllers/subsystem/processing/quirks.dm +++ b/code/controllers/subsystem/processing/quirks.dm @@ -27,7 +27,8 @@ PROCESSING_SUBSYSTEM_DEF(quirks) list("Bad Touch", "Friendly"), list("Extrovert", "Introvert"), //SKYRAT EDIT ADDITION BEGIN - list("Nerve Stapled", "Pacifist", "Nearsighted") + list("Nerve Stapled", "Pacifist", "Nearsighted"), + list("No Guns", "Chunky Fingers") //SKYRAT EDIT ADDITION END ) diff --git a/modular_skyrat/master_files/code/datums/traits/negative.dm b/modular_skyrat/master_files/code/datums/traits/negative.dm index d586bc393b6..df97dfbdf65 100644 --- a/modular_skyrat/master_files/code/datums/traits/negative.dm +++ b/modular_skyrat/master_files/code/datums/traits/negative.dm @@ -66,6 +66,16 @@ mob_trait = TRAIT_CHUNKYFINGERS icon = "hand-middle-finger" +/datum/quirk/no_guns + name = "No Guns" + desc = "For whatever reason, you are unable to use guns. The reasoning may vary, but is up to you to decide." + gain_text = span_notice("You feel like you won't be able to use guns anymore...") + lose_text = span_notice("You suddenly feel like you can use guns again!") + medical_record_text = "Patient is unable to use firearms. Reasoning unknown." + value = -4 + mob_trait = TRAIT_NOGUNS + icon = "none" + /datum/quirk/mute name = "Mute" desc = "Due to some accident, medical condition, or simply by choice, you are completely unable to speak."