Merge branch 'bleeding-edge-freeze' into vials

code/modules/reagents/reagent_containers/borghydro.dm

@@ -1,5 +1,4 @@
 
-
 /obj/item/weapon/reagent_containers/borghypo
 	name = "Cyborg Hypospray"
 	desc = "An advanced chemical synthesizer and injection system, designed for heavy-duty medical equipment."
@@ -16,7 +15,7 @@
 	var/recharge_time = 5 //Time it takes for shots to recharge (in seconds)
 
 	var/list/datum/reagents/reagent_list = list()
-	var/list/reagent_ids = list("doctorsdelight", "inaprovaline", "spaceacillin")
+	var/list/reagent_ids = list("tricordrazine", "inaprovaline", "spaceacillin")
 	//var/list/reagent_ids = list("dexalin", "kelotane", "bicaridine", "anti_toxin", "inaprovaline", "spaceacillin")
 
 /obj/item/weapon/reagent_containers/borghypo/New()
@@ -105,4 +104,4 @@
 			empty = 0
 
 	if(empty)
-		usr << "\blue It is currently empty. Allow some time for the internal syntheszier to produce more."
+		usr << "\blue It is currently empty. Allow some time for the internal syntheszier to produce more."

code/modules/reagents/reagent_containers/food/snacks.dm

@@ -1367,6 +1367,126 @@
 	icon_state = "monkeycubewrap"
 	wrapped = 1
 
+/obj/item/weapon/reagent_containers/food/snacks/farwacube
+	name = "farwa cube"
+	desc = "Just add water!"
+	icon_state = "monkeycube"
+	bitesize = 12
+	var/wrapped = 0
+
+	New()
+		..()
+		reagents.add_reagent("nutriment",10)
+
+	afterattack(obj/O as obj, mob/user as mob)
+		if(istype(O,/obj/structure/sink) && !wrapped)
+			user << "You place [name] under a stream of water..."
+			loc = get_turf(O)
+			return Expand()
+		..()
+
+	attack_self(mob/user as mob)
+		if(wrapped)
+			Unwrap(user)
+
+	proc/Expand()
+		for(var/mob/M in viewers(src,7))
+			M << "\red The farwa cube expands!"
+		new /mob/living/carbon/monkey/tajara(get_turf(src))
+		del(src)
+
+	proc/Unwrap(mob/user as mob)
+		icon_state = "monkeycube"
+		desc = "Just add water!"
+		user << "You unwrap the cube."
+		wrapped = 0
+		return
+
+/obj/item/weapon/reagent_containers/food/snacks/stokcube
+	name = "stok cube"
+	desc = "Just add water!"
+	icon_state = "monkeycube"
+	bitesize = 12
+	var/wrapped = 0
+
+	New()
+		..()
+		reagents.add_reagent("nutriment",10)
+
+	afterattack(obj/O as obj, mob/user as mob)
+		if(istype(O,/obj/structure/sink) && !wrapped)
+			user << "You place [name] under a stream of water..."
+			loc = get_turf(O)
+			return Expand()
+		..()
+
+	attack_self(mob/user as mob)
+		if(wrapped)
+			Unwrap(user)
+
+	proc/Expand()
+		for(var/mob/M in viewers(src,7))
+			M << "\red The stok cube expands!"
+		new /mob/living/carbon/monkey/unathi(get_turf(src))
+		del(src)
+
+	proc/Unwrap(mob/user as mob)
+		icon_state = "monkeycube"
+		desc = "Just add water!"
+		user << "You unwrap the cube."
+		wrapped = 0
+		return
+/obj/item/weapon/reagent_containers/food/snacks/neaeracube
+	name = "neaera cube"
+	desc = "Just add water!"
+	icon_state = "monkeycube"
+	bitesize = 12
+	var/wrapped = 0
+
+	New()
+		..()
+		reagents.add_reagent("nutriment",10)
+
+	afterattack(obj/O as obj, mob/user as mob)
+		if(istype(O,/obj/structure/sink) && !wrapped)
+			user << "You place [name] under a stream of water..."
+			loc = get_turf(O)
+			return Expand()
+		..()
+
+	attack_self(mob/user as mob)
+		if(wrapped)
+			Unwrap(user)
+
+	proc/Expand()
+		for(var/mob/M in viewers(src,7))
+			M << "\red The neaera cube expands!"
+		new /mob/living/carbon/monkey/skrell(get_turf(src))
+		del(src)
+
+	proc/Unwrap(mob/user as mob)
+		icon_state = "monkeycube"
+		desc = "Just add water!"
+		user << "You unwrap the cube."
+		wrapped = 0
+		return
+
+/obj/item/weapon/reagent_containers/food/snacks/neaeracube/wrapped
+	desc = "Still wrapped in some paper."
+	icon_state = "monkeycubewrap"
+	wrapped = 1
+/obj/item/weapon/reagent_containers/food/snacks/stokcube/wrapped
+	desc = "Still wrapped in some paper."
+	icon_state = "monkeycubewrap"
+	wrapped = 1
+
+
+/obj/item/weapon/reagent_containers/food/snacks/farwacube/wrapped
+	desc = "Still wrapped in some paper."
+	icon_state = "monkeycubewrap"
+	wrapped = 1
+
+
 
 /obj/item/weapon/reagent_containers/food/snacks/spellburger
 	name = "Spell Burger"