mirror of
https://github.com/VOREStation/VOREStation.git
synced 2026-07-20 03:26:37 +01:00
bunch of fixes
This commit is contained in:
@@ -115,7 +115,7 @@
|
||||
if(M == user)
|
||||
to_chat(user, "You take a bite of the crayon and swallow it.")
|
||||
user.nutrition += 1
|
||||
user.reagents.add_reagent("crayon_dust",min(5,uses)/3)
|
||||
user.reagents.add_reagent(REAGENT_ID_CRAYONDUST,min(5,uses)/3)
|
||||
if(uses)
|
||||
uses -= 5
|
||||
if(uses <= 0)
|
||||
@@ -201,7 +201,7 @@
|
||||
if(M == user)
|
||||
to_chat(user, "You take a bite of the marker and swallow it.")
|
||||
user.nutrition += 1
|
||||
user.reagents.add_reagent("marker_ink",6)
|
||||
user.reagents.add_reagent(REAGENT_ID_MARKERINK,6)
|
||||
if(uses)
|
||||
uses -= 5
|
||||
if(uses <= 0)
|
||||
|
||||
@@ -14,16 +14,16 @@
|
||||
|
||||
//Predefined materials go here.
|
||||
/obj/item/material/twohanded/baseballbat/metal/New(var/newloc)
|
||||
..(newloc,"steel")
|
||||
..(newloc,MAT_STEEL)
|
||||
|
||||
/obj/item/material/twohanded/baseballbat/uranium/New(var/newloc)
|
||||
..(newloc,"uranium")
|
||||
..(newloc,MAT_URANIUM)
|
||||
|
||||
/obj/item/material/twohanded/baseballbat/gold/New(var/newloc)
|
||||
..(newloc,"gold")
|
||||
..(newloc,MAT_GOLD)
|
||||
|
||||
/obj/item/material/twohanded/baseballbat/platinum/New(var/newloc)
|
||||
..(newloc,"platinum")
|
||||
..(newloc,MAT_PLATINUM)
|
||||
|
||||
/obj/item/material/twohanded/baseballbat/diamond/New(var/newloc)
|
||||
..(newloc,"diamond")
|
||||
..(newloc,MAT_DIAMOND)
|
||||
|
||||
@@ -29,7 +29,7 @@ var/global/list/cached_icons = list()
|
||||
/obj/item/reagent_containers/glass/paint/Initialize()
|
||||
.=..()
|
||||
if(paint_type)
|
||||
reagents.add_reagent("paint", volume, paint_type)
|
||||
reagents.add_reagent(REAGENT_ID_PAINT, volume, paint_type)
|
||||
|
||||
/obj/item/reagent_containers/glass/paint/red
|
||||
icon_state = "paint_red"
|
||||
|
||||
Reference in New Issue
Block a user