mirror of
https://github.com/KabKebab/GS13.git
synced 2026-07-11 16:08:32 +01:00
Merge pull request #627 from ArchieBeepBoop/spooky
The Spookening: Ports Jacqueline the Pumpqueen event + Dullahan and subsequent Fixes
This commit is contained in:
@@ -334,12 +334,13 @@
|
||||
|
||||
|
||||
//Regenerates all limbs. Returns amount of limbs regenerated
|
||||
/mob/living/proc/regenerate_limbs(noheal, excluded_limbs)
|
||||
return 0
|
||||
/mob/living/proc/regenerate_limbs(noheal = FALSE, list/excluded_limbs = list())
|
||||
SEND_SIGNAL(src, COMSIG_LIVING_REGENERATE_LIMBS, noheal, excluded_limbs)
|
||||
|
||||
/mob/living/carbon/regenerate_limbs(noheal, list/excluded_limbs)
|
||||
/mob/living/carbon/regenerate_limbs(noheal = FALSE, list/excluded_limbs = list())
|
||||
. = ..()
|
||||
var/list/limb_list = list(BODY_ZONE_HEAD, BODY_ZONE_CHEST, BODY_ZONE_R_ARM, BODY_ZONE_L_ARM, BODY_ZONE_R_LEG, BODY_ZONE_L_LEG)
|
||||
if(excluded_limbs)
|
||||
if(excluded_limbs.len)
|
||||
limb_list -= excluded_limbs
|
||||
for(var/Z in limb_list)
|
||||
. += regenerate_limb(Z, noheal)
|
||||
|
||||
@@ -32,6 +32,8 @@
|
||||
|
||||
var/lip_style = null
|
||||
var/lip_color = "white"
|
||||
//If the head is a special sprite
|
||||
var/custom_head
|
||||
|
||||
/obj/item/bodypart/head/can_dismember(obj/item/I)
|
||||
if(!((owner.stat == DEAD) || owner.InFullCritical()))
|
||||
@@ -118,6 +120,8 @@
|
||||
..()
|
||||
|
||||
/obj/item/bodypart/head/update_icon_dropped()
|
||||
if(custom_head)
|
||||
return
|
||||
var/list/standing = get_limb_icon(1)
|
||||
if(!standing.len)
|
||||
icon_state = initial(icon_state)//no overlays found, we default back to initial icon.
|
||||
@@ -128,6 +132,8 @@
|
||||
add_overlay(standing)
|
||||
|
||||
/obj/item/bodypart/head/get_limb_icon(dropped)
|
||||
if(custom_head)
|
||||
return
|
||||
cut_overlays()
|
||||
. = ..()
|
||||
if(dropped) //certain overlays only appear when the limb is being detached from its owner.
|
||||
|
||||
@@ -18,8 +18,6 @@
|
||||
return FALSE
|
||||
|
||||
|
||||
|
||||
|
||||
/mob/proc/has_left_hand(check_disabled = TRUE)
|
||||
return TRUE
|
||||
|
||||
@@ -335,3 +333,19 @@
|
||||
else
|
||||
S.adjusted = ALT_STYLE
|
||||
H.update_inv_wear_suit()
|
||||
|
||||
/mob/living/carbon/proc/get_body_parts_flags()
|
||||
for(var/X in bodyparts)
|
||||
var/obj/item/bodypart/L = X
|
||||
switch(L.body_part)
|
||||
if(CHEST)
|
||||
. |= GROIN
|
||||
if(LEG_LEFT)
|
||||
. |= FOOT_LEFT
|
||||
if(LEG_RIGHT)
|
||||
. |= FOOT_RIGHT
|
||||
if(ARM_LEFT)
|
||||
. |= HAND_LEFT
|
||||
if(ARM_RIGHT)
|
||||
. |= HAND_RIGHT
|
||||
. |= L.body_part
|
||||
Reference in New Issue
Block a user