Converts more attackby's to interactions (#93106)

## About The Pull Request
Converts the following:
- Medical Kiosk
- Implant case
- Flamethrower
- Chemical implant case
- Pappercutter

Also I've looked at some alt click procs and adjusted some of their
returns
This commit is contained in:
Xander3359
2025-10-12 22:40:42 -05:00
committed by GitHub
parent bae633bb56
commit bbe729aef7
20 changed files with 136 additions and 140 deletions
+20 -18
View File
@@ -104,16 +104,16 @@
/obj/item/papercutter/screwdriver_act(mob/living/user, obj/item/tool)
if(!stored_blade && !blade_secured)
balloon_alert(user, "no blade!")
return
return ITEM_INTERACT_BLOCKING
tool.play_tool_sound(src)
balloon_alert(user, "[blade_secured ? "un" : ""]secured")
blade_secured = !blade_secured
return ITEM_INTERACT_SUCCESS
/obj/item/papercutter/attackby(obj/item/inserted_item, mob/user, list/modifiers, list/attack_modifiers)
if(istype(inserted_item, /obj/item/paper))
if(is_type_in_list(inserted_item, list(
/obj/item/papercutter/item_interaction(mob/living/user, obj/item/tool, list/modifiers)
if(istype(tool, /obj/item/paper))
if(is_type_in_list(tool, list(
/obj/item/paper/fake_report,
/obj/item/paper/holy_writ,
/obj/item/paper/pamphlet,
@@ -121,29 +121,31 @@
/obj/item/paper/report,
)))
balloon_alert(user, "won't fit!")
return
return ITEM_INTERACT_BLOCKING
if(stored_paper)
balloon_alert(user, "already paper inside!")
return
if(!user.transferItemToLoc(inserted_item, src))
return
return ITEM_INTERACT_BLOCKING
if(!user.transferItemToLoc(tool, src))
return ITEM_INTERACT_BLOCKING
playsound(loc, SFX_PAGE_TURN, 60, TRUE)
balloon_alert(user, "paper inserted")
stored_paper = inserted_item
stored_paper = tool
update_appearance()
return ITEM_INTERACT_SUCCESS
if(istype(inserted_item, /obj/item/hatchet/cutterblade))
if(istype(tool, /obj/item/hatchet/cutterblade))
if(stored_blade)
balloon_alert(user, "already a blade inside!")
return
if(!user.transferItemToLoc(inserted_item, src))
return
return ITEM_INTERACT_BLOCKING
if(!user.transferItemToLoc(tool, src))
return ITEM_INTERACT_BLOCKING
balloon_alert(user, "blade inserted")
inserted_item.forceMove(src)
stored_blade = inserted_item
tool.forceMove(src)
stored_blade = tool
update_appearance()
return ITEM_INTERACT_SUCCESS
update_appearance()
return ..()
return NONE
/obj/item/papercutter/click_alt(mob/user)
// can only remove one at a time; paper goes first, as its most likely what players will want to be taking out