Remove reagent ids and use typepaths where applicable (#44166)

cl Naksu
code: reagent IDs have been removed in favor using reagent typepaths where applicable
fix: mechas, borg hyposprays etc no longer display internal reagent ids to the player
/cl
This commit is contained in:
vuonojenmustaturska
2019-05-31 21:57:26 +12:00
committed by oranges
parent c0ac2ca6b8
commit 6a106bc877
311 changed files with 3007 additions and 3475 deletions
+1 -1
View File
@@ -39,7 +39,7 @@
return
last_process = world.time
to_chat(user, "<span class='notice'>The water feels warm and soothing as you touch it. The fountain immediately dries up shortly afterwards.</span>")
user.reagents.add_reagent("godblood",20)
user.reagents.add_reagent(/datum/reagent/medicine/omnizine/godblood,20)
update_icon()
addtimer(CALLBACK(src, .proc/update_icon), time_between_uses)
+1 -1
View File
@@ -12,7 +12,7 @@
var/on = FALSE
var/current_temperature = SHOWER_NORMAL
var/datum/looping_sound/showering/soundloop
var/reagent_id = "water"
var/reagent_id = /datum/reagent/water
var/reaction_volume = 200
/obj/machinery/shower/Initialize()
+3 -3
View File
@@ -101,7 +101,7 @@
if (!open)
return
var/obj/item/reagent_containers/RG = I
RG.reagents.add_reagent("water", min(RG.volume - RG.reagents.total_volume, RG.amount_per_transfer_from_this))
RG.reagents.add_reagent(/datum/reagent/water, min(RG.volume - RG.reagents.total_volume, RG.amount_per_transfer_from_this))
to_chat(user, "<span class='notice'>You fill [RG] from [src]. Gross.</span>")
else
return ..()
@@ -199,7 +199,7 @@
icon = 'icons/obj/items_and_weapons.dmi'
icon_state = "urinalcake"
w_class = WEIGHT_CLASS_TINY
list_reagents = list("chlorine" = 3, "ammonia" = 1)
list_reagents = list(/datum/reagent/chlorine = 3, /datum/reagent/ammonia = 1)
foodtype = TOXIC | GROSS
/obj/item/reagent_containers/food/snacks/urinalcake/attack_self(mob/living/user)
@@ -222,7 +222,7 @@
desc = "A sink used for washing one's hands and face."
anchored = TRUE
var/busy = FALSE //Something's being washed at the moment
var/dispensedreagent = "water" // for whenever plumbing happens
var/dispensedreagent = /datum/reagent/water // for whenever plumbing happens
/obj/structure/sink/attack_hand(mob/living/user)
. = ..()