mirror of
https://github.com/Aurorastation/Aurora.3.git
synced 2026-08-23 04:51:32 +01:00
Flags and adjacency work (#20259)
Added a bunch of flags for passflags on things that were previously missing them. Removed snowflake passthrow var, it's a passflag now. Updated ClickCross and Adjacency code. It's now possible to interact with things that are adjacent but otherwise have a machine (or other appropriate items) blocking them, eg. think of an APC on the wall with a machine in front of it.
This commit is contained in:
@@ -86,7 +86,7 @@
|
||||
src.close(M)
|
||||
return 1
|
||||
|
||||
/obj/item/storage/internal/Adjacent(var/atom/neighbor)
|
||||
/obj/item/storage/internal/Adjacent(atom/neighbor, atom/target, atom/movable/mover)
|
||||
var/obj/item/real_master_item = special_master_item_handling ? get_master_item() : master_item
|
||||
return real_master_item.Adjacent(neighbor)
|
||||
|
||||
|
||||
@@ -3,6 +3,7 @@
|
||||
w_class = WEIGHT_CLASS_GIGANTIC
|
||||
layer = STRUCTURE_LAYER
|
||||
blocks_emissive = EMISSIVE_BLOCK_GENERIC
|
||||
pass_flags_self = PASSSTRUCTURE
|
||||
|
||||
var/material_alteration = MATERIAL_ALTERATION_ALL // Overrides for material shit. Set them manually if you don't want colors etc. See wood chairs/office chairs.
|
||||
var/climbable
|
||||
|
||||
@@ -3,7 +3,6 @@
|
||||
climbable = TRUE
|
||||
anchored = TRUE
|
||||
density = TRUE
|
||||
throwpass = TRUE //You can throw objects over this, despite its density.
|
||||
atom_flags = ATOM_FLAG_CHECKS_BORDER
|
||||
|
||||
var/stack_type //The type of stack the barricade dropped when disassembled if any.
|
||||
|
||||
@@ -6,7 +6,7 @@
|
||||
density = TRUE
|
||||
build_amt = 2
|
||||
slowdown = 5
|
||||
pass_flags_self = PASSTRACE
|
||||
pass_flags_self = PASSSTRUCTURE | LETPASSCLICKS | PASSTRACE
|
||||
|
||||
var/icon_door = null
|
||||
/// Override to have open overlay use icon different to its base's
|
||||
|
||||
@@ -8,6 +8,7 @@
|
||||
icon_state = "grille"
|
||||
density = TRUE
|
||||
anchored = TRUE
|
||||
pass_flags_self = PASSGRILLE
|
||||
obj_flags = OBJ_FLAG_CONDUCTABLE | OBJ_FLAG_MOVES_UNSUPPORTED
|
||||
explosion_resistance = 1
|
||||
layer = BELOW_WINDOW_LAYER
|
||||
|
||||
@@ -143,7 +143,7 @@
|
||||
icon_state = "morguet"
|
||||
density = TRUE
|
||||
anchored = TRUE
|
||||
throwpass = TRUE
|
||||
pass_flags_self = PASSSTRUCTURE | LETPASSTHROW
|
||||
layer = BELOW_OBJ_LAYER
|
||||
obj_flags = OBJ_FLAG_MOVES_UNSUPPORTED
|
||||
var/obj/structure/morgue/connected = null
|
||||
|
||||
@@ -3,8 +3,9 @@
|
||||
desc = "Completely impassable - or are they?"
|
||||
icon = 'icons/obj/structure/plasticflaps.dmi'
|
||||
icon_state = "plasticflaps_preview"
|
||||
density = 0
|
||||
anchored = 1
|
||||
density = FALSE
|
||||
anchored = TRUE
|
||||
pass_flags_self = PASSSTRUCTURE | PASSFLAPS
|
||||
layer = UNDERDOOR
|
||||
explosion_resistance = 5
|
||||
build_amt = 4
|
||||
|
||||
@@ -4,7 +4,6 @@
|
||||
icon = 'icons/obj/structure/blocker/railing_basic.dmi'
|
||||
icon_state = "railing0-1"
|
||||
density = TRUE
|
||||
throwpass = TRUE
|
||||
climbable = TRUE
|
||||
layer = OBJ_LAYER
|
||||
anchored = FALSE
|
||||
|
||||
@@ -431,9 +431,9 @@ ABSTRACT_TYPE(/obj/structure/stairs/urban/road_ramp)
|
||||
icon = 'icons/obj/structure/urban/blockers.dmi'
|
||||
icon_state = "rod_railing"
|
||||
density = TRUE
|
||||
throwpass = TRUE
|
||||
climbable = TRUE
|
||||
anchored = TRUE
|
||||
pass_flags_self = PASSSTRUCTURE | LETPASSTHROW
|
||||
climbable = TRUE
|
||||
|
||||
/obj/structure/rod_railing/CanPass(atom/movable/mover, turf/target, height=0, air_group=0)
|
||||
if(mover?.movement_type & PHASING)
|
||||
@@ -463,8 +463,8 @@ ABSTRACT_TYPE(/obj/structure/stairs/urban/road_ramp)
|
||||
icon = 'icons/obj/structure/urban/blockers.dmi'
|
||||
icon_state = "dam1"
|
||||
density = TRUE
|
||||
throwpass = TRUE
|
||||
anchored = TRUE
|
||||
pass_flags_self = PASSSTRUCTURE | LETPASSTHROW
|
||||
|
||||
/obj/structure/road_barrier
|
||||
name = "roadway barrier"
|
||||
@@ -472,7 +472,7 @@ ABSTRACT_TYPE(/obj/structure/stairs/urban/road_ramp)
|
||||
icon = 'icons/obj/structure/urban/road_edges.dmi'
|
||||
icon_state = "guard"
|
||||
density = TRUE
|
||||
throwpass = TRUE
|
||||
pass_flags_self = PASSSTRUCTURE | LETPASSTHROW
|
||||
climbable = TRUE
|
||||
anchored = TRUE
|
||||
|
||||
|
||||
@@ -11,6 +11,7 @@
|
||||
icon_state = "window"
|
||||
alpha = 196
|
||||
density = TRUE
|
||||
pass_flags_self = PASSWINDOW
|
||||
w_class = WEIGHT_CLASS_NORMAL
|
||||
layer = SIDE_WINDOW_LAYER
|
||||
anchored = TRUE
|
||||
|
||||
Reference in New Issue
Block a user