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] Legcuffs on Aliens Work as Intended #1871

Merged
merged 1 commit into from
Feb 9, 2024
Merged

[MIRROR] Legcuffs on Aliens Work as Intended #1871

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 8 additions & 0 deletions code/modules/mob/living/carbon/carbon_update_icons.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -416,6 +416,14 @@
*/
//NOVA EDIT REMOVAL END

/mob/living/carbon/update_worn_legcuffs()
remove_overlay(LEGCUFF_LAYER)
clear_alert("legcuffed")
if(legcuffed)
overlays_standing[LEGCUFF_LAYER] = mutable_appearance('icons/mob/simple/mob.dmi', "legcuff1", -LEGCUFF_LAYER)
apply_overlay(LEGCUFF_LAYER)
throw_alert("legcuffed", /atom/movable/screen/alert/restrained/legcuffed, new_master = src.legcuffed)

//NOVA EDIT REMOVAL BEGIN - CUSTOMIZATION (moved to modular)
/*
/mob/living/carbon/update_worn_head()
Expand Down
8 changes: 0 additions & 8 deletions code/modules/mob/living/carbon/human/human_update_icons.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -654,14 +654,6 @@ There are several things that need to be remembered:
overlays_standing[BACK_LAYER] = back_overlay
apply_overlay(BACK_LAYER)

/mob/living/carbon/human/update_worn_legcuffs()
remove_overlay(LEGCUFF_LAYER)
clear_alert("legcuffed")
if(legcuffed)
overlays_standing[LEGCUFF_LAYER] = mutable_appearance('icons/mob/simple/mob.dmi', "legcuff1", -LEGCUFF_LAYER)
apply_overlay(LEGCUFF_LAYER)
throw_alert("legcuffed", /atom/movable/screen/alert/restrained/legcuffed, new_master = src.legcuffed)

/mob/living/carbon/human/get_held_overlays()
var/list/hands = list()
for(var/obj/item/worn_item in held_items)
Expand Down
2 changes: 1 addition & 1 deletion code/modules/mob/living/carbon/human/inventory.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -237,7 +237,7 @@

/mob/living/carbon/human/equipped_speed_mods()
. = ..()
for(var/sloties in get_all_worn_items() - list(l_store, r_store, s_store))
for(var/sloties in get_all_worn_items() - list(l_store, r_store, s_store, back, wear_mask, wear_neck, head, handcuffed, legcuffed))
var/obj/item/thing = sloties
. += thing?.slowdown

Expand Down
6 changes: 6 additions & 0 deletions code/modules/mob/living/carbon/inventory.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,6 +128,12 @@

return not_handled

/mob/living/carbon/equipped_speed_mods()
. = ..()
for(var/sloties in get_all_worn_items())
var/obj/item/thing = sloties
. += thing?.slowdown

/// This proc is called after an item has been successfully handled and equipped to a slot.
/mob/living/carbon/proc/has_equipped(obj/item/item, slot, initial = FALSE)
return item.on_equipped(src, slot, initial)
Expand Down
Loading