cyberpresidentvanellope/Polaris
1
0
Fork 0
mirror of https://github.com/PolarisSS13/Polaris.git synced 2026-07-20 04:32:50 +01:00
Code Issues Packages Projects Releases Wiki Activity

examine signature changed to include distance

Browse Source 
- distance is INFINITE, 0, or a positive integer based on get_dist() between
the examiner and examinee's turfs when they are on the same Z. When the
examiner is dead or a ghost, distance is always 0.
- also updates /examine( implementations to use it!
- adds w_class_to_name proc for reusing "It is a X item." examine behavior.
This commit is contained in:
Spookerton
2023-12-29 23:44:21 +00:00
parent e3393dc87b
commit 978f4511a5
240 changed files with 524 additions and 551 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/reagents/machinery/dispenser/cartridge.dm
+1 -1
View File
@@ -21,7 +21,7 @@
var/datum/reagent/R = SSchemistry.chemical_reagents[spawn_reagent]
setLabel(R.name)
/obj/item/reagent_containers/chem_disp_cartridge/examine(mob/user)
/obj/item/reagent_containers/chem_disp_cartridge/examine(mob/user, distance, infix, suffix)
. = ..()
. += "It has a capacity of [volume] units."
if(reagents.total_volume <= 0)
code/modules/reagents/machinery/dispenser/dispenser2.dm
+2 -2
View File
@@ -25,7 +25,7 @@
for(var/type in spawn_cartridges)
add_cartridge(new type(src))
/obj/machinery/chemical_dispenser/examine(mob/user)
/obj/machinery/chemical_dispenser/examine(mob/user, distance, infix, suffix)
. = ..()
. += "It has [cartridges.len] cartridges installed, and has space for [DISPENSER_MAX_CARTRIDGES - cartridges.len] more."
@@ -133,7 +133,7 @@
data["amount"] = amount
data["isBeakerLoaded"] = container ? 1 : 0
data["glass"] = accept_drinking
var/beakerContents[0]
if(container && container.reagents && container.reagents.reagent_list.len)
for(var/datum/reagent/R in container.reagents.reagent_list)
code/modules/reagents/machinery/dispenser/reagent_tank.dm
+5 -5
View File
@@ -39,9 +39,9 @@
. = ..()
/obj/structure/reagent_dispensers/examine(mob/user)
/obj/structure/reagent_dispensers/examine(mob/user, distance, infix, suffix)
. = ..()
if(get_dist(user, src) <= 2)
if(distance < 3)
. += "<span class='notice'>It contains:</span>"
if(reagents && reagents.reagent_list.len)
for(var/datum/reagent/R in reagents.reagent_list)
@@ -114,9 +114,9 @@
. = ..()
reagents.add_reagent("fuel",1000)
/obj/structure/reagent_dispensers/fueltank/examine(mob/user)
/obj/structure/reagent_dispensers/fueltank/examine(mob/user, distance, infix, suffix)
. = ..()
if(get_dist(user, src) <= 2)
if(distance < 3)
if(modded)
. += "<span class='warning'>Fuel faucet is wrenched open, leaking the fuel!</span>"
if(rig)
@@ -248,7 +248,7 @@
reagents.add_reagent("water",120)
update_icon()
/obj/structure/reagent_dispensers/water_cooler/examine(mob/user)
/obj/structure/reagent_dispensers/water_cooler/examine(mob/user, distance, infix, suffix)
. = ..()
if(cupholder)
. += "<span class='notice'>There are [cups] cups in the cup dispenser.</span>"
code/modules/reagents/machinery/distillery.dm
+2 -2
View File
@@ -101,9 +101,9 @@
..()
/obj/machinery/portable_atmospherics/powered/reagent_distillery/examine(mob/user)
/obj/machinery/portable_atmospherics/powered/reagent_distillery/examine(mob/user, distance, infix, suffix)
. = ..()
if(get_dist(user, src) <= 2)
if(distance < 3)
. += "<span class='notice'>\The [src] is powered [on ? "on" : "off"].</span>"
. += "<span class='notice'>\The [src]'s gauges read:</span>"
code/modules/reagents/machinery/grinder.dm
+3 -3
View File
@@ -41,9 +41,9 @@
beaker = new /obj/item/reagent_containers/glass/beaker/large(src)
default_apply_parts()
/obj/machinery/reagentgrinder/examine(mob/user)
/obj/machinery/reagentgrinder/examine(mob/user, distance, infix, suffix)
. = ..()
if(!in_range(user, src) && !issilicon(user) && !isobserver(user))
if(distance > 1 && !issilicon(user) && !isobserver(user))
. += "<span class='warning'>You're too far away to examine [src]'s contents and display!</span>"
return
@@ -260,4 +260,4 @@
if(new_beaker)
beaker = new_beaker
update_icon()
return TRUE
return TRUE
code/modules/reagents/reagent_containers/borghypo.dm
+2 -2
View File
@@ -117,9 +117,9 @@
var/datum/reagent/R = SSchemistry.chemical_reagents[reagent_ids[mode]]
to_chat(usr, "<span class='notice'>Synthesizer is now producing '[R.name]'.</span>")
/obj/item/reagent_containers/borghypo/examine(mob/user)
/obj/item/reagent_containers/borghypo/examine(mob/user, distance, infix, suffix)
. = ..()
if(get_dist(user, src) <= 2)
if(distance < 3)
var/datum/reagent/R = SSchemistry.chemical_reagents[reagent_ids[mode]]
. += "<span class='notice'>It is currently producing [R.name] and has [reagent_volumes[reagent_ids[mode]]] out of [volume] units left.</span>"
code/modules/reagents/reagent_containers/dropper.dm
+2 -2
View File
@@ -14,9 +14,9 @@
drop_sound = 'sound/items/drop/glass.ogg'
pickup_sound = 'sound/items/pickup/glass.ogg'
/obj/item/reagent_containers/dropper/examine(var/mob/user)
/obj/item/reagent_containers/dropper/examine(mob/user, distance, infix, suffix)
. = ..()
if(get_dist(user, src) <= 2)
if(distance < 3)
if(reagents && reagents.reagent_list.len)
. += "<span class='notice'>It contains [reagents.total_volume] units of liquid.</span>"
else
code/modules/reagents/reagent_containers/glass.dm
+3 -3
View File
@@ -60,9 +60,9 @@
base_name = name
base_desc = desc
/obj/item/reagent_containers/glass/examine(var/mob/user)
/obj/item/reagent_containers/glass/examine(mob/user, distance, infix, suffix)
. = ..()
if(get_dist(user, src) <= 2)
if(distance < 3)
if(reagents && reagents.reagent_list.len)
. += "<span class='notice'>It contains [reagents.total_volume] units of liquid.</span>"
else
@@ -362,7 +362,7 @@
QDEL_NULL(holding)
return ..()
/obj/item/reagent_containers/glass/bucket/examine(mob/user)
/obj/item/reagent_containers/glass/bucket/examine(mob/user, distance, infix, suffix)
. = ..()
if(loc == user && holding)
. += "There is \a [holding] in \the [src]."
code/modules/reagents/reagent_containers/hypospray.dm
+1 -1
View File
@@ -167,7 +167,7 @@
else
icon_state = "[initial(icon_state)]0"
/obj/item/reagent_containers/hypospray/autoinjector/examine(mob/user)
/obj/item/reagent_containers/hypospray/autoinjector/examine(mob/user, distance, infix, suffix)
. = ..()
if(reagents && reagents.reagent_list.len)
. += "<span class='notice'>It is currently loaded.</span>"
code/modules/reagents/reagent_containers/spray.dm
+3 -3
View File
@@ -78,7 +78,7 @@
spray_size = next_in_list(spray_size, spray_sizes)
to_chat(user, "<span class='notice'>You adjusted the pressure nozzle. You'll now use [amount_per_transfer_from_this] units per spray.</span>")
/obj/item/reagent_containers/spray/examine(mob/user)
/obj/item/reagent_containers/spray/examine(mob/user, distance, infix, suffix)
. = ..()
if(loc == user)
. += "[round(reagents.total_volume)] units left."
@@ -132,9 +132,9 @@
. = ..()
reagents.add_reagent("condensedcapsaicin", volume)
/obj/item/reagent_containers/spray/pepper/examine(mob/user)
/obj/item/reagent_containers/spray/pepper/examine(mob/user, distance, infix, suffix)
. = ..()
if(Adjacent(user))
if(distance < 2)
. += "The safety is [safety ? "on" : "off"]."
/obj/item/reagent_containers/spray/pepper/attack_self(var/mob/user)