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.

Sign up for GitHub

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

Jump to bottom

Non folding plasteel barricade #6855

Merged
merged 6 commits into from
Aug 14, 2024
Merged

Non folding plasteel barricade #6855

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
cc2557c
init
Blundir Aug 2, 2024
3e00e4f
Update metal.dm
Blundir Aug 2, 2024
6e79d51
Update code/game/objects/items/stacks/sheets/sheet_types.dm
Blundir Aug 7, 2024
895eb6d
Update code/game/objects/items/stacks/sheets/sheet_types.dm
Blundir Aug 7, 2024
c7aff80
upd
Blundir Aug 7, 2024
d277c0e
Merge branch 'master' of https://github.com/cmss13-devs/cmss13 into cade
Blundir Aug 7, 2024
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
4 changes: 3 additions & 1 deletion code/game/objects/items/stacks/sheets/sheet_types.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,9 @@ 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),
null, \
Blundir marked this conversation as resolved.
Show resolved Hide resolved
new/datum/stack_recipe("plasteel barricade", /obj/structure/barricade/metal/plasteel, 6, time = 10 SECONDS, one_per_turf = ONE_TYPE_PER_BORDER, on_floor = 1, skill_req = SKILL_CONSTRUCTION, skill_lvl = SKILL_CONSTRUCTION_ENGI, min_time = 2 SECONDS),
Blundir marked this conversation as resolved.
Show resolved Hide resolved
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
28 changes: 28 additions & 0 deletions code/game/objects/structures/barricade/metal.dm
View file
Open in desktop
Blundir marked this conversation as resolved.
Show resolved Hide resolved
Original file line number Diff line number Diff line change
Expand Up @@ -279,3 +279,31 @@
..()
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)

/obj/structure/barricade/metal/plasteel/wired/New()
Blundir marked this conversation as resolved.
Show resolved Hide resolved
maxhealth += 50
update_health(-50)
can_wire = FALSE
is_wired = TRUE
climbable = FALSE
update_icon()
return ..()

/obj/structure/barricade/metal/plasteel/wired/initialize_pass_flags(datum/pass_flags_container/PF)
..()
flags_can_pass_front_temp &= ~PASS_OVER_THROW_MOB
flags_can_pass_behind_temp &= ~PASS_OVER_THROW_MOB
2 changes: 1 addition & 1 deletion code/game/objects/structures/barricade/plasteel.dm
View file
Open in desktop
Blundir marked this conversation as resolved.
Show resolved Hide resolved
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
Binary file modified icons/obj/structures/barricades.dmi
View file
Open in desktop
Binary file not shown.
Binary file modified icons/obj/structures/barricades_christmas.dmi
View file
Open in desktop
Binary file not shown.
Loading