Merge pull request #10329 from Ghommie/Ghommie-cit490
Ports reagents id removal and typepath usage.
This commit is contained in:
@@ -81,7 +81,7 @@
|
||||
/obj/item/reagent_containers/food/snacks/clothing
|
||||
name = "oops"
|
||||
desc = "If you're reading this it means I messed up. This is related to moths eating clothes and I didn't know a better way to do it than making a new food object."
|
||||
list_reagents = list("nutriment" = 1)
|
||||
list_reagents = list(/datum/reagent/consumable/nutriment = 1)
|
||||
tastes = list("dust" = 1, "lint" = 1)
|
||||
|
||||
/obj/item/clothing/attack(mob/M, mob/user, def_zone)
|
||||
|
||||
@@ -26,7 +26,7 @@
|
||||
/obj/item/clothing/glasses/phantomthief/syndicate/proc/injectadrenaline(mob/user, combatmodestate)
|
||||
if(istype(user) && combatmodestate && world.time >= nextadrenalinepop)
|
||||
nextadrenalinepop = world.time + 5 MINUTES
|
||||
user.reagents.add_reagent("syndicateadrenals", 5)
|
||||
user.reagents.add_reagent(/datum/reagent/syndicateadrenals, 5)
|
||||
user.playsound_local(user, 'sound/misc/adrenalinject.ogg', 100, 0, pressure_affected = FALSE)
|
||||
|
||||
/obj/item/clothing/glasses/phantomthief/syndicate/equipped(mob/user, slot)
|
||||
|
||||
@@ -53,7 +53,7 @@
|
||||
return
|
||||
|
||||
var/obj/item/reagent_containers/glass/bucket/bucket = H.get_item_for_held_index(1)
|
||||
bucket.reagents.add_reagent("water",70)
|
||||
bucket.reagents.add_reagent(/datum/reagent/water,70)
|
||||
|
||||
/datum/outfit/laser_tag
|
||||
name = "Laser Tag Red"
|
||||
|
||||
Reference in New Issue
Block a user