From 4f49d05ba2ebd3b146775a8586c172d5eb3d3d8d Mon Sep 17 00:00:00 2001 From: Geeves Date: Wed, 11 Nov 2020 15:05:51 +0200 Subject: [PATCH] Species Cuff Breaking (#10495) Breaking cuffs is now per species, instead of per species per sex. This means that female unathi can break cuffs now. --- .../mob/living/carbon/human/species/outsider/shadow.dm | 2 +- .../mob/living/carbon/human/species/outsider/undead.dm | 4 ++-- .../modules/mob/living/carbon/human/species/species.dm | 2 +- .../carbon/human/species/station/ipc/ipc_subspecies.dm | 4 ++-- .../carbon/human/species/station/unathi/unathi.dm | 2 +- .../human/species/station/vaurca/vaurca_subspecies.dm | 4 ++-- code/modules/mob/living/carbon/resist.dm | 10 +++++----- html/changelogs/geeves-icanbreakthesecuffs.yml | 6 ++++++ 8 files changed, 20 insertions(+), 14 deletions(-) create mode 100644 html/changelogs/geeves-icanbreakthesecuffs.yml diff --git a/code/modules/mob/living/carbon/human/species/outsider/shadow.dm b/code/modules/mob/living/carbon/human/species/outsider/shadow.dm index 35d2df0dea5..7efdfbcaf14 100644 --- a/code/modules/mob/living/carbon/human/species/outsider/shadow.dm +++ b/code/modules/mob/living/carbon/human/species/outsider/shadow.dm @@ -26,7 +26,7 @@ siemens_coefficient = 0 rarity_value = 10 - breakcuffs = list(MALE,FEMALE,NEUTER) + break_cuffs = TRUE fall_mod = 0 diff --git a/code/modules/mob/living/carbon/human/species/outsider/undead.dm b/code/modules/mob/living/carbon/human/species/outsider/undead.dm index 3e4b018fea3..083efc9ba9f 100644 --- a/code/modules/mob/living/carbon/human/species/outsider/undead.dm +++ b/code/modules/mob/living/carbon/human/species/outsider/undead.dm @@ -29,7 +29,7 @@ siemens_coefficient = 0 ethanol_resistance = -1 //no drunk skeletons taste_sensitivity = TASTE_NUMB - breakcuffs = list(MALE, FEMALE, NEUTER) + break_cuffs = TRUE meat_type = /obj/item/reagent_containers/food/snacks/meat/undead @@ -174,7 +174,7 @@ ethanol_resistance = -1 taste_sensitivity = TASTE_NUMB - breakcuffs = list(MALE,FEMALE,NEUTER) + break_cuffs = TRUE has_organ = list( "zombie" = /obj/item/organ/internal/parasite/zombie, diff --git a/code/modules/mob/living/carbon/human/species/species.dm b/code/modules/mob/living/carbon/human/species/species.dm index c851de2c3f3..45663fce525 100644 --- a/code/modules/mob/living/carbon/human/species/species.dm +++ b/code/modules/mob/living/carbon/human/species/species.dm @@ -83,7 +83,7 @@ var/vision_flags = DEFAULT_SIGHT // Same flags as glasses. var/inherent_eye_protection // If set, this species has this level of inherent eye protection. var/eyes_are_impermeable = FALSE // If TRUE, this species' eyes are not damaged by phoron. - var/list/breakcuffs = list() //used in resist.dm to check if they can break hand/leg cuffs + var/break_cuffs = FALSE //used in resist.dm to check if they can break hand/leg cuffs var/natural_climbing = FALSE //If true, the species always succeeds at climbing. var/climb_coeff = 1.25 //The coefficient to the climbing speed of the individual = 60 SECONDS * climb_coeff // Death vars. diff --git a/code/modules/mob/living/carbon/human/species/station/ipc/ipc_subspecies.dm b/code/modules/mob/living/carbon/human/species/station/ipc/ipc_subspecies.dm index cd01cf8af21..e7ee8ade424 100644 --- a/code/modules/mob/living/carbon/human/species/station/ipc/ipc_subspecies.dm +++ b/code/modules/mob/living/carbon/human/species/station/ipc/ipc_subspecies.dm @@ -89,7 +89,7 @@ spawn_flags = IS_RESTRICTED - breakcuffs = list(MALE, FEMALE) + break_cuffs = TRUE has_organ = list( BP_BRAIN = /obj/item/organ/internal/mmi_holder/posibrain, @@ -212,7 +212,7 @@ flash_mod = 0 siemens_coefficient = 0 - breakcuffs = list(MALE,FEMALE,NEUTER) + break_cuffs = TRUE mob_size = 20 show_ssd = "laying inert, its activation glyph dark" diff --git a/code/modules/mob/living/carbon/human/species/station/unathi/unathi.dm b/code/modules/mob/living/carbon/human/species/station/unathi/unathi.dm index b8a22ea7b5e..7c881a259cf 100644 --- a/code/modules/mob/living/carbon/human/species/station/unathi/unathi.dm +++ b/code/modules/mob/living/carbon/human/species/station/unathi/unathi.dm @@ -41,7 +41,7 @@ exhaust_threshold = 65 rarity_value = 3 - breakcuffs = list(MALE) + break_cuffs = TRUE mob_size = 10 climb_coeff = 1.35 diff --git a/code/modules/mob/living/carbon/human/species/station/vaurca/vaurca_subspecies.dm b/code/modules/mob/living/carbon/human/species/station/vaurca/vaurca_subspecies.dm index 89aac7f09ae..bec26b5a20a 100644 --- a/code/modules/mob/living/carbon/human/species/station/vaurca/vaurca_subspecies.dm +++ b/code/modules/mob/living/carbon/human/species/station/vaurca/vaurca_subspecies.dm @@ -58,7 +58,7 @@ eyes_icons = 'icons/mob/human_face/eyes48x48.dmi' grab_mod = 4 toxins_mod = 1 //they're not used to all our weird human bacteria. - breakcuffs = list(MALE,FEMALE,NEUTER) + break_cuffs = TRUE mob_size = 30 speech_sounds = list('sound/voice/hiss1.ogg','sound/voice/hiss2.ogg','sound/voice/hiss3.ogg','sound/voice/hiss4.ogg') @@ -112,7 +112,7 @@ toxins_mod = 1 grab_mod = 10 total_health = 200 - breakcuffs = list(MALE,FEMALE,NEUTER) + break_cuffs = TRUE mob_size = 30 speech_sounds = list('sound/voice/hiss1.ogg','sound/voice/hiss2.ogg','sound/voice/hiss3.ogg','sound/voice/hiss4.ogg') diff --git a/code/modules/mob/living/carbon/resist.dm b/code/modules/mob/living/carbon/resist.dm index decc282ae87..2964e3613be 100644 --- a/code/modules/mob/living/carbon/resist.dm +++ b/code/modules/mob/living/carbon/resist.dm @@ -175,15 +175,15 @@ /mob/living/carbon/proc/can_break_cuffs() if(HULK in mutations) - return 1 + return TRUE if(stamina < 100) - return 0 + return FALSE - if(src.gender in src.species.breakcuffs) - return 1 + if(species?.break_cuffs) + return TRUE - return 0 + return FALSE /mob/living/carbon/proc/break_handcuffs() visible_message( diff --git a/html/changelogs/geeves-icanbreakthesecuffs.yml b/html/changelogs/geeves-icanbreakthesecuffs.yml new file mode 100644 index 00000000000..db32d717cc2 --- /dev/null +++ b/html/changelogs/geeves-icanbreakthesecuffs.yml @@ -0,0 +1,6 @@ +author: Geeves + +delete-after: True + +changes: + - tweak: "Breaking cuffs is now per species, instead of per species per sex. This means that female unathi can break cuffs now." \ No newline at end of file