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.
This commit is contained in:
Geeves
2020-11-11 15:05:51 +02:00
committed by GitHub
parent ed7b6498d3
commit 4f49d05ba2
8 changed files with 20 additions and 14 deletions
@@ -26,7 +26,7 @@
siemens_coefficient = 0
rarity_value = 10
breakcuffs = list(MALE,FEMALE,NEUTER)
break_cuffs = TRUE
fall_mod = 0
@@ -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,
@@ -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.
@@ -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"
@@ -41,7 +41,7 @@
exhaust_threshold = 65
rarity_value = 3
breakcuffs = list(MALE)
break_cuffs = TRUE
mob_size = 10
climb_coeff = 1.35
@@ -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')
+5 -5
View File
@@ -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(