cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-23 20:16:55 +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/game/objects/effects/meteors.dm
+4 -4
View File
@@ -304,7 +304,7 @@ GLOBAL_LIST_INIT(meteors_ops, list(/obj/effect/meteor/goreops)) //Meaty Ops
hits = 2
heavy = TRUE
meteorsound = 'sound/effects/blobattack.ogg'
meteordrop = list(/obj/item/food/snacks/meat/human, /obj/item/organ/internal/heart, /obj/item/organ/internal/lungs, /obj/item/organ/internal/appendix)
meteordrop = list(/obj/item/food/meat/human, /obj/item/organ/internal/heart, /obj/item/organ/internal/lungs, /obj/item/organ/internal/appendix)
var/meteorgibs = /obj/effect/gibspawner/generic
/obj/effect/meteor/meaty/make_debris()
@@ -323,7 +323,7 @@ GLOBAL_LIST_INIT(meteors_ops, list(/obj/effect/meteor/goreops)) //Meaty Ops
//Meaty Ore Xeno edition
/obj/effect/meteor/meaty/xeno
color = "#5EFF00"
meteordrop = list(/obj/item/food/snacks/monstermeat/xenomeat)
meteordrop = list(/obj/item/food/monstermeat/xenomeat)
meteorgibs = /obj/effect/gibspawner/xeno
/obj/effect/meteor/meaty/xeno/Initialize(mapload, target)
@@ -342,7 +342,7 @@ GLOBAL_LIST_INIT(meteors_ops, list(/obj/effect/meteor/goreops)) //Meaty Ops
hits = 10
hitpwr = EXPLODE_DEVASTATE
meteorsound = 'sound/effects/blobattack.ogg'
meteordrop = list(/obj/item/food/snacks/meat)
meteordrop = list(/obj/item/food/meat)
var/meteorgibs = /obj/effect/gibspawner/generic
/obj/effect/meteor/goreops/make_debris()
@@ -370,7 +370,7 @@ GLOBAL_LIST_INIT(meteors_ops, list(/obj/effect/meteor/goreops)) //Meaty Ops
hits = 10
heavy = TRUE
dropamt = 1
meteordrop = list(/obj/item/clothing/head/hardhat/pumpkinhead, /obj/item/food/snacks/grown/pumpkin)
meteordrop = list(/obj/item/clothing/head/hardhat/pumpkinhead, /obj/item/food/grown/pumpkin)
/obj/effect/meteor/pumpkin/Initialize(mapload, target)
. = ..()
code/game/objects/effects/spawners/lootdrop.dm
+13 -13
View File
@@ -486,7 +486,7 @@
/obj/item/clothing/under/new_soviet = 50,
/obj/item/clothing/suit/sovietcoat = 50,
/obj/item/clothing/head/ushanka = 50,
/obj/item/food/snacks/grown/potato = 50,
/obj/item/food/grown/potato = 50,
/obj/item/reagent_containers/drinks/bottle/vodka/badminka = 50,
/obj/item/clothing/head/sovietsidecap = 50,
/obj/item/flag/ussp = 30,
@@ -745,20 +745,20 @@
lootcount = 3
lootdoubles = FALSE
var/soups = list(
/obj/item/food/snacks/soup/beetsoup,
/obj/item/food/snacks/soup/stew,
/obj/item/food/snacks/soup/hotchili,
/obj/item/food/snacks/soup/nettlesoup,
/obj/item/food/snacks/soup/meatballsoup)
/obj/item/food/soup/beetsoup,
/obj/item/food/soup/stew,
/obj/item/food/soup/hotchili,
/obj/item/food/soup/nettlesoup,
/obj/item/food/soup/meatballsoup)
var/salads = list(
/obj/item/food/snacks/salad/herb,
/obj/item/food/snacks/salad/valid,
/obj/item/food/snacks/salad/aesir)
/obj/item/food/salad/herb,
/obj/item/food/salad/valid,
/obj/item/food/salad/aesir)
var/mains = list(
/obj/item/food/snacks/enchiladas,
/obj/item/food/snacks/stewedsoymeat,
/obj/item/food/snacks/burger/bigbite,
/obj/item/food/snacks/burger/superbite)
/obj/item/food/enchiladas,
/obj/item/food/stewedsoymeat,
/obj/item/food/burger/bigbite,
/obj/item/food/burger/superbite)
/obj/effect/spawner/lootdrop/three_course_meal/Initialize(mapload)
loot = list(pick(soups) = 1,pick(salads) = 1,pick(mains) = 1)
code/game/objects/effects/spawners/mess_spawners.dm
+1 -1
View File
@@ -182,7 +182,7 @@
/obj/effect/spawner/themed_mess/cooking/drop_object(turf/T)
var/extra_trash = pick(
/obj/item/trash/plate,
/obj/item/food/snacks/meat,
/obj/item/food/meat,
/obj/item/trash/snack_bowl,
)
var/obj/trash = new extra_trash(T)
code/game/objects/effects/spawners/random_spawners.dm
+1 -1
View File
@@ -265,7 +265,7 @@
spawn_inside = null
result = list(/datum/nothing = 1,
/obj/item/wrench = 1,
/obj/item/food/snacks/syndicake = 1,
/obj/item/food/syndicake = 1,
/obj/item/coin/antagtoken/syndicate = 1,
/obj/item/gun/projectile/automatic/pistol = 1)