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] usr to user part two (#10015)

Browse Source 
Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com>
This commit is contained in:
CHOMPStation2StaffMirrorBot
2025-01-31 14:27:34 -07:00
committed by GitHub
parent 538c8e7187
commit a245b8687f
203 changed files with 974 additions and 993 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
code/modules/reagents/hoses/connector.dm
View File

@@ -13,7 +13,7 @@
if(LAZYLEN(available_sockets))
if(available_sockets.len == 1)
var/obj/item/hose_connector/AC = available_sockets[1]
var/choice = tgui_alert(usr, "Are you sure you want to disconnect [AC]?", "Confirm", list("Yes", "No"))
var/choice = tgui_alert(user, "Are you sure you want to disconnect [AC]?", "Confirm", list("Yes", "No"))
if(choice == "Yes" && Adjacent(user))
visible_message("[user] disconnects \the hose from \the [src].")
@@ -22,11 +22,11 @@
else
var/choice = tgui_input_list(usr, "Select a target hose connector.", "Socket Disconnect", available_sockets)
var/choice = tgui_input_list(user, "Select a target hose connector.", "Socket Disconnect", available_sockets)
if(choice)
var/obj/item/hose_connector/AC = choice
var/confirm = tgui_alert(usr, "Are you sure you want to disconnect [AC]?", "Confirm", list("Yes", "No"))
var/confirm = tgui_alert(user, "Are you sure you want to disconnect [AC]?", "Confirm", list("Yes", "No"))
if(confirm == "Yes" && Adjacent(user))
visible_message("[user] disconnects \the hose from \the [src].")
@@ -137,4 +137,4 @@
if(carrier && my_hose)
carrier.reagents.trans_to_holder(reagents, reagents.maximum_volume)
else if(reagents.total_volume && carrier && !my_hose)
reagents.trans_to_obj(carrier, reagents.maximum_volume)
reagents.trans_to_obj(carrier, reagents.maximum_volume)

2
code/modules/reagents/hoses/hose_connector.dm
View File

@@ -64,7 +64,7 @@
to_chat(user, span_notice("You connect one end of tubing to \the [AC]."))
else
var/choice = tgui_input_list(usr, "Select a target hose connector.", "Socket Selection", available_sockets)
var/choice = tgui_input_list(user, "Select a target hose connector.", "Socket Selection", available_sockets)
if(choice)
var/obj/item/hose_connector/CC = choice

6
code/modules/reagents/machinery/dispenser/cartridge.dm
View File

@@ -51,13 +51,13 @@
label = ""
name = initial(name)
/obj/item/reagent_containers/chem_disp_cartridge/attack_self()
/obj/item/reagent_containers/chem_disp_cartridge/attack_self(mob/user)
..()
if (is_open_container())
to_chat(usr, span_notice("You put the cap on \the [src]."))
to_chat(user, span_notice("You put the cap on \the [src]."))
flags ^= OPENCONTAINER
else
to_chat(usr, span_notice("You take the cap off \the [src]."))
to_chat(user, span_notice("You take the cap off \the [src]."))
flags |= OPENCONTAINER
/obj/item/reagent_containers/chem_disp_cartridge/afterattack(obj/target, mob/user , flag)

10
code/modules/reagents/machinery/dispenser/reagent_tank.dm
View File

@@ -207,12 +207,12 @@
if(rig)
. += span_notice("There is some kind of device rigged to the tank.")
/obj/structure/reagent_dispensers/fueltank/attack_hand()
/obj/structure/reagent_dispensers/fueltank/attack_hand(mob/user)
if (rig)
usr.visible_message("[usr] begins to detach [rig] from \the [src].", "You begin to detach [rig] from \the [src]")
if(do_after(usr, 20))
usr.visible_message(span_notice("[usr] detaches [rig] from \the [src]."), span_notice("You detach [rig] from \the [src]"))
rig.loc = get_turf(usr)
user.visible_message("[user] begins to detach [rig] from \the [src].", "You begin to detach [rig] from \the [src]")
if(do_after(user, 20))
user.visible_message(span_notice("[user] detaches [rig] from \the [src]."), span_notice("You detach [rig] from \the [src]"))
rig.loc = get_turf(user)
rig = null
overlays = new/list()

2
code/modules/reagents/machinery/distillery.dm
View File

@@ -204,7 +204,7 @@
OutputBeaker = null
if("adjust temp")
target_temp = tgui_input_number(usr, "Choose a target temperature.", "Temperature.", T20C, max_temp, min_temp, round_value = FALSE)
target_temp = tgui_input_number(user, "Choose a target temperature.", "Temperature.", T20C, max_temp, min_temp, round_value = FALSE)
update_icon()

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

@@ -227,7 +227,7 @@
update_icon()
/obj/machinery/injector_maker/proc/make_injector(var/size, var/amount, var/new_name, var/material, mob/user as mob)
/obj/machinery/injector_maker/proc/make_injector(var/size, var/amount, var/new_name, var/material, mob/user)
if(!beaker)
return
var/amount_per_injector = null
@@ -238,7 +238,7 @@
if("large injector")
amount_per_injector = CLAMP(beaker.reagents.total_volume / amount, 0, 15)
if((size == "small injector" && amount_per_injector < 5) || size == "large injector" && amount_per_injector < 15)
proceed = tgui_alert(usr, "Heads up! Less than max volume per injector!\n Making [amount] [size](s) filled with [amount_per_injector] total reagent volume each!","Proceed?",list("No","Yes"))
proceed = tgui_alert(user, "Heads up! Less than max volume per injector!\n Making [amount] [size](s) filled with [amount_per_injector] total reagent volume each!","Proceed?",list("No","Yes"))
if(!proceed || proceed == "No" || !amount_per_injector)
return
for(var/i, i < amount, i++)

10
code/modules/reagents/reagent_containers/glass.dm
View File

@@ -75,15 +75,15 @@
if(!is_open_container())
. += span_notice("Airtight lid seals it completely.")
/obj/item/reagent_containers/glass/attack_self()
/obj/item/reagent_containers/glass/attack_self(mob/user)
..()
if(is_open_container())
// to_chat(usr, span_notice("You put the lid on \the [src]."))
balloon_alert(usr, "Lid put on \the [src]")
// to_chat(user, span_notice("You put the lid on \the [src]."))
balloon_alert(user, "Lid put on \the [src]")
flags ^= OPENCONTAINER
else
// to_chat(usr, span_notice("You take the lid off \the [src]."))
balloon_alert(usr, "Lid removed off \the [src]") // CHOMPEdit - Changed to ballopn alert
// to_chat(user, span_notice("You take the lid off \the [src]."))
balloon_alert(user, "Lid removed off \the [src]") // CHOMPEdit - Changed to ballopn alert
flags |= OPENCONTAINER
update_icon()

20
code/modules/reagents/reagent_containers/spray.dm
View File

@@ -55,10 +55,10 @@
log_game("[key_name(user)] fired Space lube from \a [src].")
return
/obj/item/reagent_containers/spray/proc/Spray_at(atom/A as mob|obj, mob/user as mob, proximity)
/obj/item/reagent_containers/spray/proc/Spray_at(atom/A as mob|obj, mob/user, proximity)
playsound(src, 'sound/effects/spray2.ogg', 50, 1, -6)
if (A.density && proximity)
A.visible_message("[usr] sprays [A] with [src].")
A.visible_message("[user] sprays [A] with [src].")
reagents.splash(A, amount_per_transfer_from_this)
else
spawn(0)
@@ -143,12 +143,12 @@
/obj/item/reagent_containers/spray/pepper/attack_self(var/mob/user)
safety = !safety
// to_chat(usr, span_notice("You switch the safety [safety ? "on" : "off"]."))
balloon_alert(usr, "Safety [safety ? "on" : "off"].") // CHOMPEdit - Changed to balloon alert
// to_chat(user, span_notice("You switch the safety [safety ? "on" : "off"]."))
balloon_alert(user, "Safety [safety ? "on" : "off"].") // CHOMPEdit - Changed to balloon alert
/obj/item/reagent_containers/spray/pepper/Spray_at(atom/A as mob|obj)
/obj/item/reagent_containers/spray/pepper/Spray_at(atom/A as mob|obj, mob/user)
if(safety)
to_chat(usr, span_warning("The safety is on!"))
to_chat(user, span_warning("The safety is on!"))
return
. = ..()
@@ -183,7 +183,7 @@
volume = 600
origin_tech = list(TECH_COMBAT = 3, TECH_MATERIAL = 3, TECH_ENGINEERING = 3)
/obj/item/reagent_containers/spray/chemsprayer/Spray_at(atom/A as mob|obj)
/obj/item/reagent_containers/spray/chemsprayer/Spray_at(atom/A as mob|obj, mob/user)
playsound(src, 'sound/effects/spray3.ogg', rand(50,1), -6)
var/direction = get_dir(src, A)
var/turf/T = get_turf(A)
@@ -263,7 +263,7 @@
else
. = ..()
/obj/item/reagent_containers/spray/chemsprayer/hosed/Spray_at(atom/A as mob|obj)
/obj/item/reagent_containers/spray/chemsprayer/hosed/Spray_at(atom/A as mob|obj, mob/user)
update_icon()
var/direction = get_dir(src, A)
@@ -273,8 +273,8 @@
var/list/the_targets = list(T, T1, T2)
if(src.reagents.total_volume < 1)
// to_chat(usr, span_notice("\The [src] is empty."))
balloon_alert(usr, "\The [src] is empty.")
// to_chat(user, span_notice("\The [src] is empty."))
balloon_alert(user, "\The [src] is empty.")
return
if(!heavy_spray)