diff --git a/code/game/objects/items/stacks/sheets/sheet_types.dm b/code/game/objects/items/stacks/sheets/sheet_types.dm index f579917fed49..e4022c3e4ca0 100644 --- a/code/game/objects/items/stacks/sheets/sheet_types.dm +++ b/code/game/objects/items/stacks/sheets/sheet_types.dm @@ -96,7 +96,8 @@ GLOBAL_LIST_INIT_TYPED(metal_recipes, /datum/stack_recipe, list ( \ * Plasteel */ GLOBAL_LIST_INIT_TYPED(plasteel_recipes, /datum/stack_recipe, list ( \ - new/datum/stack_recipe("plasteel barricade", /obj/structure/barricade/plasteel, 8, time = 4 SECONDS, one_per_turf = ONE_TYPE_PER_TURF, on_floor = 1, skill_req = SKILL_CONSTRUCTION, skill_lvl = SKILL_CONSTRUCTION_ENGI, min_time = 2 SECONDS), + new/datum/stack_recipe("folding plasteel barricade", /obj/structure/barricade/plasteel, 8, time = 4 SECONDS, one_per_turf = ONE_TYPE_PER_TURF, on_floor = 1, skill_req = SKILL_CONSTRUCTION, skill_lvl = SKILL_CONSTRUCTION_ENGI, min_time = 2 SECONDS), + new/datum/stack_recipe("plasteel barricade", /obj/structure/barricade/metal/plasteel, 6, time = 8 SECONDS, one_per_turf = ONE_TYPE_PER_BORDER, on_floor = 1, skill_req = SKILL_CONSTRUCTION, skill_lvl = SKILL_CONSTRUCTION_ENGI, min_time = 2 SECONDS), null, \ new/datum/stack_recipe("reinforced window frame", /obj/structure/window_frame/colony/reinforced, 5, time = 40, one_per_turf = ONE_TYPE_PER_TURF, on_floor = 1, skill_req = SKILL_CONSTRUCTION, skill_lvl = SKILL_CONSTRUCTION_ENGI), null, \ diff --git a/code/game/objects/structures/barricade/plasteel.dm b/code/game/objects/structures/barricade/folding.dm similarity index 99% rename from code/game/objects/structures/barricade/plasteel.dm rename to code/game/objects/structures/barricade/folding.dm index fb5a08954a5d..8fe00d04a708 100644 --- a/code/game/objects/structures/barricade/plasteel.dm +++ b/code/game/objects/structures/barricade/folding.dm @@ -1,5 +1,5 @@ /obj/structure/barricade/plasteel - name = "plasteel barricade" + name = "folding plasteel barricade" desc = "A very sturdy barricade made out of plasteel panels, the pinnacle of strongpoints. Use a blowtorch to repair. Can be flipped down to create a path." icon_state = "plasteel_closed_0" health = 800 diff --git a/code/game/objects/structures/barricade/metal.dm b/code/game/objects/structures/barricade/non_folding.dm similarity index 95% rename from code/game/objects/structures/barricade/metal.dm rename to code/game/objects/structures/barricade/non_folding.dm index f16e6851341b..575f1da738bf 100644 --- a/code/game/objects/structures/barricade/metal.dm +++ b/code/game/objects/structures/barricade/non_folding.dm @@ -279,3 +279,18 @@ ..() flags_can_pass_front_temp &= ~PASS_OVER_THROW_MOB flags_can_pass_behind_temp &= ~PASS_OVER_THROW_MOB + +/obj/structure/barricade/metal/plasteel + name = "plasteel barricade" + desc = "A sturdy and easily assembled barricade made of reinforced plasteel plates, the pinnacle of strongpoints. Use a blowtorch to repair." + icon_state = "new_plasteel_0" + health = 900 + maxhealth = 900 + crusher_resistant = TRUE + force_level_absorption = 20 + stack_type = /obj/item/stack/sheet/plasteel + debris = list(/obj/item/stack/sheet/plasteel) + destroyed_stack_amount = 3 + barricade_type = "new_plasteel" + repair_materials = list("plasteel" = 0.45) + diff --git a/colonialmarines.dme b/colonialmarines.dme index a5109c8dd48a..87f42d5eb28d 100644 --- a/colonialmarines.dme +++ b/colonialmarines.dme @@ -1321,10 +1321,10 @@ #include "code\game\objects\structures\window_frame.dm" #include "code\game\objects\structures\barricade\barricade.dm" #include "code\game\objects\structures\barricade\deployable.dm" +#include "code\game\objects\structures\barricade\folding.dm" #include "code\game\objects\structures\barricade\handrail.dm" -#include "code\game\objects\structures\barricade\metal.dm" #include "code\game\objects\structures\barricade\misc.dm" -#include "code\game\objects\structures\barricade\plasteel.dm" +#include "code\game\objects\structures\barricade\non_folding.dm" #include "code\game\objects\structures\barricade\sandbags.dm" #include "code\game\objects\structures\crates_lockers\closets.dm" #include "code\game\objects\structures\crates_lockers\crates.dm" diff --git a/icons/obj/structures/barricades.dmi b/icons/obj/structures/barricades.dmi index f3c5a5c809e1..0e3cb6889d10 100644 Binary files a/icons/obj/structures/barricades.dmi and b/icons/obj/structures/barricades.dmi differ diff --git a/icons/obj/structures/barricades_christmas.dmi b/icons/obj/structures/barricades_christmas.dmi index 215bf9710a80..64b2383a4a9e 100644 Binary files a/icons/obj/structures/barricades_christmas.dmi and b/icons/obj/structures/barricades_christmas.dmi differ