diff --git a/code/datums/materials/pizza.dm b/code/datums/materials/pizza.dm index 0d796774497..29944670c83 100644 --- a/code/datums/materials/pizza.dm +++ b/code/datums/materials/pizza.dm @@ -1,5 +1,3 @@ -//SKYRAT EDIT REMOVAL BEGIN -/* /datum/material/pizza name = "pizza" desc = "~Jamme, jamme, n'coppa, jamme ja! Jamme, jamme, n'coppa jamme ja, funi-culi funi-cala funi-culi funi-cala!! Jamme jamme ja funiculi funicula!~" @@ -31,5 +29,4 @@ var/nutriment_count = 3 * (amount / MINERAL_MATERIAL_AMOUNT) var/oil_count = 2 * (amount / MINERAL_MATERIAL_AMOUNT) source.AddComponent(/datum/component/edible, list(/datum/reagent/consumable/nutriment = nutriment_count, /datum/reagent/consumable/cooking_oil = oil_count), null, GRAIN | MEAT | DAIRY | VEGETABLES, null, 30, list("crust", "tomato", "cheese", "meat")) -*/ -//SKYRAT EDIT REMOVAL END + diff --git a/code/game/objects/items/RCD.dm b/code/game/objects/items/RCD.dm index 67b08465fd7..1a05ed6a463 100644 --- a/code/game/objects/items/RCD.dm +++ b/code/game/objects/items/RCD.dm @@ -694,6 +694,10 @@ GLOBAL_VAR_INIT(icon_holographic_window, init_holographic_window()) furnish_delay = 20 /obj/item/construction/rcd/proc/rcd_create(atom/A, mob/user) + // SKYRAT EDIT ADDITION + if(A.prevent_rcd_deconstruction) + return FALSE + // SKYRAT EDIT END var/list/rcd_results = A.rcd_vals(user, src) if(!rcd_results) return FALSE diff --git a/code/game/objects/items/stacks/sheets/sheet_types.dm b/code/game/objects/items/stacks/sheets/sheet_types.dm index f78e9cf4d33..93b9caf8bf1 100644 --- a/code/game/objects/items/stacks/sheets/sheet_types.dm +++ b/code/game/objects/items/stacks/sheets/sheet_types.dm @@ -813,8 +813,6 @@ new /datum/stack_recipe("paper frame door", /obj/structure/mineral_door/paperfra /obj/item/stack/sheet/meat/five amount = 5 -//SKYRAT EDIT REMOVAL BEGIN -/* /obj/item/stack/sheet/pizza name = "pepperoni sheetzzas" desc = "It's a delicious pepperoni sheetzza!" @@ -831,8 +829,6 @@ new /datum/stack_recipe("paper frame door", /obj/structure/mineral_door/paperfra amount = 20 /obj/item/stack/sheet/pizza/five amount = 5 -*/ -//SKYRAT EDIT REMOVAL END /obj/item/stack/sheet/sandblock name = "blocks of sand" diff --git a/code/modules/cargo/exports/sheets.dm b/code/modules/cargo/exports/sheets.dm index 34c0b7f6a33..495d904eed4 100644 --- a/code/modules/cargo/exports/sheets.dm +++ b/code/modules/cargo/exports/sheets.dm @@ -117,14 +117,10 @@ unit_name = "of ammonia crystal" export_types = list(/obj/item/stack/ammonia_crystals) -//SKYRAT EDIT REMOVAL BEGIN -/* /datum/export/stack/pizza cost = CARGO_CRATE_VALUE * 0.06 unit_name = "of sheetza" export_types = list(/obj/item/stack/sheet/pizza) -*/ -//SKYRAT EDIT REMOVAL END /datum/export/stack/meat cost = CARGO_CRATE_VALUE * 0.04 diff --git a/code/modules/mapping/turfs.dm b/code/modules/mapping/turfs.dm new file mode 100644 index 00000000000..2976bbf9d50 --- /dev/null +++ b/code/modules/mapping/turfs.dm @@ -0,0 +1,42 @@ +// Floors +/turf/open/floor/material/meat + custom_materials = list(/datum/material/meat = MINERAL_MATERIAL_AMOUNT * 0.25) + +/turf/open/floor/material/pizza + custom_materials = list(/datum/material/pizza = MINERAL_MATERIAL_AMOUNT * 0.25) + +/turf/open/floor/material/plasmaglass + custom_materials = list(/datum/material/alloy/plasmaglass = MINERAL_MATERIAL_AMOUNT * 0.25) + +/turf/open/floor/material/glass + custom_materials = list(/datum/material/glass = MINERAL_MATERIAL_AMOUNT * 0.25) + +/turf/open/floor/material/plastitaniumglass + custom_materials = list(/datum/material/alloy/plastitaniumglass = MINERAL_MATERIAL_AMOUNT * 0.25) + +/turf/open/floor/material/titaniumglass + custom_materials = list(/datum/material/alloy/titaniumglass = MINERAL_MATERIAL_AMOUNT * 0.25) + +// Walls +/turf/closed/wall/material/meat + custom_materials = list(/datum/material/meat = MINERAL_MATERIAL_AMOUNT * 2) + +/turf/closed/wall/material/pizza + custom_materials = list(/datum/material/pizza = MINERAL_MATERIAL_AMOUNT * 2) + +/turf/closed/wall/material/plasmaglass + custom_materials = list(/datum/material/alloy/plasmaglass = MINERAL_MATERIAL_AMOUNT * 2) + +/turf/closed/wall/material/glass + custom_materials = list(/datum/material/glass = MINERAL_MATERIAL_AMOUNT * 2) + +/turf/closed/wall/material/plastitaniumglass + custom_materials = list(/datum/material/alloy/plastitaniumglass = MINERAL_MATERIAL_AMOUNT * 2) + +/turf/closed/wall/material/titaniumglass + custom_materials = list(/datum/material/alloy/titaniumglass = MINERAL_MATERIAL_AMOUNT * 2) + +/atom + /// Do we prevent the RCD from interacting with this atom regardless? + var/prevent_rcd_deconstruction = FALSE + diff --git a/tgstation.dme b/tgstation.dme index b9899309d8f..61615945e9f 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -3042,6 +3042,7 @@ #include "code\modules\mapping\preloader.dm" #include "code\modules\mapping\reader.dm" #include "code\modules\mapping\ruins.dm" +#include "code\modules\mapping\turfs.dm" #include "code\modules\mapping\verify.dm" #include "code\modules\mapping\map_specific_code\Tramstation.dm" #include "code\modules\mapping\modular_map_loader\modular_map_loader.dm"