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
@@ -57,7 +57,7 @@
/obj/effect/decal/cleanable/blood/gibs/Initialize(mapload, list/datum/disease/diseases)
. = ..()
reagents.add_reagent("liquidgibs", 5)
reagents.add_reagent(/datum/reagent/liquidgibs, 5)
if(already_rotting)
start_rotting(rename=FALSE)
else
@@ -13,7 +13,7 @@
/obj/effect/decal/cleanable/ash/Initialize()
. = ..()
reagents.add_reagent("ash", 30)
reagents.add_reagent(/datum/reagent/ash, 30)
pixel_x = rand(-5, 5)
pixel_y = rand(-5, 5)
@@ -27,7 +27,7 @@
/obj/effect/decal/cleanable/ash/large/Initialize()
. = ..()
reagents.add_reagent("ash", 30) //double the amount of ash.
reagents.add_reagent(/datum/reagent/ash, 30) //double the amount of ash.
/obj/effect/decal/cleanable/glass
name = "tiny shards"
@@ -84,7 +84,7 @@
/obj/effect/decal/cleanable/greenglow/filled/Initialize()
. = ..()
reagents.add_reagent(pick("uranium", "radium"), 5)
reagents.add_reagent(pick(/datum/reagent/uranium, /datum/reagent/uranium/radium), 5)
/obj/effect/decal/cleanable/cobweb
name = "cobweb"
@@ -132,7 +132,7 @@
var/datum/reagent/consumable/nutri_check = R
if(nutri_check.nutriment_factor >0)
H.adjust_nutrition(nutri_check.nutriment_factor * nutri_check.volume)
reagents.remove_reagent(nutri_check.id,nutri_check.volume)
reagents.remove_reagent(nutri_check.type,nutri_check.volume)
reagents.trans_to(H, reagents.total_volume, transfered_by = user)
qdel(src)
@@ -52,7 +52,7 @@
/obj/effect/decal/cleanable/oil/Initialize()
. = ..()
reagents.add_reagent("oil", 30)
reagents.add_reagent(/datum/reagent/oil, 30)
/obj/effect/decal/cleanable/oil/attackby(obj/item/I, mob/living/user)
var/attacked_by_hot_thing = I.is_hot()
@@ -54,7 +54,7 @@
var/obj/effect/decal/cleanable/plasma/P = (locate(/obj/effect/decal/cleanable/plasma) in get_turf(src))
if(!P)
P = new(loc)
P.reagents.add_reagent("stable_plasma", absorbed_plasma)
P.reagents.add_reagent(/datum/reagent/stable_plasma, absorbed_plasma)
flick("[icon_state]-disolve", src)
QDEL_IN(src, 5)
+1 -1
View File
@@ -136,7 +136,7 @@
victim.put_in_hands(chainsaw, forced = TRUE)
chainsaw.attack_self(victim)
chainsaw.wield(victim)
victim.reagents.add_reagent("adminordrazine",25)
victim.reagents.add_reagent(/datum/reagent/medicine/adminordrazine,25)
to_chat(victim, "<span class='warning'>KILL, KILL, KILL! YOU HAVE NO ALLIES ANYMORE, KILL THEM ALL!</span>")
victim.client.color = pure_red
+1 -1
View File
@@ -41,7 +41,7 @@
layer = FLY_LAYER
/obj/effect/supplypod_selector
icon_state = "supplypod_selector"
icon_state = "supplypod_selector"
layer = FLY_LAYER
//Makes a tile fully lit no matter what
+1 -1
View File
@@ -55,7 +55,7 @@
var/amount_grown = 0
var/player_spiders = 0
var/directive = "" //Message from the mother
var/poison_type = "toxin"
var/poison_type = /datum/reagent/toxin
var/poison_per_bite = 5
var/list/faction = list("spiders")