[MIRROR] Ports soup, snacks, icecream, salads and meat to newfood (#1074)

* Ports soup, snacks, icecream, salads and meat to newfood (#54028)

Ports soup, snacks, icecream, salads and meat to newfood

* Ports soup, snacks, icecream, salads and meat to newfood

* Update true_changeling.dm

Co-authored-by: Qustinnus <Floydje123@hotmail.com>
Co-authored-by: Azarak <azarak10@gmail.com>
This commit is contained in:
SkyratBot
2020-09-30 14:37:15 +02:00
committed by GitHub
parent 0310559d95
commit ada67ac929
165 changed files with 2505 additions and 2805 deletions

View File

@@ -63,7 +63,7 @@
id = "mcube"
build_type = BIOGENERATOR
materials = list(/datum/material/biomass= 250)
build_path = /obj/item/reagent_containers/food/snacks/monkeycube
build_path = /obj/item/food/monkeycube
category = list("initial","Food")
/datum/design/ez_nut //easy nut :)

View File

@@ -599,9 +599,9 @@
O.extinguish() //All shamelessly copied from water's expose_obj, since I didn't seem to be able to get it here for some reason.
O.wash(CLEAN_TYPE_ACID)
// Monkey cube
if(istype(O, /obj/item/reagent_containers/food/snacks/monkeycube))
if(istype(O, /obj/item/food/monkeycube))
to_chat(owner, "<span class='warning'>[linked_extract] kept your hands wet! It makes [O] expand!</span>")
var/obj/item/reagent_containers/food/snacks/monkeycube/cube = O
var/obj/item/food/monkeycube/cube = O
cube.Expand()
// Dehydrated carp

View File

@@ -54,7 +54,7 @@ Industrial extracts:
/obj/item/slimecross/industrial/grey
colour = "grey"
effect_desc = "Produces monkey cubes."
itempath = /obj/item/reagent_containers/food/snacks/monkeycube
itempath = /obj/item/food/monkeycube
itemamount = 5
/obj/item/slimecross/industrial/orange

View File

@@ -20,14 +20,14 @@ Reproductive extracts:
return
if(istype(O, /obj/item/storage/bag/bio))
var/list/inserted = list()
SEND_SIGNAL(O, COMSIG_TRY_STORAGE_TAKE_TYPE, /obj/item/reagent_containers/food/snacks/monkeycube, src, 1, null, null, user, inserted)
SEND_SIGNAL(O, COMSIG_TRY_STORAGE_TAKE_TYPE, /obj/item/food/monkeycube, src, 1, null, null, user, inserted)
if(inserted.len)
var/obj/item/reagent_containers/food/snacks/monkeycube/M = inserted[1]
var/obj/item/food/monkeycube/M = inserted[1]
if(istype(M))
eat_cube(M, user)
else
to_chat(user, "<span class='warning'>There are no monkey cubes in the bio bag!</span>")
if(istype(O,/obj/item/reagent_containers/food/snacks/monkeycube))
if(istype(O,/obj/item/food/monkeycube))
eat_cube(O, user)
if(cubes_eaten >= 3)
var/cores = rand(1,4)

View File

@@ -143,7 +143,7 @@
..()
/obj/machinery/computer/camera_advanced/xenobio/attackby(obj/item/O, mob/user, params)
if(istype(O, /obj/item/reagent_containers/food/snacks/monkeycube))
if(istype(O, /obj/item/food/monkeycube))
monkeys++
to_chat(user, "<span class='notice'>You feed [O] to [src]. It now has [monkeys] monkey cubes stored.</span>")
qdel(O)
@@ -152,7 +152,7 @@
var/obj/item/storage/P = O
var/loaded = FALSE
for(var/obj/G in P.contents)
if(istype(G, /obj/item/reagent_containers/food/snacks/monkeycube))
if(istype(G, /obj/item/food/monkeycube))
loaded = TRUE
monkeys++
qdel(G)

View File

@@ -98,7 +98,7 @@
/obj/item/slime_extract/grey/activate(mob/living/carbon/human/user, datum/species/jelly/luminescent/species, activation_type)
switch(activation_type)
if(SLIME_ACTIVATE_MINOR)
var/obj/item/reagent_containers/food/snacks/monkeycube/M = new
var/obj/item/food/monkeycube/M = new
if(!user.put_in_active_hand(M))
M.forceMove(user.drop_location())
playsound(user, 'sound/effects/splat.ogg', 50, TRUE)