cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-10 10:12:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix protein shaker name

Browse Source
This commit is contained in:
Aronai Sieyes
2020-05-04 20:32:55 -04:00
parent e24410ccce
commit fa13c1089f
1 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
code/modules/food/drinkingglass/shaker.dm
View File

@@ -12,7 +12,7 @@
var/lid_color = "black" var/lid_color = "black"
/obj/item/weapon/reagent_containers/food/drinks/glass2/fitnessflask/Initialize() /obj/item/weapon/reagent_containers/food/drinks/glass2/fitnessflask/Initialize()
..() . = ..()
lid_color = pick("black", "red", "blue") lid_color = pick("black", "red", "blue")
update_icon() update_icon()
@@ -24,8 +24,14 @@
name = "protein shake" name = "protein shake"
/obj/item/weapon/reagent_containers/food/drinks/glass2/fitnessflask/proteinshake/Initialize() /obj/item/weapon/reagent_containers/food/drinks/glass2/fitnessflask/proteinshake/Initialize()
..() . = ..()
reagents.add_reagent("nutriment", 30) reagents.add_reagent("nutriment", 30)
reagents.add_reagent("iron", 10) reagents.add_reagent("iron", 10)
reagents.add_reagent("protein", 35) reagents.add_reagent("protein", 35)
reagents.add_reagent("water", 25) reagents.add_reagent("water", 25)
/obj/item/weapon/reagent_containers/food/drinks/glass2/fitnessflask/proteinshake/update_icon()
..()
// And now set half the stuff back because our name shouldn't change
name = initial(name)
desc = initial(desc)