cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-10 10:12:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

[MIRROR] forward refs in usr dialog (#10115)

Browse Source 
Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com>
This commit is contained in:
CHOMPStation2StaffMirrorBot
2025-02-08 16:06:42 -07:00
committed by GitHub
parent dd1e35202f
commit 90329c46d2
50 changed files with 229 additions and 202 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
code/modules/reagents/machinery/alembic.dm
View File

@@ -31,7 +31,7 @@
icon_state = "alembic-bubble"
return
/obj/machinery/alembic/attackby(var/obj/item/potion_material/O as obj, var/mob/user as mob)
/obj/machinery/alembic/attackby(var/obj/item/potion_material/O, var/mob/user)
if(istype(O,/obj/item/potion_material))
if(potion_reagent != 0 )
to_chat(user, span_warning("There is already a reagent in the alembic!"))
@@ -44,7 +44,7 @@
O.loc = src
update_icon()
to_chat(user, span_notice("You place the [O] in the alembic."))
src.updateUsrDialog()
src.updateUsrDialog(user)
return
else if(istype(O,/obj/item/potion_base))
if(base_reagent != 0 )
@@ -56,13 +56,13 @@
O.loc = src
update_icon()
to_chat(user, span_notice("You place the [O] in the alembic."))
src.updateUsrDialog()
src.updateUsrDialog(user)
return
else
to_chat(user, span_warning("This item is no use in the alembic."))
return
/obj/machinery/alembic/attack_hand(mob/user as mob)
/obj/machinery/alembic/attack_hand(mob/user)
if(potion_reagent == 0 || base_reagent == 0) //If there is nothing in there
to_chat(user, span_warning("The alembic is not yet full!"))

12
code/modules/reagents/machinery/grinder.dm
View File

@@ -105,7 +105,7 @@ var/global/list/ore_reagents = list( //have a number of reageents divisible by R
icon_state = "juicer"+num2text(!isnull(beaker))
return
/obj/machinery/reagentgrinder/attackby(var/obj/item/O as obj, var/mob/user as mob)
/obj/machinery/reagentgrinder/attackby(var/obj/item/O, var/mob/user)
if(beaker)
if(default_deconstruction_screwdriver(user, O))
return
@@ -124,11 +124,11 @@ var/global/list/ore_reagents = list( //have a number of reageents divisible by R
if (beaker)
return 1
else
src.beaker = O
beaker = O
user.drop_item()
O.loc = src
update_icon()
src.updateUsrDialog()
updateUsrDialog(user)
return 0
if(holdingitems && holdingitems.len >= limit)
@@ -159,7 +159,7 @@ var/global/list/ore_reagents = list( //have a number of reageents divisible by R
else
to_chat(user, "You fill \the [src] from \the [O].")
src.updateUsrDialog()
src.updateUsrDialog(user)
return 0
if(istype(O,/obj/item/gripper))
@@ -194,10 +194,10 @@ var/global/list/ore_reagents = list( //have a number of reageents divisible by R
return
replace_beaker(user)
/obj/machinery/reagentgrinder/attack_hand(mob/user as mob)
/obj/machinery/reagentgrinder/attack_hand(mob/user)
interact(user)
/obj/machinery/reagentgrinder/interact(mob/user as mob) // The microwave Menu //I am reasonably certain that this is not a microwave
/obj/machinery/reagentgrinder/interact(mob/user) // The microwave Menu //I am reasonably certain that this is not a microwave
if(inuse || user.incapacitated())
return

8
code/modules/reagents/machinery/injector_maker.dm
View File

@@ -52,7 +52,7 @@
return
/obj/machinery/injector_maker/attackby(var/obj/item/O as obj, var/mob/user as mob)
/obj/machinery/injector_maker/attackby(var/obj/item/O, var/mob/user)
if (istype(O, /obj/item/multitool))
return ..()
@@ -68,7 +68,7 @@
user.drop_item()
O.loc = src
update_icon()
src.updateUsrDialog()
src.updateUsrDialog(user)
return 0
@@ -144,10 +144,10 @@
for(var/datum/reagent/R in beaker.reagents.reagent_list)
. += span_notice("- [R.volume] units of [R.name].")
/obj/machinery/injector_maker/attack_hand(mob/user as mob)
/obj/machinery/injector_maker/attack_hand(mob/user)
interact(user)
/obj/machinery/injector_maker/interact(mob/user as mob)
/obj/machinery/injector_maker/interact(mob/user)
if(user.incapacitated() || !beaker)
return