mirror of
https://github.com/CHOMPStation2/CHOMPStation2.git
synced 2025-12-10 10:12:45 +00:00
Merge pull request #7918 from VOREStation/Arokha/proteanshake
Add protean shakes
This commit is contained in:
@@ -819,7 +819,8 @@
|
|||||||
/obj/item/weapon/towel/random = 20)
|
/obj/item/weapon/towel/random = 20)
|
||||||
//VOREStation Edit End
|
//VOREStation Edit End
|
||||||
|
|
||||||
contraband = list(/obj/item/weapon/reagent_containers/syringe/steroid = 4)
|
contraband = list(/obj/item/weapon/reagent_containers/syringe/steroid = 4, /obj/item/weapon/reagent_containers/food/drinks/glass2/fitnessflask/proteanshake = 2) // VOREStation Add - Slurpable blobs.
|
||||||
|
|
||||||
|
|
||||||
/obj/machinery/vending/cart
|
/obj/machinery/vending/cart
|
||||||
name = "PTech"
|
name = "PTech"
|
||||||
|
|||||||
13
code/modules/food/drinkingglass/shaker_vr.dm
Normal file
13
code/modules/food/drinkingglass/shaker_vr.dm
Normal file
@@ -0,0 +1,13 @@
|
|||||||
|
/obj/item/weapon/reagent_containers/food/drinks/glass2/fitnessflask/proteanshake
|
||||||
|
name = "protean shake"
|
||||||
|
|
||||||
|
/obj/item/weapon/reagent_containers/food/drinks/glass2/fitnessflask/proteanshake/Initialize()
|
||||||
|
. = ..()
|
||||||
|
reagents.add_reagent("liquid_protean", 50)
|
||||||
|
reagents.add_reagent("nutriment", 50)
|
||||||
|
|
||||||
|
/obj/item/weapon/reagent_containers/food/drinks/glass2/fitnessflask/proteanshake/update_icon()
|
||||||
|
..()
|
||||||
|
// And now set half the stuff back because our name shouldn't change
|
||||||
|
name = initial(name)
|
||||||
|
desc = initial(desc)
|
||||||
@@ -98,3 +98,30 @@
|
|||||||
|
|
||||||
M.adjust_fire_stacks(-reac_volume)
|
M.adjust_fire_stacks(-reac_volume)
|
||||||
M.ExtinguishMob()
|
M.ExtinguishMob()
|
||||||
|
|
||||||
|
/datum/reagent/liquid_protean
|
||||||
|
name = "Liquid protean"
|
||||||
|
id = "liquid_protean"
|
||||||
|
description = "This seems to be a small portion of a Protean creature, still slightly wiggling."
|
||||||
|
taste_description = "wiggly peanutbutter"
|
||||||
|
reagent_state = LIQUID
|
||||||
|
color = "#1d1d1d"
|
||||||
|
scannable = 0
|
||||||
|
metabolism = REM * 0.5
|
||||||
|
|
||||||
|
/datum/reagent/liquid_protean/affect_blood(var/mob/living/carbon/M, var/alien, var/removed)
|
||||||
|
if(alien != IS_DIONA)
|
||||||
|
var/chem_effective = 1
|
||||||
|
if(alien == IS_SLIME)
|
||||||
|
chem_effective = 0.5
|
||||||
|
M.adjustOxyLoss(-1 * removed * chem_effective)
|
||||||
|
M.heal_organ_damage(0.5 * removed, 0.5 * removed * chem_effective)
|
||||||
|
M.adjustToxLoss(-0.5 * removed * chem_effective)
|
||||||
|
|
||||||
|
if(ishuman(M))
|
||||||
|
var/mob/living/carbon/human/H = M
|
||||||
|
if(H.nif)
|
||||||
|
var/obj/item/device/nif/nif = H.nif //L o c a l
|
||||||
|
if(nif.stat == NIF_TEMPFAIL)
|
||||||
|
nif.stat = NIF_INSTALLING
|
||||||
|
nif.durability = min(nif.durability + removed*0.1, initial(nif.durability))
|
||||||
|
|||||||
@@ -2051,6 +2051,7 @@
|
|||||||
#include "code\modules\food\drinkingglass\metaglass.dm"
|
#include "code\modules\food\drinkingglass\metaglass.dm"
|
||||||
#include "code\modules\food\drinkingglass\serving_glasses.dm"
|
#include "code\modules\food\drinkingglass\serving_glasses.dm"
|
||||||
#include "code\modules\food\drinkingglass\shaker.dm"
|
#include "code\modules\food\drinkingglass\shaker.dm"
|
||||||
|
#include "code\modules\food\drinkingglass\shaker_vr.dm"
|
||||||
#include "code\modules\food\food\cans.dm"
|
#include "code\modules\food\food\cans.dm"
|
||||||
#include "code\modules\food\food\condiment.dm"
|
#include "code\modules\food\food\condiment.dm"
|
||||||
#include "code\modules\food\food\drinks.dm"
|
#include "code\modules\food\food\drinks.dm"
|
||||||
|
|||||||
Reference in New Issue
Block a user