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

Minor pill/patch application refactor (#23958)

Browse Source 
* Refactor pill/patch application

* I will come back to this
This commit is contained in:
Nathan Winters
2024-03-01 11:39:25 +00:00
committed by GitHub
parent 81fc020ce0
commit da34941fae
4 changed files with 75 additions and 107 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/reagents/reagent_containers/patch.dm
+25 -11
View File
@@ -12,22 +12,36 @@
var/instant_application = FALSE
var/needs_to_apply_reagents = TRUE
/obj/item/reagent_containers/patch/attack(mob/living/carbon/M, mob/user, def_zone)
return apply(M, user)
/obj/item/reagent_containers/patch/attack(mob/living/carbon/C, mob/user)
return apply(C, user)
/obj/item/reagent_containers/patch/attack_self(mob/user)
return apply(user, user)
/obj/item/reagent_containers/patch/proc/apply(mob/living/carbon/M, mob/user)
if(!istype(M))
/obj/item/reagent_containers/patch/proc/apply(mob/living/carbon/C, mob/user)
if(!istype(C))
return FALSE
if(M.eat(src, user))
if(user.get_active_hand() == src)
user.drop_item() // Only drop if they're holding the patch directly
forceMove(M)
LAZYADD(M.processing_patches, src)
return TRUE
return FALSE
if(ismachineperson(C))
to_chat(user, "<span class='warning'>[user == C ? "You" : C] can't use [src]!</span>")
return FALSE
if(user == C)
to_chat(user, "<span class='notice'>You apply [src].</span>")
else
if(!instant_application)
C.visible_message("<span class='warning'>[user] attempts to force [C] to apply [src].</span>")
if(!do_after(user, 3 SECONDS, TRUE, C, TRUE))
return FALSE
C.forceFedAttackLog(src, user)
C.visible_message("<span class='warning'>[user] forces [C] to apply [src].</span>")
if(user.get_active_hand() == src)
user.drop_item() // Only drop if they're holding the patch directly
forceMove(C)
LAZYADD(C.processing_patches, src)
return TRUE
/obj/item/reagent_containers/patch/styptic
name = "brute patch"
code/modules/reagents/reagent_containers/pill.dm
+27 -6
View File
@@ -18,16 +18,37 @@
if(!icon_state)
icon_state = "pill[rand(1, 20)]"
/obj/item/reagent_containers/pill/proc/apply(mob/living/carbon/M, mob/user, def_zone)
if(!istype(M))
/obj/item/reagent_containers/pill/proc/apply(mob/living/carbon/C, mob/user)
if(!istype(C))
return FALSE
if(M.eat(src, user))
if(!reagents.total_volume)
qdel(src)
return TRUE
return FALSE
/obj/item/reagent_containers/pill/attack(mob/living/carbon/M, mob/user, def_zone)
return apply(M, user)
if(ishuman(C))
var/mob/living/carbon/human/H = C
if(!H.check_has_mouth())
to_chat(user, "<span class='warning'>[user == H ? "You" : H] can't ingest [src]!</span>")
return FALSE
if(user == C)
to_chat(user, "<span class='notice'>You swallow [src].</span>")
else
C.visible_message("<span class='warning'>[user] attempts to force [C] to swallow [src].</span>")
if(!do_after(user, 3 SECONDS, TRUE, C, TRUE))
return FALSE
C.forceFedAttackLog(src, user)
C.visible_message("<span class='warning'>[user] forces [C] to swallow [src].</span>")
reagents.reaction(C, REAGENT_INGEST)
reagents.trans_to(C, reagents.total_volume)
qdel(src)
return TRUE
/obj/item/reagent_containers/pill/attack(mob/living/carbon/C, mob/user)
return apply(C, user)
/obj/item/reagent_containers/pill/attack_self(mob/user)
return apply(user, user)