cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-25 04:57:12 +01:00
Code Issues Packages Projects Releases Wiki Activity

Removes the empty type of /snacks (#26010)

Browse Source 
* Aaaaa it works

* Add updatepaths

* Add unsaved files

* MATTTTT

* Fixes casino

* Fix

---------

Signed-off-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
This commit is contained in:
DGamerL
2024-07-29 14:46:04 +00:00
committed by GitHub
parent 2e2569f1db
commit 098b13bb33
222 changed files with 3300 additions and 3347 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/research/designs/biogenerator_designs.dm
+6 -6
View File
@@ -56,7 +56,7 @@
id = "mcube"
build_type = BIOGENERATOR
materials = list(MAT_BIOMASS = 250)
build_path = /obj/item/food/snacks/monkeycube
build_path = /obj/item/food/monkeycube
category = list("initial", "Food")
/datum/design/farwa_cube
@@ -64,7 +64,7 @@
id = "fcube"
build_type = BIOGENERATOR
materials = list(MAT_BIOMASS = 250)
build_path = /obj/item/food/snacks/monkeycube/farwacube
build_path = /obj/item/food/monkeycube/farwacube
category = list("initial", "Food")
/datum/design/wolpin_cube
@@ -72,7 +72,7 @@
id = "wcube"
build_type = BIOGENERATOR
materials = list(MAT_BIOMASS = 250)
build_path = /obj/item/food/snacks/monkeycube/wolpincube
build_path = /obj/item/food/monkeycube/wolpincube
category = list("initial", "Food")
/datum/design/stok_cube
@@ -80,7 +80,7 @@
id = "scube"
build_type = BIOGENERATOR
materials = list(MAT_BIOMASS = 250)
build_path = /obj/item/food/snacks/monkeycube/stokcube
build_path = /obj/item/food/monkeycube/stokcube
category = list("initial", "Food")
/datum/design/neaera_cube
@@ -88,7 +88,7 @@
id = "ncube"
build_type = BIOGENERATOR
materials = list(MAT_BIOMASS = 250)
build_path = /obj/item/food/snacks/monkeycube/neaeracube
build_path = /obj/item/food/monkeycube/neaeracube
category = list("initial", "Food")
/datum/design/nian_wormecube
@@ -96,7 +96,7 @@
id = "nwcube"
build_type = BIOGENERATOR
materials = list(MAT_BIOMASS = 250)
build_path = /obj/item/food/snacks/monkeycube/nian_wormecube
build_path = /obj/item/food/monkeycube/nian_wormecube
category = list("initial", "Food")
/datum/design/ez_nut
code/modules/research/xenobiology/xenobio_camera.dm
+14 -14
View File
@@ -177,7 +177,7 @@
return ..()
/obj/machinery/computer/camera_advanced/xenobio/attackby(obj/item/O, mob/user, params)
if(istype(O, /obj/item/food/snacks/monkeycube))
if(istype(O, /obj/item/food/monkeycube))
if(user.drop_item())
monkeys++
to_chat(user, "<span class='notice'>You feed [O] to [src]. It now has [monkeys] monkey cubes stored.</span>")
@@ -192,7 +192,7 @@
else if(istype(O, /obj/item/storage/bag) || istype(O, /obj/item/storage/box))
var/obj/item/storage/P = O
var/loaded = 0
for(var/obj/item/food/snacks/monkeycube/MC in P.contents)
for(var/obj/item/food/monkeycube/MC in P.contents)
loaded = 1
monkeys++
P.remove_from_storage(MC)
@@ -282,17 +282,17 @@
else if(X.monkeys >= 1)
var/mob/living/carbon/human/monkey/food
switch(recycler.cube_type)
if(/obj/item/food/snacks/monkeycube) // Regular monkey
if(/obj/item/food/monkeycube) // Regular monkey
food = new /mob/living/carbon/human/monkey(remote_eye.loc)
if(/obj/item/food/snacks/monkeycube/nian_wormecube) // Worme
if(/obj/item/food/monkeycube/nian_wormecube) // Worme
food = new /mob/living/carbon/human/nian_worme(remote_eye.loc)
if(/obj/item/food/snacks/monkeycube/farwacube) // Farwa
if(/obj/item/food/monkeycube/farwacube) // Farwa
food = new /mob/living/carbon/human/farwa(remote_eye.loc)
if(/obj/item/food/snacks/monkeycube/stokcube) // Stok
if(/obj/item/food/monkeycube/stokcube) // Stok
food = new /mob/living/carbon/human/stok(remote_eye.loc)
if(/obj/item/food/snacks/monkeycube/neaeracube) // Neara
if(/obj/item/food/monkeycube/neaeracube) // Neara
food = new /mob/living/carbon/human/neara(remote_eye.loc)
if(/obj/item/food/snacks/monkeycube/wolpincube) // Wolpin
if(/obj/item/food/monkeycube/wolpincube) // Wolpin
food = new /mob/living/carbon/human/wolpin(remote_eye.loc)
SSmobs.cubemonkeys += food
food.LAssailant = C
@@ -494,17 +494,17 @@
if(X.monkeys >= 1)
var/mob/living/carbon/human/monkey/food
switch(recycler.cube_type)
if(/obj/item/food/snacks/monkeycube) // Regular monkey
if(/obj/item/food/monkeycube) // Regular monkey
food = new /mob/living/carbon/human/monkey(T)
if(/obj/item/food/snacks/monkeycube/nian_wormecube) // Worme
if(/obj/item/food/monkeycube/nian_wormecube) // Worme
food = new /mob/living/carbon/human/nian_worme(T)
if(/obj/item/food/snacks/monkeycube/farwacube) // Farwa
if(/obj/item/food/monkeycube/farwacube) // Farwa
food = new /mob/living/carbon/human/farwa(T)
if(/obj/item/food/snacks/monkeycube/stokcube) // Stok
if(/obj/item/food/monkeycube/stokcube) // Stok
food = new /mob/living/carbon/human/stok(T)
if(/obj/item/food/snacks/monkeycube/neaeracube) // Neara
if(/obj/item/food/monkeycube/neaeracube) // Neara
food = new /mob/living/carbon/human/neara(T)
if(/obj/item/food/snacks/monkeycube/wolpincube) // Wolpin
if(/obj/item/food/monkeycube/wolpincube) // Wolpin
food = new /mob/living/carbon/human/wolpin(T)
food.LAssailant = C
X.monkeys--