Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Non folding plasteel barricade #6855

Merged
merged 6 commits into from
Aug 14, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion code/game/objects/items/stacks/sheets/sheet_types.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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, \
Expand Down
Original file line number Diff line number Diff line change
@@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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)

4 changes: 2 additions & 2 deletions colonialmarines.dme
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
Binary file modified icons/obj/structures/barricades.dmi
Binary file not shown.
Binary file modified icons/obj/structures/barricades_christmas.dmi
Binary file not shown.
Loading