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

Makes railings on talos dense. #80

Merged
merged 2 commits into from
Aug 13, 2024
Merged
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
17 changes: 14 additions & 3 deletions code/game/objects/structures/prop.dm
Original file line number Diff line number Diff line change
Expand Up @@ -234,7 +234,6 @@
name = "GENERIC SHIP PROP"
desc = "THIS SHOULDN'T BE VISIBLE, AHELP 'ART-P02' IF SEEN IN ROUND WITH LOCATION"
density = TRUE
anchored = TRUE
coverage = 15

/obj/machinery/prop/autolathe
Expand Down Expand Up @@ -608,7 +607,6 @@
icon_state = "Field_Gen"
anchored = FALSE
density = TRUE
max_integrity = 500
//100% immune to lasers and energy projectiles since it absorbs their energy.
soft_armor = list(MELEE = 25, BULLET = 10, LASER = 100, ENERGY = 100, BOMB = 0, BIO = 0, FIRE = 50, ACID = 70)
resistance_flags = RESIST_ALL
Expand Down Expand Up @@ -1754,9 +1752,22 @@
name = "railing"
desc = "Basic railing meant to protect idiots like you from falling."
icon = 'icons/Marine/mainship_props.dmi'
density = FALSE
max_integrity = 50
resistance_flags = XENO_DAMAGEABLE
flags_atom = ON_BORDER
climbable = TRUE
climb_delay = 2 SECONDS
allow_pass_flags = PASS_LOW_STRUCTURE|PASSABLE|PASS_WALKOVER
icon_state = "railing"

/obj/structure/prop/mainship/railing/Initialize(mapload)
. = ..()
var/static/list/connections = list(
COMSIG_ATOM_EXIT = PROC_REF(on_try_exit),
COMSIG_OBJ_TRY_ALLOW_THROUGH = PROC_REF(can_climb_over),
)
AddElement(/datum/element/connect_loc, connections)

/obj/structure/prop/mainship/railing/corner
name = "railing"
desc = "Basic railing meant to protect idiots like you from falling."
Expand Down
Loading