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

Adds a special do_after display for unequipping facehuggers. #723

Merged
merged 1 commit into from
Dec 2, 2024
Merged

Adds a special do_after display for unequipping facehuggers. #723

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
1 change: 1 addition & 0 deletions code/__DEFINES/progress_display.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,3 +39,4 @@
#define BUSY_ICON_BAR /image/progdisplay/bar
#define BUSY_ICON_UNSKILLED /image/progdisplay/unskilled
#define BUSY_ICON_ENERGY /image/progdisplay/energy
#define BUSY_ICON_FACEHUGGER /image/progdisplay/facehugger
5 changes: 4 additions & 1 deletion code/datums/elements/strippable.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -271,7 +271,10 @@

/// A utility function for `/datum/strippable_item`s to start unequipping an item from a mob.
/datum/strippable_item/proc/start_unequip_mob(obj/item/item, mob/source, mob/user, strip_delay)
if(!do_after(user, strip_delay || item.strip_delay, NONE, source, BUSY_ICON_FRIENDLY))
var/display_icon = BUSY_ICON_GENERIC
if(istype(item, /obj/item/clothing/mask/facehugger))
display_icon = BUSY_ICON_FACEHUGGER
if(!do_after(user, strip_delay || item.strip_delay, NONE, source, display_icon))
return FALSE
return TRUE

Expand Down
3 changes: 3 additions & 0 deletions code/datums/progressbar.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -260,3 +260,6 @@

/image/progdisplay/energy
icon_state = "busy_energy"

/image/progdisplay/facehugger
icon_state = "busy_facehugger"
2 changes: 1 addition & 1 deletion code/modules/mob/living/carbon/human/human_attackhand.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
return TRUE

if(istype(wear_mask, /obj/item/clothing/mask/facehugger) && H != src)
H.stripPanelUnequip(wear_mask, src, SLOT_WEAR_MASK)
H.stripPanelUnequip(wear_mask, src, SLOT_WEAR_MASK, BUSY_ICON_FACEHUGGER)
return TRUE

if(health >= get_crit_threshold())
Expand Down
20 changes: 10 additions & 10 deletions 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 @@ -535,20 +535,21 @@
else if(equipped_item == s_store)
. = SLOT_S_STORE

/mob/living/carbon/human/stripPanelUnequip(obj/item/I, mob/M, slot_to_process)
/mob/living/carbon/human/stripPanelUnequip(obj/item/I, mob/M, slot_to_process, display_icon = BUSY_ICON_HOSTILE)
if(!I.canStrip(M))
return
log_combat(src, M, "attempted to remove [key_name(I)] ([slot_to_process])")

M.visible_message(span_danger("[src] tries to remove [M]'s [I.name]."), \
span_userdanger("[src] tries to remove [M]'s [I.name]."), null, 5)
if(do_after(src, HUMAN_STRIP_DELAY, NONE, M, BUSY_ICON_HOSTILE))
if(Adjacent(M) && I && I == M.get_item_by_slot(slot_to_process))
M.dropItemToGround(I)
log_combat(src, M, "removed [key_name(I)] ([slot_to_process])")
if(isidcard(I))
message_admins("[ADMIN_TPMONTY(src)] took the [I] of [ADMIN_TPMONTY(M)].")

span_userdanger("[src] tries to remove [M]'s [I.name]."), null, 5)
if(!do_after(src, HUMAN_STRIP_DELAY, NONE, M, display_icon))
return
if(!Adjacent(M)|| !I || I != M.get_item_by_slot(slot_to_process))
return
M.dropItemToGround(I)
log_combat(src, M, "removed [key_name(I)] ([slot_to_process])")
if(isidcard(I))
message_admins("[ADMIN_TPMONTY(src)] took the [I] of [ADMIN_TPMONTY(M)].")

/mob/living/carbon/human/proc/equipOutfit(outfit, visualsOnly = FALSE, client/override_client)
var/datum/outfit/O = null
Expand All @@ -564,7 +565,6 @@

return O.equip(src, visualsOnly, override_client)


/mob/living/carbon/human/proc/delete_equipment(save_id = FALSE)
for(var/i in contents)
if(save_id && istype(i, /obj/item/card/id))
Expand Down
3 changes: 0 additions & 3 deletions code/modules/mob/living/silicon/silicon.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,9 +45,6 @@
/mob/living/silicon/put_in_r_hand(obj/item/I)
return

/mob/living/silicon/stripPanelUnequip(obj/item/I, mob/M, slot)
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

в чём прикол?

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Прок нигде кроме как для снятия хаггера не используется, можно в принципе и ревертнуть

return

/mob/living/silicon/med_hud_set_health()
return

Expand Down
Binary file modified icons/effects/progressicons.dmi
View file
Open in desktop
Binary file not shown.
Loading