From a0ac305d53b51f36b92baf57c1f96fcd6136d800 Mon Sep 17 00:00:00 2001 From: Helg2 Date: Mon, 12 Aug 2024 22:02:52 +0300 Subject: [PATCH 1/2] Update prop.dm --- code/game/objects/structures/prop.dm | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/code/game/objects/structures/prop.dm b/code/game/objects/structures/prop.dm index b22640e2060..0e4950030e0 100644 --- a/code/game/objects/structures/prop.dm +++ b/code/game/objects/structures/prop.dm @@ -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 @@ -1754,9 +1753,20 @@ name = "railing" desc = "Basic railing meant to protect idiots like you from falling." icon = 'icons/Marine/mainship_props.dmi' - density = FALSE + 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." From de0dd177aa09663a065c39ee34344b7d44fd65cf Mon Sep 17 00:00:00 2001 From: Helg2 Date: Mon, 12 Aug 2024 22:06:43 +0300 Subject: [PATCH 2/2] damageable --- code/game/objects/structures/prop.dm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/code/game/objects/structures/prop.dm b/code/game/objects/structures/prop.dm index 0e4950030e0..c21f896e827 100644 --- a/code/game/objects/structures/prop.dm +++ b/code/game/objects/structures/prop.dm @@ -607,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 @@ -1753,6 +1752,8 @@ name = "railing" desc = "Basic railing meant to protect idiots like you from falling." icon = 'icons/Marine/mainship_props.dmi' + max_integrity = 50 + resistance_flags = XENO_DAMAGEABLE flags_atom = ON_BORDER climbable = TRUE climb_delay = 2 SECONDS