cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-22 19:47:22 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix pill and patch activate in-hand (#28767)

Browse Source
This commit is contained in:
warriorstar-orion
2025-03-22 07:19:23 +00:00
committed by GitHub
parent 2429fa5674
commit 1c8dc2b5aa
3 changed files with 15 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/reagents/reagent_containers/patch.dm
+6
View File
@@ -16,6 +16,12 @@
apply(target, user)
return ITEM_INTERACT_COMPLETE
/obj/item/reagent_containers/patch/activate_self(mob/user)
if(..())
return FINISH_ATTACK
apply(user, user)
/obj/item/reagent_containers/patch/proc/apply(mob/living/carbon/C, mob/user)
if(!istype(C))
return
code/modules/reagents/reagent_containers/pill.dm
+6
View File
@@ -18,6 +18,12 @@
if(!icon_state)
icon_state = "pill[rand(1, 20)]"
/obj/item/reagent_containers/pill/activate_self(mob/user)
if(..())
return FINISH_ATTACK
apply(user, user)
/obj/item/reagent_containers/pill/proc/apply(mob/living/carbon/C, mob/user)
if(!istype(C))
return FALSE
code/tests/attack_chain/test_attack_chain_reagent_containers.dm
+3
View File
@@ -204,6 +204,9 @@
pill = player.spawn_obj_in_hand(/obj/item/reagent_containers/pill/salicylic)
player.click_on(beaker)
TEST_ASSERT_LAST_CHATLOG(player, "You dissolve [pill] in [beaker].")
pill = player.spawn_obj_in_hand(/obj/item/reagent_containers/pill/salicylic)
player.use_item_in_hand()
TEST_ASSERT_LAST_CHATLOG(player, "You swallow [pill].")
// Patches
var/obj/item/reagent_containers/patch/patch = player.spawn_obj_in_hand(/obj/item/reagent_containers/patch/silver_sulf)