cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-08-24 05:23:22 +01:00
Code Issues Packages Projects Releases Wiki Activity

Converts Reagents to Typepaths and Centralises Reagent Spawning (#9140)

Browse Source 
Converts reagents to use typepaths instead of IDs.
    Centralises reagent spawning in a lot of places to use reagents_to_add instead of a variety of custom methods or initialise overrides.
This commit is contained in:
MarinaGryphon
2020-07-05 20:47:48 +03:00
committed by GitHub
parent 0867971810
commit 37c80988ce
177 changed files with 3151 additions and 4767 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/structures/crates_lockers/closets/secure/freezer.dm
+1 -1
View File
@@ -20,7 +20,7 @@
for(var/i = 0, i < 2, i++)
new /obj/item/reagent_containers/food/condiment/flour(src)
new /obj/item/reagent_containers/food/condiment/sugar(src)
new /obj/item/reagent_containers/food/condiment/spacespice(src)
new /obj/item/reagent_containers/food/condiment/shaker/spacespice(src)
/obj/structure/closet/secure_closet/freezer/kitchen/mining
req_access = list()
code/game/objects/structures/watercloset.dm
+5 -5
View File
@@ -233,7 +233,7 @@
var/obj/effect/effect/water/W = new(O)
W.create_reagents(spray_amount)
W.reagents.add_reagent("water", spray_amount)
W.reagents.add_reagent(/datum/reagent/water, spray_amount)
W.set_up(O, spray_amount)
if(iscarbon(O))
@@ -362,7 +362,7 @@
return
is_washing = 1
var/turf/T = get_turf(src)
reagents.add_reagent("water", 2)
reagents.add_reagent(/datum/reagent/water, 2)
T.clean(src)
spawn(100)
is_washing = 0
@@ -466,7 +466,7 @@
to_chat(usr, span("warning", "\The [RG] is already full."))
return
RG.reagents.add_reagent("water", min(RG.volume - RG.reagents.total_volume, amount_per_transfer_from_this))
RG.reagents.add_reagent(/datum/reagent/water, min(RG.volume - RG.reagents.total_volume, amount_per_transfer_from_this))
user.visible_message("<b>[user]</b> fills \a [RG] using \the [src].",
SPAN_NOTICE("You fill \a [RG] using \the [src]."))
playsound(loc, 'sound/effects/sink.ogg', 75, 1)
@@ -491,7 +491,7 @@
return
var/trans = min(S.volume - S.reagents.total_volume, S.amount_per_transfer_from_this)
S.reagents.add_reagent("water", trans)
S.reagents.add_reagent(/datum/reagent/water, trans)
user.visible_message(span("notice", "[usr] uses \the [S] to draw water from \the [src]."),
span("notice", "You draw [trans] units of water from \the [src]. \The [S] now contains [S.reagents.total_volume] units."))
if(1) // inject
@@ -524,7 +524,7 @@
else if(istype(O, /obj/item/reagent_containers/food/snacks/monkeycube))
return
else if(istype(O, /obj/item/mop))
O.reagents.add_reagent("water", 5)
O.reagents.add_reagent(/datum/reagent/water, 5)
to_chat(user, span("notice", "You wet \the [O] in \the [src]."))
playsound(loc, 'sound/effects/slosh.ogg', 25, 1)
return