Skip to content

Fixes #9043: Helmets are included in med challenge cleanup #11475

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

Open
Puckaboo2 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fixes #9043: Helmets are included in med challenge cleanup #11475

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
16 changes: 14 additions & 2 deletions code/datums/tutorial/marine/hospital_corpsman_sandbox.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -538,20 +538,32 @@
if(length(dragging_agents) || length(active_agents))
movement_handler()

/datum/tutorial/marine/hospital_corpsman_sandbox/proc/item_cleanup(obj/item/clothing/suit/storage/marine/medium/armor)
/datum/tutorial/marine/hospital_corpsman_sandbox/proc/item_cleanup(obj/item/clothing/suit/storage/marine/medium/armor, obj/item/clothing/head/helmet)
SIGNAL_HANDLER

if(!(armor in cleanup))
cleanup |= armor // marks item for removal once the dummy is ready
UnregisterSignal(armor, COMSIG_ITEM_UNEQUIPPED)
return
else
if(armor in cleanup)
cleanup -= armor
var/obj/item/storage/internal/armor_storage = locate(/obj/item/storage/internal) in armor
for(var/obj/item/item as anything in armor_storage)
armor_storage.remove_from_storage(item, get_turf(armor))
QDEL_IN(armor, 1 SECONDS)

if(!(helmet in cleanup))
cleanup |= helmet // marks item for removal once the dummy is ready
UnregisterSignal(armor, COMSIG_ITEM_UNEQUIPPED)
return

if(helmet in cleanup)
cleanup -= helmet
var/obj/item/storage/internal/helmet_storage = locate(/obj/item/storage/internal) in helmet
for(var/obj/item/item as anything in helmet_storage)
helmet_storage.remove_from_storage(item, get_turf(helmet))
QDEL_IN(armor, 1 SECONDS)

/datum/tutorial/marine/hospital_corpsman_sandbox/init_mob()
. = ..()
arm_equipment(tutorial_mob, /datum/equipment_preset/tutorial/fed)
Expand Down