Skip to content

Commit

Permalink
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Small fix
Browse files Browse the repository at this point in the history
@Drsmail
Drsmail committed Jan 3, 2025
1 parent 607e91d commit 18ae6d9
Showing 3 changed files with 12 additions and 3 deletions.
4 changes: 2 additions & 2 deletions _maps/map_files/RandomRuins/LavaRuins/lavaland_surface_pizzaparty.dmm
View file
Original file line number Diff line number Diff line change
@@ -144,13 +144,13 @@
/area/ruin/powered/pizza_party)
"D" = (
/obj/structure/table/wood,
obj/item/food/sliced/margherita_pizza,
/obj/item/food/sliced/margherita_pizza,
/obj/item/trash/plate,
/turf/simulated/floor/wood/lavaland_air,
/area/ruin/powered/pizza_party)
"E" = (
/obj/structure/table/wood,
obj/item/food/sliced/meat_pizza,
/obj/item/food/sliced/meat_pizza,
/turf/simulated/floor/wood/lavaland_air,
/area/ruin/powered/pizza_party)
"F" = (
2 changes: 1 addition & 1 deletion code/modules/antagonists/traitor/contractor/datums/syndicate_contract.dm
View file
Original file line number Diff line number Diff line change
@@ -423,7 +423,7 @@
M.update_icons()

// Supply them with some chow. How generous is the Syndicate?
var/obj/item/food/sliced/bread/food = new(get_turf(M))
var/obj/item/food/sliced/bread/food = new(get_turf(M)) // TODO 545
food.name = "stale bread"
food.desc = "Looks like your captors care for their prisoners as much as their bread."
food.trash = null
9 changes: 9 additions & 0 deletions code/modules/food_and_drinks/food_base.dm
View file
Original file line number Diff line number Diff line change
@@ -280,6 +280,15 @@
var/test = 3

/obj/item/food/sliced/Initialize(mapload, parent_reagents)
if(!parent_reagents && !length(list_reagents))
//log_debug("Slice was created with no parent! Name: [src], UID:[src.UID()], loc:[src.loc]")
CRASH("Slice was created with no reagents! [src]") // 68, 181, 2

Check failure on line 285 in code/modules/food_and_drinks/food_base.dm

GitHub Actions / Unit Tests + SQL Validation (/datum/map/boxstation, BETA)

Runtime 

Slice was created with no reagents! The mushroom pizza slice

Check failure on line 285 in code/modules/food_and_drinks/food_base.dm

GitHub Actions / Unit Tests + SQL Validation (/datum/map/boxstation, BETA)

Runtime 

Slice was created with no reagents! The bread slice

Check failure on line 285 in code/modules/food_and_drinks/food_base.dm

GitHub Actions / Unit Tests + SQL Validation (/datum/map/boxstation, BETA)

Runtime 

Slice was created with no reagents! The bread slice

Check failure on line 285 in code/modules/food_and_drinks/food_base.dm

GitHub Actions / Unit Tests + SQL Validation (/datum/map/boxstation, BETA)

Runtime 

Slice was created with no reagents! The bread slice

Check failure on line 285 in code/modules/food_and_drinks/food_base.dm

GitHub Actions / Unit Tests + SQL Validation (/datum/map/boxstation, STABLE)

Runtime 

Slice was created with no reagents! The mushroom pizza slice

Check failure on line 285 in code/modules/food_and_drinks/food_base.dm

GitHub Actions / Unit Tests + SQL Validation (/datum/map/boxstation, STABLE)

Runtime 

Slice was created with no reagents! The bread slice

Check failure on line 285 in code/modules/food_and_drinks/food_base.dm

GitHub Actions / Unit Tests + SQL Validation (/datum/map/boxstation, STABLE)

Runtime 

Slice was created with no reagents! The bread slice

Check failure on line 285 in code/modules/food_and_drinks/food_base.dm

GitHub Actions / Unit Tests + SQL Validation (/datum/map/boxstation, STABLE)

Runtime 

Slice was created with no reagents! The bread slice

Check failure on line 285 in code/modules/food_and_drinks/food_base.dm

GitHub Actions / Unit Tests + SQL Validation (/datum/map/metastation, BETA)

Runtime 

Slice was created with no reagents! The mushroom pizza slice

Check failure on line 285 in code/modules/food_and_drinks/food_base.dm

GitHub Actions / Unit Tests + SQL Validation (/datum/map/metastation, BETA)

Runtime 

Slice was created with no reagents! The bread slice

Check failure on line 285 in code/modules/food_and_drinks/food_base.dm

GitHub Actions / Unit Tests + SQL Validation (/datum/map/metastation, BETA)

Runtime 

Slice was created with no reagents! The bread slice

Check failure on line 285 in code/modules/food_and_drinks/food_base.dm

GitHub Actions / Unit Tests + SQL Validation (/datum/map/metastation, BETA)

Runtime 

Slice was created with no reagents! The bread slice

Check failure on line 285 in code/modules/food_and_drinks/food_base.dm

GitHub Actions / Unit Tests + SQL Validation (/datum/map/metastation, BETA)

Runtime 

Slice was created with no reagents! The carrot cake slice

Check failure on line 285 in code/modules/food_and_drinks/food_base.dm

GitHub Actions / Unit Tests + SQL Validation (/datum/map/metastation, STABLE)

Runtime 

Slice was created with no reagents! The mushroom pizza slice

Check failure on line 285 in code/modules/food_and_drinks/food_base.dm

GitHub Actions / Unit Tests + SQL Validation (/datum/map/metastation, STABLE)

Runtime 

Slice was created with no reagents! The bread slice

Check failure on line 285 in code/modules/food_and_drinks/food_base.dm

GitHub Actions / Unit Tests + SQL Validation (/datum/map/metastation, STABLE)

Runtime 

Slice was created with no reagents! The bread slice

Check failure on line 285 in code/modules/food_and_drinks/food_base.dm

GitHub Actions / Unit Tests + SQL Validation (/datum/map/metastation, STABLE)

Runtime 

Slice was created with no reagents! The bread slice

Check failure on line 285 in code/modules/food_and_drinks/food_base.dm

GitHub Actions / Unit Tests + SQL Validation (/datum/map/metastation, STABLE)

Runtime 

Slice was created with no reagents! The carrot cake slice

Check failure on line 285 in code/modules/food_and_drinks/food_base.dm

GitHub Actions / Unit Tests + SQL Validation (/datum/map/deltastation, BETA)

Runtime 

Slice was created with no reagents! The mushroom pizza slice

Check failure on line 285 in code/modules/food_and_drinks/food_base.dm

GitHub Actions / Unit Tests + SQL Validation (/datum/map/deltastation, BETA)

Runtime 

Slice was created with no reagents! The bread slice

Check failure on line 285 in code/modules/food_and_drinks/food_base.dm

GitHub Actions / Unit Tests + SQL Validation (/datum/map/deltastation, BETA)

Runtime 

Slice was created with no reagents! The bread slice

Check failure on line 285 in code/modules/food_and_drinks/food_base.dm

GitHub Actions / Unit Tests + SQL Validation (/datum/map/deltastation, BETA)

Runtime 

Slice was created with no reagents! The bread slice

Check failure on line 285 in code/modules/food_and_drinks/food_base.dm

GitHub Actions / Unit Tests + SQL Validation (/datum/map/emeraldstation, BETA)

Runtime 

Slice was created with no reagents! The mushroom pizza slice

Check failure on line 285 in code/modules/food_and_drinks/food_base.dm

GitHub Actions / Unit Tests + SQL Validation (/datum/map/emeraldstation, BETA)

Runtime 

Slice was created with no reagents! The pumpkin pie slice

Check failure on line 285 in code/modules/food_and_drinks/food_base.dm

GitHub Actions / Unit Tests + SQL Validation (/datum/map/emeraldstation, STABLE)

Runtime 

Slice was created with no reagents! The mushroom pizza slice

Check failure on line 285 in code/modules/food_and_drinks/food_base.dm

GitHub Actions / Unit Tests + SQL Validation (/datum/map/emeraldstation, STABLE)

Runtime 

Slice was created with no reagents! The pumpkin pie slice

Check failure on line 285 in code/modules/food_and_drinks/food_base.dm

GitHub Actions / Unit Tests + SQL Validation (/datum/map/deltastation, STABLE)

Runtime 

Slice was created with no reagents! The mushroom pizza slice

Check failure on line 285 in code/modules/food_and_drinks/food_base.dm

GitHub Actions / Unit Tests + SQL Validation (/datum/map/deltastation, STABLE)

Runtime 

Slice was created with no reagents! The bread slice

Check failure on line 285 in code/modules/food_and_drinks/food_base.dm

GitHub Actions / Unit Tests + SQL Validation (/datum/map/deltastation, STABLE)

Runtime 

Slice was created with no reagents! The bread slice

Check failure on line 285 in code/modules/food_and_drinks/food_base.dm

GitHub Actions / Unit Tests + SQL Validation (/datum/map/deltastation, STABLE)

Runtime 

Slice was created with no reagents! The bread slice

Check failure on line 285 in code/modules/food_and_drinks/food_base.dm

GitHub Actions / Unit Tests + SQL Validation (/datum/map/cerestation, BETA)

Runtime 

Slice was created with no reagents! The mushroom pizza slice

Check failure on line 285 in code/modules/food_and_drinks/food_base.dm

GitHub Actions / Unit Tests + SQL Validation (/datum/map/cerestation, BETA)

Runtime 

Slice was created with no reagents! The bread slice

Check failure on line 285 in code/modules/food_and_drinks/food_base.dm

GitHub Actions / Unit Tests + SQL Validation (/datum/map/cerestation, BETA)

Runtime 

Slice was created with no reagents! The bread slice

Check failure on line 285 in code/modules/food_and_drinks/food_base.dm

GitHub Actions / Unit Tests + SQL Validation (/datum/map/cerestation, BETA)

Runtime 

Slice was created with no reagents! The bread slice

Check failure on line 285 in code/modules/food_and_drinks/food_base.dm

GitHub Actions / Unit Tests + SQL Validation (/datum/map/cerestation, STABLE)

Runtime 

Slice was created with no reagents! The mushroom pizza slice

Check failure on line 285 in code/modules/food_and_drinks/food_base.dm

GitHub Actions / Unit Tests + SQL Validation (/datum/map/cerestation, STABLE)

Runtime 

Slice was created with no reagents! The bread slice

Check failure on line 285 in code/modules/food_and_drinks/food_base.dm

GitHub Actions / Unit Tests + SQL Validation (/datum/map/cerestation, STABLE)

Runtime 

Slice was created with no reagents! The bread slice

Check failure on line 285 in code/modules/food_and_drinks/food_base.dm

GitHub Actions / Unit Tests + SQL Validation (/datum/map/cerestation, STABLE)

Runtime 

Slice was created with no reagents! The bread slice
list_reagents = parent_reagents
return ..()

/obj/item/food/sliced/New(parent_reagents)
. = ..()

if(!parent_reagents && !list_reagents)
//log_debug("Slice was created with no parent! Name: [src], UID:[src.UID()], loc:[src.loc]")
CRASH("Slice was created with no reagents! [src]")

0 comments on commit 18ae6d9

Please sign in to comment.