diff --git a/code/__DEFINES/_flags.dm b/code/__DEFINES/_flags.dm index 7cd6a2b509c..012ded7eac1 100644 --- a/code/__DEFINES/_flags.dm +++ b/code/__DEFINES/_flags.dm @@ -17,45 +17,43 @@ GLOBAL_LIST_INIT(bitflags, list(1, 2, 4, 8, 16, 32, 64, 128, 256, 512, 1024, 204 /// Is this object currently processing in the atmos object list? #define ATMOS_IS_PROCESSING_1 (1<<0) -/// For machines and structures that should not break into parts, eg, holodeck stuff -#define NODECONSTRUCT_1 (1<<1) /// item has priority to check when entering or leaving -#define ON_BORDER_1 (1<<2) +#define ON_BORDER_1 (1<<1) ///Whether or not this atom shows screentips when hovered over -#define NO_SCREENTIPS_1 (1<<3) +#define NO_SCREENTIPS_1 (1<<2) /// Prevent clicking things below it on the same turf eg. doors/ fulltile windows -#define PREVENT_CLICK_UNDER_1 (1<<4) +#define PREVENT_CLICK_UNDER_1 (1<<3) ///specifies that this atom is a hologram that isnt real -#define HOLOGRAM_1 (1<<5) +#define HOLOGRAM_1 (1<<4) ///Whether /atom/Initialize() has already run for the object -#define INITIALIZED_1 (1<<6) +#define INITIALIZED_1 (1<<5) /// was this spawned by an admin? used for stat tracking stuff. -#define ADMIN_SPAWNED_1 (1<<7) +#define ADMIN_SPAWNED_1 (1<<6) /// should not get harmed if this gets caught by an explosion? -#define PREVENT_CONTENTS_EXPLOSION_1 (1<<8) +#define PREVENT_CONTENTS_EXPLOSION_1 (1<<7) /// Should this object be paintable with very dark colors? -#define ALLOW_DARK_PAINTS_1 (1<<9) +#define ALLOW_DARK_PAINTS_1 (1<<8) /// Should this object be unpaintable? -#define UNPAINTABLE_1 (1<<10) +#define UNPAINTABLE_1 (1<<9) /// Is this atom on top of another atom, and as such has click priority? -#define IS_ONTOP_1 (1<<11) +#define IS_ONTOP_1 (1<<10) /// Is this atom immune to being dusted by the supermatter? -#define SUPERMATTER_IGNORES_1 (1<<12) +#define SUPERMATTER_IGNORES_1 (1<<11) /// If a turf can be made dirty at roundstart. This is also used in areas. -#define CAN_BE_DIRTY_1 (1<<13) +#define CAN_BE_DIRTY_1 (1<<12) /// Should we use the initial icon for display? Mostly used by overlay only objects -#define HTML_USE_INITAL_ICON_1 (1<<14) +#define HTML_USE_INITAL_ICON_1 (1<<13) /// Can players recolor this in-game via vendors (and maybe more if support is added)? -#define IS_PLAYER_COLORABLE_1 (1<<15) +#define IS_PLAYER_COLORABLE_1 (1<<14) /// Whether or not this atom has contextual screentips when hovered OVER -#define HAS_CONTEXTUAL_SCREENTIPS_1 (1<<16) +#define HAS_CONTEXTUAL_SCREENTIPS_1 (1<<15) /// Whether or not this atom is storing contents for a disassociated storage object -#define HAS_DISASSOCIATED_STORAGE_1 (1<<17) +#define HAS_DISASSOCIATED_STORAGE_1 (1<<16) /// If this atom has experienced a decal element "init finished" sourced appearance update /// We use this to ensure stacked decals don't double up appearance updates for no rasin /// Flag as an optimization, don't make this a trait without profiling /// Yes I know this is a stupid flag, no you can't take him from me -#define DECAL_INIT_UPDATE_EXPERIENCED_1 (1<<18) +#define DECAL_INIT_UPDATE_EXPERIENCED_1 (1<<17) // Update flags for [/atom/proc/update_appearance] /// Update the atom's name diff --git a/code/__DEFINES/obj_flags.dm b/code/__DEFINES/obj_flags.dm index 5e2fbdf0553..9427328fcc2 100644 --- a/code/__DEFINES/obj_flags.dm +++ b/code/__DEFINES/obj_flags.dm @@ -15,6 +15,7 @@ #define IGNORE_DENSITY (1<<11) //! Can we ignore density when building on this object? (for example, directional windows and grilles) #define INFINITE_RESKIN (1<<12) // We can reskin this item infinitely #define CONDUCTS_ELECTRICITY (1<<13) //! Can this object conduct electricity? +#define NO_DECONSTRUCTION (1<<14) //! Prevent deconstruction of this object. // If you add new ones, be sure to add them to /obj/Initialize as well for complete mapping support diff --git a/code/_globalvars/bitfields.dm b/code/_globalvars/bitfields.dm index 6bf4d863f5d..93d55731d95 100644 --- a/code/_globalvars/bitfields.dm +++ b/code/_globalvars/bitfields.dm @@ -126,9 +126,6 @@ DEFINE_BITFIELD(flags_1, list( "IS_ONTOP_1" = IS_ONTOP_1, "IS_PLAYER_COLORABLE_1" = IS_PLAYER_COLORABLE_1, "NO_SCREENTIPS_1" = NO_SCREENTIPS_1, - "NODECONSTRUCT_1" = NODECONSTRUCT_1, - "NO_SCREENTIPS_1" = NO_SCREENTIPS_1, - "NODECONSTRUCT_1" = NODECONSTRUCT_1, "ON_BORDER_1" = ON_BORDER_1, "PREVENT_CLICK_UNDER_1" = PREVENT_CLICK_UNDER_1, "PREVENT_CONTENTS_EXPLOSION_1" = PREVENT_CONTENTS_EXPLOSION_1, @@ -299,6 +296,7 @@ DEFINE_BITFIELD(obj_flags, list( "EMAGGED" = EMAGGED, "IGNORE_DENSITY" = IGNORE_DENSITY, "IN_USE" = IN_USE, + "NO_DECONSTRUCTION" = NO_DECONSTRUCTION, "UNIQUE_RENAME" = UNIQUE_RENAME, )) diff --git a/code/datums/elements/frozen.dm b/code/datums/elements/frozen.dm index 3fdf13965cf..b88cc2afa22 100644 --- a/code/datums/elements/frozen.dm +++ b/code/datums/elements/frozen.dm @@ -59,7 +59,7 @@ GLOBAL_LIST_INIT(freon_color_matrix, list("#2E5E69", "#60A2A8", "#A1AFB1", rgb(0 SIGNAL_HANDLER var/obj/obj_target = target obj_target.visible_message(span_danger("[obj_target] shatters into a million pieces!")) - obj_target.flags_1 |= NODECONSTRUCT_1 // disable item spawning + obj_target.obj_flags |= NO_DECONSTRUCTION // disable item spawning obj_target.deconstruct(FALSE) // call pre-deletion specialized code -- internals release gas etc /// signal handler for COMSIG_MOVABLE_MOVED that unfreezes our target if it moves onto an open turf thats hotter than diff --git a/code/datums/elements/screentips/README.md b/code/datums/elements/screentips/README.md index b4789c50749..92a66ca9dd4 100644 --- a/code/datums/elements/screentips/README.md +++ b/code/datums/elements/screentips/README.md @@ -35,7 +35,7 @@ Example: ```dm /obj/structure/table/Initialize(mapload) - if (!(flags_1 & NODECONSTRUCT_1)) + if (!(obj_flags & NO_DECONSTRUCTION)) var/static/list/tool_behaviors = list( TOOL_SCREWDRIVER = list( SCREENTIP_CONTEXT_RMB = "Disassemble", diff --git a/code/game/machinery/_machinery.dm b/code/game/machinery/_machinery.dm index b78b3263e98..e96d17a823d 100644 --- a/code/game/machinery/_machinery.dm +++ b/code/game/machinery/_machinery.dm @@ -799,7 +799,7 @@ SEND_SIGNAL(src, COMSIG_MACHINERY_REFRESH_PARTS) /obj/machinery/proc/default_pry_open(obj/item/crowbar, close_after_pry = FALSE, open_density = FALSE, closed_density = TRUE) - . = !(state_open || panel_open || is_operational || (flags_1 & NODECONSTRUCT_1)) && crowbar.tool_behaviour == TOOL_CROWBAR + . = !(state_open || panel_open || is_operational || (obj_flags & NO_DECONSTRUCTION)) && crowbar.tool_behaviour == TOOL_CROWBAR if(!.) return crowbar.play_tool_sound(src, 50) @@ -809,14 +809,14 @@ close_machine(density_to_set = closed_density) /obj/machinery/proc/default_deconstruction_crowbar(obj/item/crowbar, ignore_panel = 0, custom_deconstruct = FALSE) - . = (panel_open || ignore_panel) && !(flags_1 & NODECONSTRUCT_1) && crowbar.tool_behaviour == TOOL_CROWBAR + . = (panel_open || ignore_panel) && !(obj_flags & NO_DECONSTRUCTION) && crowbar.tool_behaviour == TOOL_CROWBAR if(!. || custom_deconstruct) return crowbar.play_tool_sound(src, 50) deconstruct(TRUE) /obj/machinery/deconstruct(disassembled = TRUE) - if(flags_1 & NODECONSTRUCT_1) + if(obj_flags & NO_DECONSTRUCTION) return ..() //Just delete us, no need to call anything else. on_deconstruction() @@ -874,7 +874,7 @@ /obj/machinery/atom_break(damage_flag) . = ..() - if(!(machine_stat & BROKEN) && !(flags_1 & NODECONSTRUCT_1)) + if(!(machine_stat & BROKEN) && !(obj_flags & NO_DECONSTRUCTION)) set_machine_stat(machine_stat | BROKEN) SEND_SIGNAL(src, COMSIG_MACHINERY_BROKEN, damage_flag) update_appearance() @@ -921,7 +921,7 @@ qdel(atom_part) /obj/machinery/proc/default_deconstruction_screwdriver(mob/user, icon_state_open, icon_state_closed, obj/item/screwdriver) - if((flags_1 & NODECONSTRUCT_1) || screwdriver.tool_behaviour != TOOL_SCREWDRIVER) + if((obj_flags & NO_DECONSTRUCTION) || screwdriver.tool_behaviour != TOOL_SCREWDRIVER) return FALSE screwdriver.play_tool_sound(src, 50) @@ -948,7 +948,7 @@ if(!istype(replacer_tool)) return FALSE - if((flags_1 & NODECONSTRUCT_1) && !replacer_tool.works_from_distance) + if((obj_flags & NO_DECONSTRUCTION) && !replacer_tool.works_from_distance) return FALSE var/shouldplaysound = FALSE diff --git a/code/game/machinery/barsigns.dm b/code/game/machinery/barsigns.dm index 65f4ad684b8..a4bff1fa999 100644 --- a/code/game/machinery/barsigns.dm +++ b/code/game/machinery/barsigns.dm @@ -88,11 +88,11 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/barsign, 32) /obj/machinery/barsign/atom_break(damage_flag) . = ..() - if((machine_stat & BROKEN) && !(flags_1 & NODECONSTRUCT_1)) + if((machine_stat & BROKEN) && !(obj_flags & NO_DECONSTRUCTION)) set_sign(new /datum/barsign/hiddensigns/signoff) /obj/machinery/barsign/deconstruct(disassembled = TRUE) - if(!(flags_1 & NODECONSTRUCT_1)) + if(!(obj_flags & NO_DECONSTRUCTION)) if(disassembled) new disassemble_result(drop_location()) else diff --git a/code/game/machinery/camera/camera.dm b/code/game/machinery/camera/camera.dm index 42f28a8b3ee..860c708ff59 100644 --- a/code/game/machinery/camera/camera.dm +++ b/code/game/machinery/camera/camera.dm @@ -440,7 +440,7 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/camera/xray, 0) toggle_cam(null, 0) /obj/machinery/camera/deconstruct(disassembled = TRUE) - if(!(flags_1 & NODECONSTRUCT_1)) + if(!(obj_flags & NO_DECONSTRUCTION)) if(disassembled) var/obj/structure/camera_assembly/assembly = assembly_ref?.resolve() if(!assembly) diff --git a/code/game/machinery/camera/camera_assembly.dm b/code/game/machinery/camera/camera_assembly.dm index 786a2c3a39a..e684b383e36 100644 --- a/code/game/machinery/camera/camera_assembly.dm +++ b/code/game/machinery/camera/camera_assembly.dm @@ -269,7 +269,7 @@ /obj/structure/camera_assembly/deconstruct(disassembled = TRUE) - if(!(flags_1 & NODECONSTRUCT_1)) + if(!(obj_flags & NO_DECONSTRUCTION)) new /obj/item/stack/sheet/iron(loc) qdel(src) diff --git a/code/game/machinery/computer/_computer.dm b/code/game/machinery/computer/_computer.dm index 246c4b0e4a8..fd2ee08e181 100644 --- a/code/game/machinery/computer/_computer.dm +++ b/code/game/machinery/computer/_computer.dm @@ -63,7 +63,7 @@ /obj/machinery/computer/screwdriver_act(mob/living/user, obj/item/I) if(..()) return TRUE - if(circuit && !(flags_1&NODECONSTRUCT_1)) + if(circuit && !(obj_flags & NO_DECONSTRUCTION)) to_chat(user, span_notice("You start to disconnect the monitor...")) if(I.use_tool(src, user, time_to_unscrew, volume=50)) deconstruct(TRUE, user) @@ -100,7 +100,7 @@ /obj/machinery/computer/deconstruct(disassembled = TRUE, mob/user) on_deconstruction() - if(!(flags_1 & NODECONSTRUCT_1)) + if(!(obj_flags & NO_DECONSTRUCTION)) if(circuit) //no circuit, no computer frame var/obj/structure/frame/computer/A = new /obj/structure/frame/computer(src.loc) A.setDir(dir) diff --git a/code/game/machinery/computer/atmos_computers/_air_sensor.dm b/code/game/machinery/computer/atmos_computers/_air_sensor.dm index 8d56b8a2f90..66429dee8c5 100644 --- a/code/game/machinery/computer/atmos_computers/_air_sensor.dm +++ b/code/game/machinery/computer/atmos_computers/_air_sensor.dm @@ -223,7 +223,7 @@ return TOOL_ACT_TOOLTYPE_SUCCESS /obj/item/air_sensor/deconstruct(disassembled) - if(!(flags_1 & NODECONSTRUCT_1)) + if(!(obj_flags & NO_DECONSTRUCTION)) new /obj/item/analyzer(loc) new /obj/item/stack/sheet/iron(loc, 1) return ..() diff --git a/code/game/machinery/computer/buildandrepair.dm b/code/game/machinery/computer/buildandrepair.dm index d8821349a1f..64d839ccfeb 100644 --- a/code/game/machinery/computer/buildandrepair.dm +++ b/code/game/machinery/computer/buildandrepair.dm @@ -230,7 +230,7 @@ return ..() // This hotkey is BLACKLISTED since it's used by /datum/component/simple_rotation /obj/structure/frame/computer/deconstruct(disassembled = TRUE) - if(!(flags_1 & NODECONSTRUCT_1)) + if(!(obj_flags & NO_DECONSTRUCTION)) if(state == 4) new /obj/item/shard(drop_location()) new /obj/item/shard(drop_location()) diff --git a/code/game/machinery/computer/telescreen.dm b/code/game/machinery/computer/telescreen.dm index ceb3c2e923e..90e53c2f452 100644 --- a/code/game/machinery/computer/telescreen.dm +++ b/code/game/machinery/computer/telescreen.dm @@ -22,7 +22,7 @@ pixel_shift = 32 /obj/machinery/computer/security/telescreen/deconstruct(disassembled = TRUE) - if(!(flags_1 & NODECONSTRUCT_1)) + if(!(obj_flags & NO_DECONSTRUCTION)) new frame_type(loc) qdel(src) diff --git a/code/game/machinery/constructable_frame.dm b/code/game/machinery/constructable_frame.dm index 228f849b4ae..4bf0f05e632 100644 --- a/code/game/machinery/constructable_frame.dm +++ b/code/game/machinery/constructable_frame.dm @@ -15,7 +15,7 @@ /obj/structure/frame/deconstruct(disassembled = TRUE) - if(!(flags_1 & NODECONSTRUCT_1)) + if(!(obj_flags & NO_DECONSTRUCTION)) new /obj/item/stack/sheet/iron(loc, 5) if(circuit) circuit.forceMove(loc) @@ -410,7 +410,7 @@ return part /obj/structure/frame/machine/deconstruct(disassembled = TRUE) - if(!(flags_1 & NODECONSTRUCT_1)) + if(!(obj_flags & NO_DECONSTRUCTION)) if(state >= 2) new /obj/item/stack/cable_coil(loc , 5) diff --git a/code/game/machinery/dance_machine.dm b/code/game/machinery/dance_machine.dm index e49fd42e8b1..d542555af84 100644 --- a/code/game/machinery/dance_machine.dm +++ b/code/game/machinery/dance_machine.dm @@ -41,7 +41,7 @@ req_access = null anchored = TRUE resistance_flags = INDESTRUCTIBLE | LAVA_PROOF | FIRE_PROOF | UNACIDABLE | ACID_PROOF - flags_1 = NODECONSTRUCT_1 + obj_flags = NO_DECONSTRUCTION /datum/track var/song_name = "generic" @@ -92,7 +92,7 @@ return ..() /obj/machinery/jukebox/attackby(obj/item/O, mob/user, params) - if(!active && !(flags_1 & NODECONSTRUCT_1)) + if(!active && !(obj_flags & NO_DECONSTRUCTION)) if(O.tool_behaviour == TOOL_WRENCH) if(!anchored && !isinspace()) to_chat(user,span_notice("You secure [src] to the floor.")) diff --git a/code/game/machinery/deployable.dm b/code/game/machinery/deployable.dm index 9d27e2a4cc9..f8b819dd697 100644 --- a/code/game/machinery/deployable.dm +++ b/code/game/machinery/deployable.dm @@ -18,7 +18,7 @@ var/bar_material = METAL /obj/structure/barricade/deconstruct(disassembled = TRUE) - if(!(flags_1 & NODECONSTRUCT_1)) + if(!(obj_flags & NO_DECONSTRUCTION)) make_debris() qdel(src) diff --git a/code/game/machinery/digital_clock.dm b/code/game/machinery/digital_clock.dm index d0b695428af..a0dc87dba08 100644 --- a/code/game/machinery/digital_clock.dm +++ b/code/game/machinery/digital_clock.dm @@ -70,7 +70,7 @@ emag_act() /obj/machinery/digital_clock/deconstruct(disassembled = TRUE) - if(flags_1 & NODECONSTRUCT_1) + if(obj_flags & NO_DECONSTRUCTION) return if(disassembled) new /obj/item/wallframe/digital_clock(drop_location()) diff --git a/code/game/machinery/doors/airlock.dm b/code/game/machinery/doors/airlock.dm index d9359311c5e..1809725f457 100644 --- a/code/game/machinery/doors/airlock.dm +++ b/code/game/machinery/doors/airlock.dm @@ -1515,7 +1515,7 @@ /obj/machinery/door/airlock/take_damage(damage_amount, damage_type = BRUTE, damage_flag = 0, sound_effect = 1, attack_dir) if((damage_amount >= atom_integrity) && (damage_flag == BOMB)) - flags_1 |= NODECONSTRUCT_1 //If an explosive took us out, don't drop the assembly + obj_flags |= NO_DECONSTRUCTION //If an explosive took us out, don't drop the assembly . = ..() if(atom_integrity < (0.75 * max_integrity)) update_appearance() @@ -1531,7 +1531,7 @@ assembly.update_appearance() /obj/machinery/door/airlock/deconstruct(disassembled = TRUE, mob/user) - if(!(flags_1 & NODECONSTRUCT_1)) + if(!(obj_flags & NO_DECONSTRUCTION)) var/obj/structure/door_assembly/A if(assemblytype) A = new assemblytype(loc) diff --git a/code/game/machinery/doors/firedoor.dm b/code/game/machinery/doors/firedoor.dm index 59ec1a35139..1bf5d86095f 100644 --- a/code/game/machinery/doors/firedoor.dm +++ b/code/game/machinery/doors/firedoor.dm @@ -659,7 +659,7 @@ correct_state() //So we should re-evaluate our state /obj/machinery/door/firedoor/deconstruct(disassembled = TRUE) - if(!(flags_1 & NODECONSTRUCT_1)) + if(!(obj_flags & NO_DECONSTRUCTION)) var/turf/targetloc = get_turf(src) if(disassembled || prob(40)) var/obj/structure/firelock_frame/unbuilt_lock = new assemblytype(targetloc) diff --git a/code/game/machinery/doors/windowdoor.dm b/code/game/machinery/doors/windowdoor.dm index c70d7a751ed..9179dbaf94f 100644 --- a/code/game/machinery/doors/windowdoor.dm +++ b/code/game/machinery/doors/windowdoor.dm @@ -302,7 +302,7 @@ /obj/machinery/door/window/deconstruct(disassembled = TRUE) - if(!(flags_1 & NODECONSTRUCT_1) && !disassembled) + if(!(obj_flags & NO_DECONSTRUCTION) && !disassembled) for(var/i in 1 to shards) drop_debris(new /obj/item/shard(src)) if(rods) @@ -346,7 +346,7 @@ /obj/machinery/door/window/screwdriver_act(mob/living/user, obj/item/tool) . = ..() - if(flags_1 & NODECONSTRUCT_1) + if(obj_flags & NO_DECONSTRUCTION) return if(density || operating) to_chat(user, span_warning("You need to open the door to access the maintenance panel!")) @@ -359,7 +359,7 @@ /obj/machinery/door/window/crowbar_act(mob/living/user, obj/item/tool) . = ..() - if(flags_1 & NODECONSTRUCT_1) + if(obj_flags & NO_DECONSTRUCTION) return if(!panel_open || density || operating) return diff --git a/code/game/machinery/droneDispenser.dm b/code/game/machinery/droneDispenser.dm index 4a3e7e2bd69..3b78d6bb0b1 100644 --- a/code/game/machinery/droneDispenser.dm +++ b/code/game/machinery/droneDispenser.dm @@ -262,7 +262,7 @@ playsound(src, break_sound, 50, TRUE) /obj/machinery/drone_dispenser/deconstruct(disassembled = TRUE) - if(!(flags_1 & NODECONSTRUCT_1)) + if(!(obj_flags & NO_DECONSTRUCTION)) new /obj/item/stack/sheet/iron(loc, 5) qdel(src) diff --git a/code/game/machinery/firealarm.dm b/code/game/machinery/firealarm.dm index e69ccf5edf0..7145e8b86a1 100644 --- a/code/game/machinery/firealarm.dm +++ b/code/game/machinery/firealarm.dm @@ -453,7 +453,7 @@ return ..() /obj/machinery/firealarm/deconstruct(disassembled = TRUE) - if(!(flags_1 & NODECONSTRUCT_1)) + if(!(obj_flags & NO_DECONSTRUCTION)) new /obj/item/stack/sheet/iron(loc, 1) if(buildstage > FIRE_ALARM_BUILD_NO_CIRCUIT) var/obj/item/item = new /obj/item/electronics/firealarm(loc) diff --git a/code/game/machinery/flasher.dm b/code/game/machinery/flasher.dm index 8075b51dcab..efe28051a21 100644 --- a/code/game/machinery/flasher.dm +++ b/code/game/machinery/flasher.dm @@ -145,7 +145,7 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/flasher, 26) power_change() /obj/machinery/flasher/deconstruct(disassembled = TRUE) - if(!(flags_1 & NODECONSTRUCT_1)) + if(!(obj_flags & NO_DECONSTRUCTION)) if(bulb) bulb.forceMove(loc) if(disassembled) diff --git a/code/game/machinery/harvester.dm b/code/game/machinery/harvester.dm index 2d34c6214f3..612277d5784 100644 --- a/code/game/machinery/harvester.dm +++ b/code/game/machinery/harvester.dm @@ -171,7 +171,7 @@ return TRUE /obj/machinery/harvester/default_pry_open(obj/item/tool) //wew - . = !(state_open || panel_open || (flags_1 & NODECONSTRUCT_1)) && tool.tool_behaviour == TOOL_CROWBAR //We removed is_operational here + . = !(state_open || panel_open || (obj_flags & NO_DECONSTRUCTION)) && tool.tool_behaviour == TOOL_CROWBAR //We removed is_operational here if(.) tool.play_tool_sound(src, 50) visible_message(span_notice("[usr] pries open \the [src]."), span_notice("You pry open [src].")) diff --git a/code/game/machinery/hologram.dm b/code/game/machinery/hologram.dm index 4104d7b93f8..39197c7cb86 100644 --- a/code/game/machinery/hologram.dm +++ b/code/game/machinery/hologram.dm @@ -123,7 +123,7 @@ Possible to do for anyone motivated enough: /obj/machinery/holopad/tutorial resistance_flags = INDESTRUCTIBLE | LAVA_PROOF | FIRE_PROOF | UNACIDABLE | ACID_PROOF - flags_1 = NODECONSTRUCT_1 + obj_flags = NO_DECONSTRUCTION on_network = FALSE ///Proximity monitor associated with this atom, needed for proximity checks. var/datum/proximity_monitor/proximity_monitor diff --git a/code/game/machinery/igniter.dm b/code/game/machinery/igniter.dm index 060b29c4d20..bd5bf3b0109 100644 --- a/code/game/machinery/igniter.dm +++ b/code/game/machinery/igniter.dm @@ -56,7 +56,7 @@ return TOOL_ACT_TOOLTYPE_SUCCESS /obj/machinery/igniter/deconstruct(disassembled) - if(!(flags_1 & NODECONSTRUCT_1)) + if(!(obj_flags & NO_DECONSTRUCTION)) new /obj/item/stack/sheet/iron(loc, 5) new /obj/item/assembly/igniter(loc) return ..() @@ -201,7 +201,7 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/sparker, 26) return TOOL_ACT_TOOLTYPE_SUCCESS /obj/machinery/sparker/deconstruct(disassembled) - if(!(flags_1 & NODECONSTRUCT_1)) + if(!(obj_flags & NO_DECONSTRUCTION)) new /obj/item/wallframe/sparker(loc) return ..() diff --git a/code/game/machinery/incident_display.dm b/code/game/machinery/incident_display.dm index 9e6a3fe8124..63418e4457e 100644 --- a/code/game/machinery/incident_display.dm +++ b/code/game/machinery/incident_display.dm @@ -165,7 +165,7 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/incident_display/tram, 32) update_appearance() /obj/machinery/incident_display/deconstruct() - if(flags_1 & NODECONSTRUCT_1) + if(obj_flags & NO_DECONSTRUCTION) return new /obj/item/stack/sheet/mineral/titanium(drop_location(), 2) diff --git a/code/game/machinery/iv_drip.dm b/code/game/machinery/iv_drip.dm index 5b1c0e35a84..25e963ad6d5 100644 --- a/code/game/machinery/iv_drip.dm +++ b/code/game/machinery/iv_drip.dm @@ -218,7 +218,7 @@ set_transfer_rate(transfer_rate > MIN_IV_TRANSFER_RATE ? MIN_IV_TRANSFER_RATE : MAX_IV_TRANSFER_RATE) /obj/machinery/iv_drip/deconstruct(disassembled = TRUE) - if(!(flags_1 & NODECONSTRUCT_1)) + if(!(obj_flags & NO_DECONSTRUCTION)) new /obj/item/stack/sheet/iron(loc) qdel(src) diff --git a/code/game/machinery/lightswitch.dm b/code/game/machinery/lightswitch.dm index 6e16beb494e..238f0db3f19 100644 --- a/code/game/machinery/lightswitch.dm +++ b/code/game/machinery/lightswitch.dm @@ -106,7 +106,7 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/light_switch, 26) power_change() /obj/machinery/light_switch/deconstruct(disassembled = TRUE) - if(!(flags_1 & NODECONSTRUCT_1)) + if(!(obj_flags & NO_DECONSTRUCTION)) new /obj/item/wallframe/light_switch(loc) qdel(src) diff --git a/code/game/machinery/limbgrower.dm b/code/game/machinery/limbgrower.dm index 75976f98be3..caedf9fffeb 100644 --- a/code/game/machinery/limbgrower.dm +++ b/code/game/machinery/limbgrower.dm @@ -283,7 +283,7 @@ /obj/machinery/limbgrower/fullupgrade //Inherently cheaper organ production. This is to NEVER be inherently emagged, no valids. desc = "It grows new limbs using Synthflesh. This alien model seems more efficient." - flags_1 = NODECONSTRUCT_1 + obj_flags = NO_DECONSTRUCTION circuit = /obj/item/circuitboard/machine/limbgrower/fullupgrade /obj/machinery/limbgrower/fullupgrade/Initialize(mapload) diff --git a/code/game/machinery/newscaster/newscaster_machine.dm b/code/game/machinery/newscaster/newscaster_machine.dm index fc908a98840..a3ab8523037 100644 --- a/code/game/machinery/newscaster/newscaster_machine.dm +++ b/code/game/machinery/newscaster/newscaster_machine.dm @@ -534,7 +534,7 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/newscaster, 30) /obj/machinery/newscaster/deconstruct(disassembled = TRUE) - if(!(flags_1 & NODECONSTRUCT_1)) + if(!(obj_flags & NO_DECONSTRUCTION)) new /obj/item/stack/sheet/iron(loc, 2) new /obj/item/shard(loc) new /obj/item/shard(loc) diff --git a/code/game/machinery/recycler.dm b/code/game/machinery/recycler.dm index 9e7c53392d5..e78cdc56392 100644 --- a/code/game/machinery/recycler.dm +++ b/code/game/machinery/recycler.dm @@ -236,9 +236,8 @@ /obj/machinery/recycler/deathtrap name = "dangerous old crusher" - obj_flags = CAN_BE_HIT | EMAGGED + obj_flags = CAN_BE_HIT | EMAGGED | NO_DECONSTRUCTION crush_damage = 120 - flags_1 = NODECONSTRUCT_1 /obj/item/paper/guides/recycler name = "paper - 'garbage duty instructions'" diff --git a/code/game/machinery/requests_console.dm b/code/game/machinery/requests_console.dm index dbdf86dac37..ea02d1ab78e 100644 --- a/code/game/machinery/requests_console.dm +++ b/code/game/machinery/requests_console.dm @@ -395,7 +395,7 @@ GLOBAL_LIST_EMPTY(req_console_ckey_departments) return ..() /obj/machinery/requests_console/deconstruct(disassembled = TRUE) - if(!(flags_1 & NODECONSTRUCT_1)) + if(!(obj_flags & NO_DECONSTRUCTION)) new /obj/item/wallframe/requests_console(loc) qdel(src) diff --git a/code/game/machinery/sleepers.dm b/code/game/machinery/sleepers.dm index f4a3ca9fc77..42a6c0d1948 100644 --- a/code/game/machinery/sleepers.dm +++ b/code/game/machinery/sleepers.dm @@ -147,7 +147,7 @@ return FALSE /obj/machinery/sleeper/default_pry_open(obj/item/I) //wew - . = !(state_open || panel_open || (flags_1 & NODECONSTRUCT_1)) && I.tool_behaviour == TOOL_CROWBAR + . = !(state_open || panel_open || (obj_flags & NO_DECONSTRUCTION)) && I.tool_behaviour == TOOL_CROWBAR if(.) I.play_tool_sound(src, 50) visible_message(span_notice("[usr] pries open [src]."), span_notice("You pry open [src].")) diff --git a/code/game/machinery/status_display.dm b/code/game/machinery/status_display.dm index 3f905965495..24c0ac8bda5 100644 --- a/code/game/machinery/status_display.dm +++ b/code/game/machinery/status_display.dm @@ -73,7 +73,7 @@ return TRUE /obj/machinery/status_display/deconstruct(disassembled = TRUE) - if(flags_1 & NODECONSTRUCT_1) + if(obj_flags & NO_DECONSTRUCTION) return if(!disassembled) new /obj/item/stack/sheet/iron(drop_location(), 2) diff --git a/code/game/machinery/suit_storage_unit.dm b/code/game/machinery/suit_storage_unit.dm index eb0b51c9421..0bf6bf7872d 100644 --- a/code/game/machinery/suit_storage_unit.dm +++ b/code/game/machinery/suit_storage_unit.dm @@ -308,7 +308,7 @@ set_occupant(null) /obj/machinery/suit_storage_unit/deconstruct(disassembled = TRUE) - if(!(flags_1 & NODECONSTRUCT_1)) + if(!(obj_flags & NO_DECONSTRUCTION)) open_machine() dump_inventory_contents() if(card_reader_installed) @@ -794,21 +794,21 @@ causes the SSU to break due to state_open being set to TRUE at the end, and the panel becoming inaccessible. */ /obj/machinery/suit_storage_unit/default_deconstruction_screwdriver(mob/user, icon_state_open, icon_state_closed, obj/item/screwdriver) - if(!(flags_1 & NODECONSTRUCT_1) && screwdriver.tool_behaviour == TOOL_SCREWDRIVER && (uv || locked)) + if(!(obj_flags & NO_DECONSTRUCTION) && screwdriver.tool_behaviour == TOOL_SCREWDRIVER && (uv || locked)) to_chat(user, span_warning("You cant open the panel while its [locked ? "locked" : "decontaminating"]")) return TRUE return ..() /obj/machinery/suit_storage_unit/default_pry_open(obj/item/crowbar)//needs to check if the storage is locked. - . = !(state_open || panel_open || is_operational || locked || (flags_1 & NODECONSTRUCT_1)) && crowbar.tool_behaviour == TOOL_CROWBAR + . = !(state_open || panel_open || is_operational || locked || (obj_flags & NO_DECONSTRUCTION)) && crowbar.tool_behaviour == TOOL_CROWBAR if(.) crowbar.play_tool_sound(src, 50) visible_message(span_notice("[usr] pries open \the [src]."), span_notice("You pry open \the [src].")) open_machine() /obj/machinery/suit_storage_unit/default_deconstruction_crowbar(obj/item/crowbar, ignore_panel, custom_deconstruct) - . = (!locked && panel_open && !(flags_1 & NODECONSTRUCT_1) && crowbar.tool_behaviour == TOOL_CROWBAR) + . = (!locked && panel_open && !(obj_flags & NO_DECONSTRUCTION) && crowbar.tool_behaviour == TOOL_CROWBAR) if(.) return ..() diff --git a/code/game/machinery/telecomms/machines/allinone.dm b/code/game/machinery/telecomms/machines/allinone.dm index 22612118033..dd1e4a3f610 100644 --- a/code/game/machinery/telecomms/machines/allinone.dm +++ b/code/game/machinery/telecomms/machines/allinone.dm @@ -20,7 +20,7 @@ /obj/machinery/telecomms/allinone/indestructible resistance_flags = INDESTRUCTIBLE | LAVA_PROOF | FIRE_PROOF | UNACIDABLE | ACID_PROOF - flags_1 = NODECONSTRUCT_1 + obj_flags = NO_DECONSTRUCTION /obj/machinery/telecomms/allinone/receive_signal(datum/signal/subspace/signal) if(!istype(signal) || signal.transmission_method != TRANSMISSION_SUBSPACE) // receives on subspace only diff --git a/code/game/machinery/washing_machine.dm b/code/game/machinery/washing_machine.dm index 796c997e4a0..c561028746e 100644 --- a/code/game/machinery/washing_machine.dm +++ b/code/game/machinery/washing_machine.dm @@ -416,7 +416,7 @@ GLOBAL_LIST_INIT(dye_registry, list( return attack_hand_secondary(user, modifiers) /obj/machinery/washing_machine/deconstruct(disassembled = TRUE) - if (!(flags_1 & NODECONSTRUCT_1)) + if (!(obj_flags & NO_DECONSTRUCTION)) new /obj/item/stack/sheet/iron(drop_location(), 2) qdel(src) diff --git a/code/game/objects/items/cardboard_cutouts.dm b/code/game/objects/items/cardboard_cutouts.dm index d86f386950c..f58ea90211d 100644 --- a/code/game/objects/items/cardboard_cutouts.dm +++ b/code/game/objects/items/cardboard_cutouts.dm @@ -72,7 +72,7 @@ push_over() /obj/item/cardboard_cutout/deconstruct(disassembled) - if(!(flags_1 & (HOLOGRAM_1|NODECONSTRUCT_1))) + if(!(flags_1 & HOLOGRAM_1) || !(obj_flags & NO_DECONSTRUCTION)) new /obj/item/stack/sheet/cardboard(loc, 1) return ..() diff --git a/code/game/objects/items/surgery_tray.dm b/code/game/objects/items/surgery_tray.dm index edd92522446..680698e3318 100644 --- a/code/game/objects/items/surgery_tray.dm +++ b/code/game/objects/items/surgery_tray.dm @@ -177,7 +177,7 @@ tool.forceMove(drop_point) /obj/item/surgery_tray/deconstruct(disassembled = TRUE) - if(!(flags_1 & NODECONSTRUCT_1)) + if(!(obj_flags & NO_DECONSTRUCTION)) dump_contents() new /obj/item/stack/rods(drop_location(), 2) new /obj/item/stack/sheet/mineral/silver(drop_location()) diff --git a/code/game/objects/objs.dm b/code/game/objects/objs.dm index d9f22e2cf4f..91f1ca925ab 100644 --- a/code/game/objects/objs.dm +++ b/code/game/objects/objs.dm @@ -380,7 +380,7 @@ GLOBAL_LIST_EMPTY(objects_by_id_tag) /// Try to unwrench an object in a WONDERFUL DYNAMIC WAY /obj/proc/default_unfasten_wrench(mob/user, obj/item/wrench, time = 20) - if((flags_1 & NODECONSTRUCT_1) || wrench.tool_behaviour != TOOL_WRENCH) + if((obj_flags & NO_DECONSTRUCTION) || wrench.tool_behaviour != TOOL_WRENCH) return CANT_UNFASTEN var/turf/ground = get_turf(src) diff --git a/code/game/objects/structures/aliens.dm b/code/game/objects/structures/aliens.dm index e1138d4696f..e637ecc274e 100644 --- a/code/game/objects/structures/aliens.dm +++ b/code/game/objects/structures/aliens.dm @@ -42,7 +42,7 @@ icon_state = "gelmound" /obj/structure/alien/gelpod/deconstruct(disassembled = TRUE) - if(!(flags_1 & NODECONSTRUCT_1)) + if(!(obj_flags & NO_DECONSTRUCTION)) new /obj/effect/mob_spawn/corpse/human/damaged(get_turf(src)) qdel(src) @@ -447,7 +447,7 @@ /obj/structure/alien/egg/atom_break(damage_flag) . = ..() - if(!(flags_1 & NODECONSTRUCT_1)) + if(!(obj_flags & NO_DECONSTRUCTION)) if(status != BURST) Burst(kill=TRUE) diff --git a/code/game/objects/structures/beds_chairs/alien_nest.dm b/code/game/objects/structures/beds_chairs/alien_nest.dm index 09ce802c547..fee4703d117 100644 --- a/code/game/objects/structures/beds_chairs/alien_nest.dm +++ b/code/game/objects/structures/beds_chairs/alien_nest.dm @@ -12,7 +12,7 @@ smoothing_groups = SMOOTH_GROUP_ALIEN_NEST canSmoothWith = SMOOTH_GROUP_ALIEN_NEST build_stack_type = null - flags_1 = NODECONSTRUCT_1 + obj_flags = NO_DECONSTRUCTION elevation = 0 var/static/mutable_appearance/nest_overlay = mutable_appearance('icons/mob/nonhuman-player/alien.dmi', "nestoverlay", LYING_MOB_LAYER) diff --git a/code/game/objects/structures/beds_chairs/bed.dm b/code/game/objects/structures/beds_chairs/bed.dm index 08543558643..0eeb8ee15b2 100644 --- a/code/game/objects/structures/beds_chairs/bed.dm +++ b/code/game/objects/structures/beds_chairs/bed.dm @@ -34,12 +34,12 @@ /obj/structure/bed/examine(mob/user) . = ..() - if(!(flags_1 & NODECONSTRUCT_1)) + if(!(obj_flags & NO_DECONSTRUCTION)) . += span_notice("It's held together by a couple of bolts.") /obj/structure/bed/add_context(atom/source, list/context, obj/item/held_item, mob/living/user) if(held_item) - if(held_item.tool_behaviour != TOOL_WRENCH || flags_1 & NODECONSTRUCT_1) + if(held_item.tool_behaviour != TOOL_WRENCH || obj_flags & NO_DECONSTRUCTION) return context[SCREENTIP_CONTEXT_RMB] = "Dismantle" @@ -50,7 +50,7 @@ return CONTEXTUAL_SCREENTIP_SET /obj/structure/bed/deconstruct(disassembled = TRUE) - if(!(flags_1 & NODECONSTRUCT_1)) + if(!(obj_flags & NO_DECONSTRUCTION)) if(build_stack_type) new build_stack_type(loc, build_stack_amount) ..() @@ -59,7 +59,7 @@ return attack_hand(user, modifiers) /obj/structure/bed/wrench_act_secondary(mob/living/user, obj/item/weapon) - if(flags_1 & NODECONSTRUCT_1) + if(obj_flags & NO_DECONSTRUCTION) return TRUE ..() diff --git a/code/game/objects/structures/beds_chairs/chair.dm b/code/game/objects/structures/beds_chairs/chair.dm index ddb588db782..6dd9c6cd2c7 100644 --- a/code/game/objects/structures/beds_chairs/chair.dm +++ b/code/game/objects/structures/beds_chairs/chair.dm @@ -38,7 +38,7 @@ /obj/structure/chair/deconstruct(disassembled) // If we have materials, and don't have the NOCONSTRUCT flag - if(!(flags_1 & NODECONSTRUCT_1)) + if(!(obj_flags & NO_DECONSTRUCTION)) if(buildstacktype) new buildstacktype(loc,buildstackamount) else @@ -56,7 +56,7 @@ qdel(src) /obj/structure/chair/attackby(obj/item/W, mob/user, params) - if(flags_1 & NODECONSTRUCT_1) + if(obj_flags & NO_DECONSTRUCTION) return . = ..() if(istype(W, /obj/item/assembly/shock_kit) && !HAS_TRAIT(src, TRAIT_ELECTRIFIED_BUCKLE)) electrify_self(W, user) @@ -85,7 +85,7 @@ /obj/structure/chair/wrench_act_secondary(mob/living/user, obj/item/weapon) - if(flags_1&NODECONSTRUCT_1) + if(obj_flags & NO_DECONSTRUCTION) return TRUE ..() weapon.play_tool_sound(src) @@ -282,7 +282,7 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/structure/chair/stool, 0) /obj/structure/chair/MouseDrop(over_object, src_location, over_location) . = ..() if(over_object == usr && Adjacent(usr)) - if(!item_chair || has_buckled_mobs() || src.flags_1 & NODECONSTRUCT_1) + if(!item_chair || has_buckled_mobs() || src.obj_flags & NO_DECONSTRUCTION) return if(!usr.can_perform_action(src, NEED_DEXTERITY|NEED_HANDS)) return @@ -495,7 +495,7 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/structure/chair/stool/bar, 0) icon_state = null buildstacktype = null item_chair = null - flags_1 = NODECONSTRUCT_1 + obj_flags = NO_DECONSTRUCTION alpha = 0 /obj/structure/chair/mime/post_buckle_mob(mob/living/M) diff --git a/code/game/objects/structures/bedsheet_bin.dm b/code/game/objects/structures/bedsheet_bin.dm index 493268620a9..7a283e38639 100644 --- a/code/game/objects/structures/bedsheet_bin.dm +++ b/code/game/objects/structures/bedsheet_bin.dm @@ -646,7 +646,7 @@ LINEN BINS ..() /obj/structure/bedsheetbin/screwdriver_act(mob/living/user, obj/item/tool) - if(flags_1 & NODECONSTRUCT_1) + if(obj_flags & NO_DECONSTRUCTION) return FALSE if(amount) to_chat(user, span_warning("The [src] must be empty first!")) diff --git a/code/game/objects/structures/crates_lockers/closets.dm b/code/game/objects/structures/crates_lockers/closets.dm index 97d8e5296c2..f390179ce13 100644 --- a/code/game/objects/structures/crates_lockers/closets.dm +++ b/code/game/objects/structures/crates_lockers/closets.dm @@ -536,7 +536,7 @@ GLOBAL_LIST_EMPTY(roundstart_station_closets) return open(user) /obj/structure/closet/deconstruct(disassembled = TRUE) - if (!(flags_1 & NODECONSTRUCT_1)) + if (!(obj_flags & NO_DECONSTRUCTION)) if(ispath(material_drop) && material_drop_amount) new material_drop(loc, material_drop_amount) if (secure) @@ -553,7 +553,7 @@ GLOBAL_LIST_EMPTY(roundstart_station_closets) /obj/structure/closet/atom_break(damage_flag) . = ..() - if(!broken && !(flags_1 & NODECONSTRUCT_1)) + if(!broken && !(obj_flags & NO_DECONSTRUCTION)) bust_open() /obj/structure/closet/CheckParts(list/parts_list) diff --git a/code/game/objects/structures/crates_lockers/closets/secure/freezer.dm b/code/game/objects/structures/crates_lockers/closets/secure/freezer.dm index a13e4dc699a..48424982fb9 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/freezer.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/freezer.dm @@ -37,7 +37,7 @@ return FALSE /obj/structure/closet/secure_closet/freezer/deconstruct(disassembled) - if (!(flags_1 & NODECONSTRUCT_1)) + if (!(obj_flags & NO_DECONSTRUCTION)) new /obj/item/assembly/igniter/condenser(drop_location()) . = ..() diff --git a/code/game/objects/structures/destructible_structures.dm b/code/game/objects/structures/destructible_structures.dm index 5c515f54688..f33c99b681a 100644 --- a/code/game/objects/structures/destructible_structures.dm +++ b/code/game/objects/structures/destructible_structures.dm @@ -6,7 +6,7 @@ /obj/structure/destructible/deconstruct(disassembled = TRUE) if(!disassembled) - if(!(flags_1 & NODECONSTRUCT_1)) + if(!(obj_flags & NO_DECONSTRUCTION)) if(islist(debris)) for(var/I in debris) for(var/i in 1 to debris[I]) diff --git a/code/game/objects/structures/displaycase.dm b/code/game/objects/structures/displaycase.dm index 8ebc0feb0d5..3721d198a17 100644 --- a/code/game/objects/structures/displaycase.dm +++ b/code/game/objects/structures/displaycase.dm @@ -82,7 +82,7 @@ playsound(src, 'sound/items/welder.ogg', 100, TRUE) /obj/structure/displaycase/deconstruct(disassembled = TRUE) - if(!(flags_1 & NODECONSTRUCT_1)) + if(!(obj_flags & NO_DECONSTRUCTION)) dump() if(!disassembled) new /obj/item/shard(drop_location()) @@ -91,7 +91,7 @@ /obj/structure/displaycase/atom_break(damage_flag) . = ..() - if(!broken && !(flags_1 & NODECONSTRUCT_1)) + if(!broken && !(obj_flags & NO_DECONSTRUCTION)) set_density(FALSE) broken = TRUE new /obj/item/shard(drop_location()) @@ -673,7 +673,7 @@ /obj/structure/displaycase/forsale/atom_break(damage_flag) . = ..() - if(!broken && !(flags_1 & NODECONSTRUCT_1)) + if(!broken && !(obj_flags & NO_DECONSTRUCTION)) broken = TRUE playsound(src, SFX_SHATTER, 70, TRUE) update_appearance() diff --git a/code/game/objects/structures/door_assembly.dm b/code/game/objects/structures/door_assembly.dm index e90567a3318..de996015e59 100644 --- a/code/game/objects/structures/door_assembly.dm +++ b/code/game/objects/structures/door_assembly.dm @@ -363,7 +363,7 @@ qdel(source) /obj/structure/door_assembly/deconstruct(disassembled = TRUE) - if(!(flags_1 & NODECONSTRUCT_1)) + if(!(obj_flags & NO_DECONSTRUCTION)) var/turf/T = get_turf(src) if(!disassembled) material_amt = rand(2,4) diff --git a/code/game/objects/structures/door_assembly_types.dm b/code/game/objects/structures/door_assembly_types.dm index 74a77443b28..36b41fbc326 100644 --- a/code/game/objects/structures/door_assembly_types.dm +++ b/code/game/objects/structures/door_assembly_types.dm @@ -272,7 +272,7 @@ base_name = "large public airlock" /obj/structure/door_assembly/door_assembly_material/deconstruct(disassembled = TRUE) - if(!(flags_1 & NODECONSTRUCT_1)) + if(!(obj_flags & NO_DECONSTRUCTION)) var/turf/T = get_turf(src) for(var/material in custom_materials) var/datum/material/material_datum = material diff --git a/code/game/objects/structures/dresser.dm b/code/game/objects/structures/dresser.dm index a6de88c5f8a..9232a992a5b 100644 --- a/code/game/objects/structures/dresser.dm +++ b/code/game/objects/structures/dresser.dm @@ -19,7 +19,7 @@ return ..() /obj/structure/dresser/deconstruct(disassembled = TRUE) - if(!(flags_1 & NODECONSTRUCT_1)) + if(!(obj_flags & NO_DECONSTRUCTION)) new /obj/item/stack/sheet/mineral/wood(drop_location(), 10) qdel(src) diff --git a/code/game/objects/structures/extinguisher.dm b/code/game/objects/structures/extinguisher.dm index 56d9147867d..71166a840df 100644 --- a/code/game/objects/structures/extinguisher.dm +++ b/code/game/objects/structures/extinguisher.dm @@ -163,7 +163,7 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/structure/extinguisher_cabinet, 29) /obj/structure/extinguisher_cabinet/atom_break(damage_flag) . = ..() - if(!broken && !(flags_1 & NODECONSTRUCT_1)) + if(!broken && !(obj_flags & NO_DECONSTRUCTION)) broken = 1 opened = 1 if(stored_extinguisher) @@ -173,7 +173,7 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/structure/extinguisher_cabinet, 29) /obj/structure/extinguisher_cabinet/deconstruct(disassembled = TRUE) - if(!(flags_1 & NODECONSTRUCT_1)) + if(!(obj_flags & NO_DECONSTRUCTION)) if(disassembled) new /obj/item/wallframe/extinguisher_cabinet(loc) else diff --git a/code/game/objects/structures/false_walls.dm b/code/game/objects/structures/false_walls.dm index 921140f1db0..a17c47a94e4 100644 --- a/code/game/objects/structures/false_walls.dm +++ b/code/game/objects/structures/false_walls.dm @@ -134,7 +134,7 @@ deconstruct(disassembled) /obj/structure/falsewall/deconstruct(disassembled = TRUE) - if(!(flags_1 & NODECONSTRUCT_1)) + if(!(obj_flags & NO_DECONSTRUCTION)) if(disassembled) new girder_type(loc) if(mineral_amount) @@ -388,7 +388,7 @@ material_flags = MATERIAL_EFFECTS | MATERIAL_ADD_PREFIX | MATERIAL_COLOR | MATERIAL_AFFECT_STATISTICS /obj/structure/falsewall/material/deconstruct(disassembled = TRUE) - if(!(flags_1 & NODECONSTRUCT_1)) + if(!(obj_flags & NO_DECONSTRUCTION)) if(disassembled) new girder_type(loc) for(var/material in custom_materials) diff --git a/code/game/objects/structures/fans.dm b/code/game/objects/structures/fans.dm index 263a41d970f..ef34a07b5b6 100644 --- a/code/game/objects/structures/fans.dm +++ b/code/game/objects/structures/fans.dm @@ -11,14 +11,14 @@ can_atmos_pass = ATMOS_PASS_NO /obj/structure/fans/deconstruct() - if(!(flags_1 & NODECONSTRUCT_1)) + if(!(obj_flags & NO_DECONSTRUCTION)) if(buildstacktype) new buildstacktype(loc,buildstackamount) qdel(src) /obj/structure/fans/wrench_act(mob/living/user, obj/item/I) ..() - if(flags_1 & NODECONSTRUCT_1) + if(obj_flags & NO_DECONSTRUCTION) return TRUE user.visible_message(span_warning("[user] disassembles [src]."), diff --git a/code/game/objects/structures/fireaxe.dm b/code/game/objects/structures/fireaxe.dm index 31ba1cd47aa..ab7d410f096 100644 --- a/code/game/objects/structures/fireaxe.dm +++ b/code/game/objects/structures/fireaxe.dm @@ -108,7 +108,7 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/structure/fireaxecabinet, 32) /obj/structure/fireaxecabinet/atom_break(damage_flag) . = ..() - if(!broken && !(flags_1 & NODECONSTRUCT_1)) + if(!broken && !(obj_flags & NO_DECONSTRUCTION)) update_appearance() broken = TRUE playsound(src, 'sound/effects/glassbr3.ogg', 100, TRUE) @@ -116,7 +116,7 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/structure/fireaxecabinet, 32) new /obj/item/shard(loc) /obj/structure/fireaxecabinet/deconstruct(disassembled = TRUE) - if(!(flags_1 & NODECONSTRUCT_1)) + if(!(obj_flags & NO_DECONSTRUCTION)) if(held_item && loc) held_item.forceMove(loc) new /obj/item/wallframe/fireaxecabinet(loc) @@ -231,7 +231,7 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/structure/fireaxecabinet/empty, 32) MAPPING_DIRECTIONAL_HELPERS(/obj/structure/fireaxecabinet/mechremoval, 32) /obj/structure/fireaxecabinet/mechremoval/deconstruct(disassembled = TRUE) - if(!(flags_1 & NODECONSTRUCT_1)) + if(!(obj_flags & NO_DECONSTRUCTION)) if(held_item && loc) held_item.forceMove(loc) new /obj/item/wallframe/fireaxecabinet/mechremoval(loc) diff --git a/code/game/objects/structures/flora.dm b/code/game/objects/structures/flora.dm index 5d75f9cb02d..d64e658273f 100644 --- a/code/game/objects/structures/flora.dm +++ b/code/game/objects/structures/flora.dm @@ -264,7 +264,7 @@ transform = M.Turn(-previous_rotation) /obj/structure/flora/deconstruct() - if(!(flags_1 & NODECONSTRUCT_1)) + if(!(obj_flags & NO_DECONSTRUCTION)) if(harvested) return ..() @@ -446,7 +446,7 @@ name = "xmas tree" desc = "A wondrous decorated Christmas tree." icon_state = "pine_c" - flags_1 = NODECONSTRUCT_1 //protected by the christmas spirit + obj_flags = NO_DECONSTRUCTION //protected by the christmas spirit /obj/structure/flora/tree/pine/xmas/presents icon_state = "pinepresents" diff --git a/code/game/objects/structures/girders.dm b/code/game/objects/structures/girders.dm index 29381e2fe9e..d5cc2cb177f 100644 --- a/code/game/objects/structures/girders.dm +++ b/code/game/objects/structures/girders.dm @@ -384,7 +384,7 @@ return FALSE /obj/structure/girder/deconstruct(disassembled = TRUE) - if(!(flags_1 & NODECONSTRUCT_1)) + if(!(obj_flags & NO_DECONSTRUCTION)) var/remains = pick(/obj/item/stack/rods, /obj/item/stack/sheet/iron) new remains(loc) qdel(src) @@ -462,7 +462,7 @@ return /obj/structure/girder/cult/deconstruct(disassembled = TRUE) - if(!(flags_1 & NODECONSTRUCT_1)) + if(!(obj_flags & NO_DECONSTRUCTION)) new /obj/item/stack/sheet/runed_metal(drop_location(), 1) qdel(src) diff --git a/code/game/objects/structures/grille.dm b/code/game/objects/structures/grille.dm index 68067263d58..c5cb790d0a8 100644 --- a/code/game/objects/structures/grille.dm +++ b/code/game/objects/structures/grille.dm @@ -52,7 +52,7 @@ /obj/structure/grille/examine(mob/user) . = ..() - if(flags_1 & NODECONSTRUCT_1) + if(obj_flags & NO_DECONSTRUCTION) return if(anchored) @@ -200,7 +200,7 @@ add_fingerprint(user) if(shock(user, 100)) return - if(flags_1 & NODECONSTRUCT_1) + if(obj_flags & NO_DECONSTRUCTION) return FALSE tool.play_tool_sound(src, 100) deconstruct() @@ -212,7 +212,7 @@ add_fingerprint(user) if(shock(user, 90)) return FALSE - if(flags_1 & NODECONSTRUCT_1) + if(obj_flags & NO_DECONSTRUCTION) return FALSE if(!tool.use_tool(src, user, 0, volume=100)) return FALSE @@ -299,7 +299,7 @@ /obj/structure/grille/deconstruct(disassembled = TRUE) if(!loc) //if already qdel'd somehow, we do nothing return - if(!(flags_1&NODECONSTRUCT_1)) + if(!(obj_flags & NO_DECONSTRUCTION)) var/obj/R = new rods_type(drop_location(), rods_amount) transfer_fingerprints_to(R) qdel(src) @@ -307,7 +307,7 @@ /obj/structure/grille/atom_break() . = ..() - if(!broken && !(flags_1 & NODECONSTRUCT_1)) + if(!broken && !(obj_flags & NO_DECONSTRUCTION)) icon_state = "brokengrille" set_density(FALSE) atom_integrity = 20 diff --git a/code/game/objects/structures/lattice.dm b/code/game/objects/structures/lattice.dm index e5eabc5defa..d9653378c62 100644 --- a/code/game/objects/structures/lattice.dm +++ b/code/game/objects/structures/lattice.dm @@ -58,7 +58,7 @@ return T.attackby(C, user) //hand this off to the turf instead (for building plating, catwalks, etc) /obj/structure/lattice/deconstruct(disassembled = TRUE) - if(!(flags_1 & NODECONSTRUCT_1)) + if(!(obj_flags & NO_DECONSTRUCTION)) new build_material(get_turf(src), number_of_mats) qdel(src) diff --git a/code/game/objects/structures/maintenance.dm b/code/game/objects/structures/maintenance.dm index e907a23cd67..78a67198fef 100644 --- a/code/game/objects/structures/maintenance.dm +++ b/code/game/objects/structures/maintenance.dm @@ -305,7 +305,7 @@ at the cost of risking a vicious bite.**/ return TRUE /obj/structure/steam_vent/deconstruct(disassembled = TRUE) - if(!(flags_1 & NODECONSTRUCT_1)) + if(!(obj_flags & NO_DECONSTRUCTION)) new /obj/item/stack/sheet/iron(loc, 1) new /obj/item/stock_parts/water_recycler(loc, 1) qdel(src) diff --git a/code/game/objects/structures/mirror.dm b/code/game/objects/structures/mirror.dm index 59ecf9a5327..f8392159078 100644 --- a/code/game/objects/structures/mirror.dm +++ b/code/game/objects/structures/mirror.dm @@ -261,7 +261,7 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/structure/mirror/broken, 28) /obj/structure/mirror/atom_break(damage_flag, mapload) . = ..() - if(broken || (flags_1 & NODECONSTRUCT_1)) + if(broken || (obj_flags & NO_DECONSTRUCTION)) return icon_state = "mirror_broke" if(!mapload) @@ -271,7 +271,7 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/structure/mirror/broken, 28) broken = TRUE /obj/structure/mirror/deconstruct(disassembled = TRUE) - if(!(flags_1 & NODECONSTRUCT_1)) + if(!(obj_flags & NO_DECONSTRUCTION)) if(!disassembled) new /obj/item/shard(loc) else diff --git a/code/game/objects/structures/morgue.dm b/code/game/objects/structures/morgue.dm index c8a97f0cb8a..c29eb2af58a 100644 --- a/code/game/objects/structures/morgue.dm +++ b/code/game/objects/structures/morgue.dm @@ -106,7 +106,7 @@ GLOBAL_LIST_EMPTY(bodycontainers) //Let them act as spawnpoints for revenants an return attack_hand(user) /obj/structure/bodycontainer/deconstruct(disassembled = TRUE) - if (!(flags_1 & NODECONSTRUCT_1)) + if (!(obj_flags & NO_DECONSTRUCTION)) new /obj/item/stack/sheet/iron(loc, 5) toggle_organ_decay(src) qdel(src) diff --git a/code/game/objects/structures/noticeboard.dm b/code/game/objects/structures/noticeboard.dm index 534622619d1..c737f21e6d9 100644 --- a/code/game/objects/structures/noticeboard.dm +++ b/code/game/objects/structures/noticeboard.dm @@ -111,7 +111,7 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/structure/noticeboard, 32) update_appearance(UPDATE_ICON) /obj/structure/noticeboard/deconstruct(disassembled = TRUE) - if(!(flags_1 & NODECONSTRUCT_1)) + if(!(obj_flags & NO_DECONSTRUCTION)) if(!disassembled) new /obj/item/stack/sheet/mineral/wood(loc) else diff --git a/code/game/objects/structures/plasticflaps.dm b/code/game/objects/structures/plasticflaps.dm index b594be80cf6..6ac313883df 100644 --- a/code/game/objects/structures/plasticflaps.dm +++ b/code/game/objects/structures/plasticflaps.dm @@ -125,7 +125,7 @@ /obj/structure/plasticflaps/deconstruct(disassembled = TRUE) - if(!(flags_1 & NODECONSTRUCT_1)) + if(!(obj_flags & NO_DECONSTRUCTION)) new /obj/item/stack/sheet/plastic/five(loc) qdel(src) diff --git a/code/game/objects/structures/railings.dm b/code/game/objects/structures/railings.dm index 5d3c4aee07c..fb69570eea5 100644 --- a/code/game/objects/structures/railings.dm +++ b/code/game/objects/structures/railings.dm @@ -100,7 +100,7 @@ return TRUE /obj/structure/railing/deconstruct(disassembled) - if((flags_1 & NODECONSTRUCT_1)) + if((obj_flags & NO_DECONSTRUCTION)) return ..() var/rods_to_make = istype(src,/obj/structure/railing/corner) ? 1 : 2 var/obj/rod = new item_deconstruct(drop_location(), rods_to_make) @@ -110,7 +110,7 @@ ///Implements behaviour that makes it possible to unanchor the railing. /obj/structure/railing/wrench_act(mob/living/user, obj/item/I) . = ..() - if(flags_1&NODECONSTRUCT_1) + if(obj_flags & NO_DECONSTRUCTION) return to_chat(user, span_notice("You begin to [anchored ? "unfasten the railing from":"fasten the railing to"] the floor...")) if(I.use_tool(src, user, volume = 75, extra_checks = CALLBACK(src, PROC_REF(check_anchored), anchored))) diff --git a/code/game/objects/structures/shower.dm b/code/game/objects/structures/shower.dm index 7eb11fe4509..ce3d8414398 100644 --- a/code/game/objects/structures/shower.dm +++ b/code/game/objects/structures/shower.dm @@ -191,7 +191,7 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/shower, (-16)) /obj/machinery/shower/wrench_act(mob/living/user, obj/item/I) . = ..() - if(flags_1 & NODECONSTRUCT_1) + if(obj_flags & NO_DECONSTRUCTION) return I.play_tool_sound(src) diff --git a/code/game/objects/structures/tables_racks.dm b/code/game/objects/structures/tables_racks.dm index 4bfb93579f8..d79e8892197 100644 --- a/code/game/objects/structures/tables_racks.dm +++ b/code/game/objects/structures/tables_racks.dm @@ -73,7 +73,7 @@ context[SCREENTIP_CONTEXT_RMB] = "Deal card faceup" . = CONTEXTUAL_SCREENTIP_SET - if(!(flags_1 & NODECONSTRUCT_1) && deconstruction_ready) + if(!(obj_flags & NO_DECONSTRUCTION) && deconstruction_ready) if(held_item.tool_behaviour == TOOL_SCREWDRIVER) context[SCREENTIP_CONTEXT_RMB] = "Disassemble" . = CONTEXTUAL_SCREENTIP_SET @@ -207,7 +207,7 @@ pushed_mob.add_mood_event("table", /datum/mood_event/table_limbsmash, banged_limb) /obj/structure/table/screwdriver_act_secondary(mob/living/user, obj/item/tool) - if(flags_1 & NODECONSTRUCT_1 || !deconstruction_ready) + if(obj_flags & NO_DECONSTRUCTION || !deconstruction_ready) return FALSE to_chat(user, span_notice("You start disassembling [src]...")) if(tool.use_tool(src, user, 2 SECONDS, volume=50)) @@ -215,7 +215,7 @@ return TOOL_ACT_TOOLTYPE_SUCCESS /obj/structure/table/wrench_act_secondary(mob/living/user, obj/item/tool) - if(flags_1 & NODECONSTRUCT_1 || !deconstruction_ready) + if(obj_flags & NO_DECONSTRUCTION || !deconstruction_ready) return FALSE to_chat(user, span_notice("You start deconstructing [src]...")) if(tool.use_tool(src, user, 4 SECONDS, volume=50)) @@ -298,7 +298,7 @@ return /obj/structure/table/deconstruct(disassembled = TRUE, wrench_disassembly = 0) - if(!(flags_1 & NODECONSTRUCT_1)) + if(!(obj_flags & NO_DECONSTRUCTION)) var/turf/T = get_turf(src) if(buildstack) new buildstack(T, buildstackamount) @@ -437,7 +437,7 @@ /obj/structure/table/glass/proc/on_entered(datum/source, atom/movable/AM) SIGNAL_HANDLER - if(flags_1 & NODECONSTRUCT_1) + if(obj_flags & NO_DECONSTRUCTION) return if(!isliving(AM)) return @@ -470,7 +470,7 @@ qdel(src) /obj/structure/table/glass/deconstruct(disassembled = TRUE, wrench_disassembly = 0) - if(!(flags_1 & NODECONSTRUCT_1)) + if(!(obj_flags & NO_DECONSTRUCTION)) if(disassembled) ..() return @@ -851,7 +851,7 @@ /obj/structure/rack/attackby(obj/item/W, mob/living/user, params) var/list/modifiers = params2list(params) - if (W.tool_behaviour == TOOL_WRENCH && !(flags_1&NODECONSTRUCT_1) && LAZYACCESS(modifiers, RIGHT_CLICK)) + if (W.tool_behaviour == TOOL_WRENCH && !(obj_flags & NO_DECONSTRUCTION) && LAZYACCESS(modifiers, RIGHT_CLICK)) W.play_tool_sound(src) deconstruct(TRUE) return @@ -889,7 +889,7 @@ */ /obj/structure/rack/deconstruct(disassembled = TRUE) - if(!(flags_1&NODECONSTRUCT_1)) + if(!(obj_flags & NO_DECONSTRUCTION)) set_density(FALSE) var/obj/item/rack_parts/newparts = new(loc) transfer_fingerprints_to(newparts) diff --git a/code/game/objects/structures/tank_dispenser.dm b/code/game/objects/structures/tank_dispenser.dm index bac6a2eeb5e..855501803ca 100644 --- a/code/game/objects/structures/tank_dispenser.dm +++ b/code/game/objects/structures/tank_dispenser.dm @@ -104,7 +104,7 @@ /obj/structure/tank_dispenser/deconstruct(disassembled = TRUE) - if(!(flags_1 & NODECONSTRUCT_1)) + if(!(obj_flags & NO_DECONSTRUCTION)) for(var/X in src) var/obj/item/I = X I.forceMove(loc) diff --git a/code/game/objects/structures/transit_tubes/transit_tube_pod.dm b/code/game/objects/structures/transit_tubes/transit_tube_pod.dm index 32a9e6293ed..67d3d4c9510 100644 --- a/code/game/objects/structures/transit_tubes/transit_tube_pod.dm +++ b/code/game/objects/structures/transit_tubes/transit_tube_pod.dm @@ -40,7 +40,7 @@ return ..() /obj/structure/transit_tube_pod/deconstruct(disassembled = TRUE, mob/user) - if(!(flags_1 & NODECONSTRUCT_1)) + if(!(obj_flags & NO_DECONSTRUCTION)) var/atom/location = get_turf(src) if(user) location = user.loc diff --git a/code/game/objects/structures/watercloset.dm b/code/game/objects/structures/watercloset.dm index 6ba07a90e68..531df729957 100644 --- a/code/game/objects/structures/watercloset.dm +++ b/code/game/objects/structures/watercloset.dm @@ -84,7 +84,7 @@ return ..() /obj/structure/toilet/deconstruct() - if(!(flags_1 & NODECONSTRUCT_1)) + if(!(obj_flags & NO_DECONSTRUCTION)) for(var/obj/toilet_item in contents) toilet_item.forceMove(drop_location()) if(buildstacktype) @@ -105,7 +105,7 @@ cistern = !cistern update_appearance() return COMPONENT_CANCEL_ATTACK_CHAIN - else if(I.tool_behaviour == TOOL_WRENCH && !(flags_1&NODECONSTRUCT_1)) + else if(I.tool_behaviour == TOOL_WRENCH && !(obj_flags & NO_DECONSTRUCTION)) I.play_tool_sound(src) deconstruct() return TRUE @@ -228,7 +228,7 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/structure/urinal, 32) return TRUE /obj/structure/urinal/deconstruct(disassembled = TRUE) - if(!(flags_1 & NODECONSTRUCT_1)) + if(!(obj_flags & NO_DECONSTRUCTION)) new /obj/item/wallframe/urinal(loc) qdel(src) @@ -419,7 +419,7 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/structure/sink, (-14)) playsound(loc, 'sound/effects/slosh.ogg', 25, TRUE) return - if(O.tool_behaviour == TOOL_WRENCH && !(flags_1&NODECONSTRUCT_1)) + if(O.tool_behaviour == TOOL_WRENCH && !(obj_flags & NO_DECONSTRUCTION)) O.play_tool_sound(src) deconstruct() return @@ -496,7 +496,7 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/structure/sink, (-14)) return ..() /obj/structure/sink/deconstruct() - if(!(flags_1 & NODECONSTRUCT_1)) + if(!(obj_flags & NO_DECONSTRUCTION)) drop_materials() if(has_water_reclaimer) new /obj/item/stock_parts/water_recycler(drop_location()) @@ -572,7 +572,7 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/structure/sink/kitchen, (-16)) return TRUE /obj/structure/sinkframe/deconstruct() - if(!(flags_1 & NODECONSTRUCT_1)) + if(!(obj_flags & NO_DECONSTRUCTION)) drop_materials() return ..() diff --git a/code/game/objects/structures/window.dm b/code/game/objects/structures/window.dm index 1c57ad51d39..40dfa98c756 100644 --- a/code/game/objects/structures/window.dm +++ b/code/game/objects/structures/window.dm @@ -78,7 +78,7 @@ /obj/structure/window/examine(mob/user) . = ..() - if(flags_1 & NODECONSTRUCT_1) + if(obj_flags & NO_DECONSTRUCTION) return switch(state) @@ -210,7 +210,7 @@ return TOOL_ACT_TOOLTYPE_SUCCESS /obj/structure/window/screwdriver_act(mob/living/user, obj/item/tool) - if(flags_1 & NODECONSTRUCT_1) + if(obj_flags & NO_DECONSTRUCTION) return switch(state) @@ -240,7 +240,7 @@ /obj/structure/window/wrench_act(mob/living/user, obj/item/tool) if(anchored) return FALSE - if((flags_1 & NODECONSTRUCT_1) || (reinf && state >= RWINDOW_FRAME_BOLTED)) + if((obj_flags & NO_DECONSTRUCTION) || (reinf && state >= RWINDOW_FRAME_BOLTED)) return FALSE to_chat(user, span_notice("You begin to disassemble [src]...")) @@ -255,7 +255,7 @@ return TOOL_ACT_TOOLTYPE_SUCCESS /obj/structure/window/crowbar_act(mob/living/user, obj/item/tool) - if(!anchored || (flags_1 & NODECONSTRUCT_1)) + if(!anchored || (obj_flags & NO_DECONSTRUCTION)) return FALSE switch(state) @@ -335,7 +335,7 @@ return if(!disassembled) playsound(src, break_sound, 70, TRUE) - if(!(flags_1 & NODECONSTRUCT_1)) + if(!(obj_flags & NO_DECONSTRUCTION)) for(var/obj/item/shard/debris in spawn_debris(drop_location())) transfer_fingerprints_to(debris) // transfer fingerprints to shards only qdel(src) @@ -480,7 +480,7 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/structure/window/unanchored/spawner, 0) return FALSE /obj/structure/window/reinforced/attackby_secondary(obj/item/tool, mob/user, params) - if(flags_1 & NODECONSTRUCT_1) + if(obj_flags & NO_DECONSTRUCTION) return ..() switch(state) @@ -546,7 +546,7 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/structure/window/unanchored/spawner, 0) /obj/structure/window/reinforced/crowbar_act(mob/living/user, obj/item/tool) if(!anchored) return FALSE - if((flags_1 & NODECONSTRUCT_1) || (state != WINDOW_OUT_OF_FRAME)) + if((obj_flags & NO_DECONSTRUCTION) || (state != WINDOW_OUT_OF_FRAME)) return FALSE to_chat(user, span_notice("You begin to lever the window back into the frame...")) if(tool.use_tool(src, user, 10 SECONDS, volume = 75, extra_checks = CALLBACK(src, PROC_REF(check_state_and_anchored), state, anchored))) @@ -561,7 +561,7 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/structure/window/unanchored/spawner, 0) /obj/structure/window/reinforced/examine(mob/user) . = ..() - if(flags_1 & NODECONSTRUCT_1) + if(obj_flags & NO_DECONSTRUCTION) return switch(state) if(RWINDOW_SECURE) @@ -803,7 +803,8 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/structure/window/reinforced/tinted/frosted/spaw /obj/structure/window/reinforced/shuttle/indestructible name = "hardened shuttle window" - flags_1 = PREVENT_CLICK_UNDER_1 | NODECONSTRUCT_1 + obj_flags = NO_DECONSTRUCTION + flags_1 = PREVENT_CLICK_UNDER_1 resistance_flags = INDESTRUCTIBLE | LAVA_PROOF | FIRE_PROOF | UNACIDABLE | ACID_PROOF /obj/structure/window/reinforced/shuttle/indestructible/rcd_vals(mob/user, obj/item/construction/rcd/the_rcd) diff --git a/code/modules/art/statues.dm b/code/modules/art/statues.dm index 3d751ca4ab0..89eb6261d42 100644 --- a/code/modules/art/statues.dm +++ b/code/modules/art/statues.dm @@ -29,14 +29,14 @@ /obj/structure/statue/wrench_act(mob/living/user, obj/item/tool) . = ..() - if(flags_1 & NODECONSTRUCT_1) + if(obj_flags & NO_DECONSTRUCTION) return FALSE default_unfasten_wrench(user, tool) return TOOL_ACT_TOOLTYPE_SUCCESS /obj/structure/statue/attackby(obj/item/W, mob/living/user, params) add_fingerprint(user) - if(!(flags_1 & NODECONSTRUCT_1)) + if(!(obj_flags & NO_DECONSTRUCTION)) if(W.tool_behaviour == TOOL_WELDER) if(!W.tool_start_check(user, amount=1)) return FALSE @@ -50,7 +50,7 @@ return ..() // This hotkey is BLACKLISTED since it's used by /datum/component/simple_rotation /obj/structure/statue/deconstruct(disassembled = TRUE) - if(!(flags_1 & NODECONSTRUCT_1)) + if(!(obj_flags & NO_DECONSTRUCTION)) var/amount_mod = disassembled ? 0 : -2 for(var/mat in custom_materials) var/datum/material/custom_material = GET_MATERIAL_REF(mat) diff --git a/code/modules/atmospherics/machinery/air_alarm/air_alarm_interact.dm b/code/modules/atmospherics/machinery/air_alarm/air_alarm_interact.dm index 3ac90db0c18..3d93338fbee 100644 --- a/code/modules/atmospherics/machinery/air_alarm/air_alarm_interact.dm +++ b/code/modules/atmospherics/machinery/air_alarm/air_alarm_interact.dm @@ -90,7 +90,7 @@ return TRUE /obj/machinery/airalarm/deconstruct(disassembled = TRUE) - if(!(flags_1 & NODECONSTRUCT_1)) + if(!(obj_flags & NO_DECONSTRUCTION)) new /obj/item/stack/sheet/iron(loc, 2) if((buildstage == AIR_ALARM_BUILD_NO_WIRES) || (buildstage == AIR_ALARM_BUILD_COMPLETE)) var/obj/item/electronics/airalarm/alarm = new(loc) diff --git a/code/modules/atmospherics/machinery/atmosmachinery.dm b/code/modules/atmospherics/machinery/atmosmachinery.dm index f07d452c662..d7a6c626cbd 100644 --- a/code/modules/atmospherics/machinery/atmosmachinery.dm +++ b/code/modules/atmospherics/machinery/atmosmachinery.dm @@ -466,7 +466,7 @@ * Called by wrench_act(), create a pipe fitting and remove the pipe */ /obj/machinery/atmospherics/deconstruct(disassembled = TRUE) - if(!(flags_1 & NODECONSTRUCT_1)) + if(!(obj_flags & NO_DECONSTRUCTION)) if(can_unwrench) var/obj/item/pipe/stored = new construction_type(loc, null, dir, src, pipe_color) stored.set_piping_layer(piping_layer) diff --git a/code/modules/atmospherics/machinery/other/meter.dm b/code/modules/atmospherics/machinery/other/meter.dm index 51a88bf349e..656b6582a00 100644 --- a/code/modules/atmospherics/machinery/other/meter.dm +++ b/code/modules/atmospherics/machinery/other/meter.dm @@ -135,7 +135,7 @@ return TRUE /obj/machinery/meter/deconstruct(disassembled = TRUE) - if(!(flags_1 & NODECONSTRUCT_1)) + if(!(obj_flags & NO_DECONSTRUCTION)) new /obj/item/pipe_meter(loc) . = ..() diff --git a/code/modules/atmospherics/machinery/portable/canister.dm b/code/modules/atmospherics/machinery/portable/canister.dm index c38ee248c91..02f499e00a6 100644 --- a/code/modules/atmospherics/machinery/portable/canister.dm +++ b/code/modules/atmospherics/machinery/portable/canister.dm @@ -335,7 +335,7 @@ take_damage(5, BURN, 0) /obj/machinery/portable_atmospherics/canister/deconstruct(disassembled = TRUE) - if((flags_1 & NODECONSTRUCT_1)) + if((obj_flags & NO_DECONSTRUCTION)) qdel(src) return if(!(machine_stat & BROKEN)) diff --git a/code/modules/awaymissions/mission_code/murderdome.dm b/code/modules/awaymissions/mission_code/murderdome.dm index 0c3df503ef3..c99b9d91d5a 100644 --- a/code/modules/awaymissions/mission_code/murderdome.dm +++ b/code/modules/awaymissions/mission_code/murderdome.dm @@ -1,7 +1,8 @@ /obj/structure/window/reinforced/fulltile/indestructible name = "robust window" - flags_1 = PREVENT_CLICK_UNDER_1 | NODECONSTRUCT_1 + obj_flags = NO_DECONSTRUCTION + flags_1 = PREVENT_CLICK_UNDER_1 resistance_flags = INDESTRUCTIBLE | LAVA_PROOF | FIRE_PROOF | UNACIDABLE | ACID_PROOF /obj/structure/window/reinforced/fulltile/indestructible/rcd_vals(mob/user, obj/item/construction/rcd/the_rcd) @@ -9,8 +10,7 @@ /obj/structure/grille/indestructible - flags_1 = NODECONSTRUCT_1 - obj_flags = CONDUCTS_ELECTRICITY + obj_flags = CONDUCTS_ELECTRICITY | NO_DECONSTRUCTION resistance_flags = INDESTRUCTIBLE | LAVA_PROOF | FIRE_PROOF | UNACIDABLE | ACID_PROOF /obj/structure/grille/indestructible/rcd_vals(mob/user, obj/item/construction/rcd/the_rcd) diff --git a/code/modules/capture_the_flag/ctf_game.dm b/code/modules/capture_the_flag/ctf_game.dm index a4c3c68f634..c42bdd596e6 100644 --- a/code/modules/capture_the_flag/ctf_game.dm +++ b/code/modules/capture_the_flag/ctf_game.dm @@ -464,7 +464,7 @@ /obj/structure/table/reinforced/ctf resistance_flags = INDESTRUCTIBLE - flags_1 = NODECONSTRUCT_1 + obj_flags = NO_DECONSTRUCTION #define CTF_LOADING_UNLOADED 0 #define CTF_LOADING_LOADING 1 diff --git a/code/modules/food_and_drinks/machinery/food_cart.dm b/code/modules/food_and_drinks/machinery/food_cart.dm index fe88e43b523..b7a47b11d62 100644 --- a/code/modules/food_and_drinks/machinery/food_cart.dm +++ b/code/modules/food_and_drinks/machinery/food_cart.dm @@ -8,7 +8,7 @@ anchored = FALSE use_power = NO_POWER_USE req_access = list(ACCESS_KITCHEN) - flags_1 = NODECONSTRUCT_1 + obj_flags = NO_DECONSTRUCTION var/unpacked = FALSE var/obj/machinery/griddle/stand/cart_griddle var/obj/machinery/smartfridge/food/cart_smartfridge diff --git a/code/modules/food_and_drinks/machinery/griddle.dm b/code/modules/food_and_drinks/machinery/griddle.dm index 91979e2ebca..72949eaca91 100644 --- a/code/modules/food_and_drinks/machinery/griddle.dm +++ b/code/modules/food_and_drinks/machinery/griddle.dm @@ -37,7 +37,7 @@ /obj/machinery/griddle/crowbar_act(mob/living/user, obj/item/I) . = ..() - if(flags_1 & NODECONSTRUCT_1) + if(obj_flags & NO_DECONSTRUCTION) return if(default_deconstruction_crowbar(I, ignore_panel = TRUE)) return diff --git a/code/modules/food_and_drinks/machinery/grill.dm b/code/modules/food_and_drinks/machinery/grill.dm index 2ca81f36f90..dc72f0b70ff 100644 --- a/code/modules/food_and_drinks/machinery/grill.dm +++ b/code/modules/food_and_drinks/machinery/grill.dm @@ -109,7 +109,7 @@ /obj/machinery/grill/deconstruct(disassembled = TRUE) if(grilled_item) finish_grill() - if(!(flags_1 & NODECONSTRUCT_1)) + if(!(obj_flags & NO_DECONSTRUCTION)) new /obj/item/stack/sheet/iron(loc, 5) new /obj/item/stack/rods(loc, 5) ..() diff --git a/code/modules/food_and_drinks/machinery/icecream_vat.dm b/code/modules/food_and_drinks/machinery/icecream_vat.dm index 998ac0300b4..af5dbc5528d 100644 --- a/code/modules/food_and_drinks/machinery/icecream_vat.dm +++ b/code/modules/food_and_drinks/machinery/icecream_vat.dm @@ -190,7 +190,7 @@ return /obj/machinery/icecream_vat/deconstruct(disassembled = TRUE) - if(!(flags_1 & NODECONSTRUCT_1)) + if(!(obj_flags & NO_DECONSTRUCTION)) new /obj/item/stack/sheet/iron(loc, 4) qdel(src) diff --git a/code/modules/holodeck/computer.dm b/code/modules/holodeck/computer.dm index 085225e34f3..511ad4bdeb5 100644 --- a/code/modules/holodeck/computer.dm +++ b/code/modules/holodeck/computer.dm @@ -294,12 +294,12 @@ GLOBAL_LIST_INIT(typecache_holodeck_linked_floorcheck_ok, typecacheof(list(/turf holo_object.resistance_flags = LAVA_PROOF | FIRE_PROOF | UNACIDABLE | ACID_PROOF if(isstructure(holo_object)) - holo_object.flags_1 |= NODECONSTRUCT_1 + holo_object.obj_flags |= NO_DECONSTRUCTION return if(ismachinery(holo_object)) var/obj/machinery/holo_machine = holo_object - holo_machine.flags_1 |= NODECONSTRUCT_1 + holo_machine.obj_flags |= NO_DECONSTRUCTION holo_machine.power_change() if(istype(holo_machine, /obj/machinery/button)) diff --git a/code/modules/holodeck/holo_effect.dm b/code/modules/holodeck/holo_effect.dm index 6b727a2c750..8bc02a011c4 100644 --- a/code/modules/holodeck/holo_effect.dm +++ b/code/modules/holodeck/holo_effect.dm @@ -49,7 +49,8 @@ var/static/banned_books = list(/obj/item/book/manual/random, /obj/item/book/manual/nuclear, /obj/item/book/manual/wiki) var/newtype = pick(subtypesof(/obj/item/book/manual) - banned_books) var/obj/item/book/manual/to_spawn = new newtype(loc) - to_spawn.flags_1 |= (HOLOGRAM_1 | NODECONSTRUCT_1) + to_spawn.flags_1 |= HOLOGRAM_1 + to_spawn.obj_flags |= NO_DECONSTRUCTION return to_spawn /obj/effect/holodeck_effect/mobspawner diff --git a/code/modules/holodeck/items.dm b/code/modules/holodeck/items.dm index 019c229842e..8d0a5ab33c5 100644 --- a/code/modules/holodeck/items.dm +++ b/code/modules/holodeck/items.dm @@ -135,7 +135,7 @@ eventstarted = TRUE for(var/obj/structure/window/W in currentarea) - if(W.flags_1&NODECONSTRUCT_1) // Just in case: only holo-windows + if(W.obj_flags & NO_DECONSTRUCTION) // Just in case: only holo-windows qdel(W) for(var/mob/M in currentarea) diff --git a/code/modules/hydroponics/hydroponics.dm b/code/modules/hydroponics/hydroponics.dm index 5ec11b3261e..84201835604 100644 --- a/code/modules/hydroponics/hydroponics.dm +++ b/code/modules/hydroponics/hydroponics.dm @@ -1159,7 +1159,7 @@ circuit = null density = FALSE use_power = NO_POWER_USE - flags_1 = NODECONSTRUCT_1 + obj_flags = NO_DECONSTRUCTION unwrenchable = FALSE self_sustaining_overlay_icon_state = null maxnutri = 15 diff --git a/code/modules/mapfluff/ruins/lavalandruin_code/elephantgraveyard.dm b/code/modules/mapfluff/ruins/lavalandruin_code/elephantgraveyard.dm index 4c08fdc47ba..a4bcad87671 100644 --- a/code/modules/mapfluff/ruins/lavalandruin_code/elephantgraveyard.dm +++ b/code/modules/mapfluff/ruins/lavalandruin_code/elephantgraveyard.dm @@ -107,7 +107,7 @@ /obj/structure/sink/oil_well/attackby(obj/item/O, mob/living/user, params) flick("puddle-oil-splash",src) - if(O.tool_behaviour == TOOL_SHOVEL && !(flags_1 & NODECONSTRUCT_1)) //attempt to deconstruct the puddle with a shovel + if(O.tool_behaviour == TOOL_SHOVEL && !(obj_flags & NO_DECONSTRUCTION)) //attempt to deconstruct the puddle with a shovel to_chat(user, "You fill in the oil well with soil.") O.play_tool_sound(src) deconstruct() diff --git a/code/modules/mining/equipment/marker_beacons.dm b/code/modules/mining/equipment/marker_beacons.dm index 4721fcaf809..67eb767f767 100644 --- a/code/modules/mining/equipment/marker_beacons.dm +++ b/code/modules/mining/equipment/marker_beacons.dm @@ -100,7 +100,7 @@ GLOBAL_LIST_INIT(marker_beacon_colors, sort_list(list( update_appearance() /obj/structure/marker_beacon/deconstruct(disassembled = TRUE) - if(!(flags_1 & NODECONSTRUCT_1)) + if(!(obj_flags & NO_DECONSTRUCTION)) var/obj/item/stack/marker_beacon/M = new(loc) M.picked_color = picked_color M.update_appearance() diff --git a/code/modules/mining/equipment/survival_pod.dm b/code/modules/mining/equipment/survival_pod.dm index 056ef6cbc7e..c04ad5c6ff1 100644 --- a/code/modules/mining/equipment/survival_pod.dm +++ b/code/modules/mining/equipment/survival_pod.dm @@ -164,7 +164,7 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/structure/window/reinforced/survival_pod/spawne /obj/item/gps/computer/wrench_act(mob/living/user, obj/item/I) ..() - if(flags_1 & NODECONSTRUCT_1) + if(obj_flags & NO_DECONSTRUCTION) return TRUE user.visible_message(span_warning("[user] disassembles [src]."), @@ -201,7 +201,7 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/structure/window/reinforced/survival_pod/spawne light_color = COLOR_VERY_PALE_LIME_GREEN max_n_of_items = 10 pixel_y = -4 - flags_1 = NODECONSTRUCT_1 + obj_flags = NO_DECONSTRUCTION /obj/machinery/smartfridge/survival_pod/Initialize(mapload) AddElement(/datum/element/update_icon_blocker) diff --git a/code/modules/mob/living/basic/lavaland/gutlunchers/gutluncher_foodtrough.dm b/code/modules/mob/living/basic/lavaland/gutlunchers/gutluncher_foodtrough.dm index 16139da00be..1ac43c13eb4 100644 --- a/code/modules/mob/living/basic/lavaland/gutlunchers/gutluncher_foodtrough.dm +++ b/code/modules/mob/living/basic/lavaland/gutlunchers/gutluncher_foodtrough.dm @@ -23,7 +23,7 @@ return ..() /obj/structure/ore_container/gutlunch_trough/deconstruct(disassembled = TRUE) - if(flags_1 & NODECONSTRUCT_1) + if(obj_flags & NO_DECONSTRUCTION) return new /obj/item/stack/sheet/mineral/wood(drop_location(), 5) qdel(src) diff --git a/code/modules/modular_computers/computers/item/computer.dm b/code/modules/modular_computers/computers/item/computer.dm index 351cd2aa757..c37b9a93207 100644 --- a/code/modules/modular_computers/computers/item/computer.dm +++ b/code/modules/modular_computers/computers/item/computer.dm @@ -839,7 +839,7 @@ /obj/item/modular_computer/deconstruct(disassembled = TRUE) remove_pai() eject_aicard() - if(!(flags_1 & NODECONSTRUCT_1)) + if(!(obj_flags & NO_DECONSTRUCTION)) if (disassembled) internal_cell?.forceMove(drop_location()) computer_id_slot?.forceMove(drop_location()) diff --git a/code/modules/modular_computers/computers/machinery/modular_computer.dm b/code/modules/modular_computers/computers/machinery/modular_computer.dm index c54d3295fe3..aa6866ff7c5 100644 --- a/code/modules/modular_computers/computers/machinery/modular_computer.dm +++ b/code/modules/modular_computers/computers/machinery/modular_computer.dm @@ -134,7 +134,7 @@ return ..() /obj/machinery/modular_computer/attackby(obj/item/W as obj, mob/living/user) - if (cpu && !user.combat_mode && !(flags_1 & NODECONSTRUCT_1)) + if (cpu && !user.combat_mode && !(obj_flags & NO_DECONSTRUCTION)) return cpu.attackby(W, user) return ..() diff --git a/code/modules/paperwork/filingcabinet.dm b/code/modules/paperwork/filingcabinet.dm index ed99e7ea179..140bdffcf87 100644 --- a/code/modules/paperwork/filingcabinet.dm +++ b/code/modules/paperwork/filingcabinet.dm @@ -38,7 +38,7 @@ I.forceMove(src) /obj/structure/filingcabinet/deconstruct(disassembled = TRUE) - if(!(flags_1 & NODECONSTRUCT_1)) + if(!(obj_flags & NO_DECONSTRUCTION)) new /obj/item/stack/sheet/iron(loc, 2) for(var/obj/item/I in src) I.forceMove(loc) diff --git a/code/modules/paperwork/ticketmachine.dm b/code/modules/paperwork/ticketmachine.dm index a5902a9df5a..c24b8fd73e8 100644 --- a/code/modules/paperwork/ticketmachine.dm +++ b/code/modules/paperwork/ticketmachine.dm @@ -40,7 +40,7 @@ return ..() /obj/machinery/ticket_machine/deconstruct(disassembled = TRUE) - if(!(flags_1 & NODECONSTRUCT_1)) + if(!(obj_flags & NO_DECONSTRUCTION)) new /obj/item/wallframe/ticket_machine(loc) qdel(src) diff --git a/code/modules/photography/photos/frame.dm b/code/modules/photography/photos/frame.dm index c42664af269..8212b597698 100644 --- a/code/modules/photography/photos/frame.dm +++ b/code/modules/photography/photos/frame.dm @@ -173,7 +173,7 @@ . += framed /obj/structure/sign/picture_frame/deconstruct(disassembled = TRUE) - if(!(flags_1 & NODECONSTRUCT_1)) + if(!(obj_flags & NO_DECONSTRUCTION)) var/obj/item/wallframe/picture/F = new /obj/item/wallframe/picture(loc) if(framed) F.displayed = framed diff --git a/code/modules/power/apc/apc_main.dm b/code/modules/power/apc/apc_main.dm index cff658fa6ca..8c7e9adeac7 100644 --- a/code/modules/power/apc/apc_main.dm +++ b/code/modules/power/apc/apc_main.dm @@ -295,7 +295,7 @@ . += "The cover is closed." /obj/machinery/power/apc/deconstruct(disassembled = TRUE) - if(flags_1 & NODECONSTRUCT_1) + if(obj_flags & NO_DECONSTRUCTION) return if(!(machine_stat & BROKEN)) set_broken() diff --git a/code/modules/power/cable.dm b/code/modules/power/cable.dm index 13354f6bc54..ae8091f2915 100644 --- a/code/modules/power/cable.dm +++ b/code/modules/power/cable.dm @@ -142,7 +142,7 @@ GLOBAL_LIST_INIT(wire_node_generating_types, typecacheof(list(/obj/structure/gri return ..() // then go ahead and delete the cable /obj/structure/cable/deconstruct(disassembled = TRUE) - if(!(flags_1 & NODECONSTRUCT_1)) + if(!(obj_flags & NO_DECONSTRUCTION)) var/obj/item/stack/cable_coil/cable = new(drop_location(), 1) cable.set_cable_color(cable_color) qdel(src) diff --git a/code/modules/power/lighting/light.dm b/code/modules/power/lighting/light.dm index 1e46021a891..22a013b463e 100644 --- a/code/modules/power/lighting/light.dm +++ b/code/modules/power/lighting/light.dm @@ -411,7 +411,7 @@ electrocute_mob(user, get_area(src), src, (rand(7,10) * 0.1), TRUE) /obj/machinery/light/deconstruct(disassembled = TRUE) - if(flags_1 & NODECONSTRUCT_1) + if(obj_flags & NO_DECONSTRUCTION) qdel(src) return var/obj/structure/light_construct/new_light = null diff --git a/code/modules/power/lighting/light_construct.dm b/code/modules/power/lighting/light_construct.dm index 05d9533c79e..5be904dad86 100644 --- a/code/modules/power/lighting/light_construct.dm +++ b/code/modules/power/lighting/light_construct.dm @@ -164,7 +164,7 @@ qdel(src) /obj/structure/light_construct/deconstruct(disassembled = TRUE) - if(!(flags_1 & NODECONSTRUCT_1)) + if(!(obj_flags & NO_DECONSTRUCTION)) new /obj/item/stack/sheet/iron(loc, sheets_refunded) qdel(src) diff --git a/code/modules/power/pipecleaners.dm b/code/modules/power/pipecleaners.dm index 201f7a955aa..2f18bab660a 100644 --- a/code/modules/power/pipecleaners.dm +++ b/code/modules/power/pipecleaners.dm @@ -107,7 +107,7 @@ By design, d1 is the smallest direction and d2 is the highest return ..() // then go ahead and delete the pipe_cleaner /obj/structure/pipe_cleaner/deconstruct(disassembled = TRUE) - if(!(flags_1 & NODECONSTRUCT_1)) + if(!(obj_flags & NO_DECONSTRUCTION)) var/turf/T = get_turf(loc) if(T) stored.forceMove(T) diff --git a/code/modules/power/solar.dm b/code/modules/power/solar.dm index f79e75fdaac..64c09a987ed 100644 --- a/code/modules/power/solar.dm +++ b/code/modules/power/solar.dm @@ -122,7 +122,7 @@ azimuth_current = new_angle /obj/machinery/power/solar/deconstruct(disassembled = TRUE) - if(!(flags_1 & NODECONSTRUCT_1)) + if(!(obj_flags & NO_DECONSTRUCTION)) if(disassembled) var/obj/item/solar_assembly/S = locate() in src if(S) diff --git a/code/modules/power/tracker.dm b/code/modules/power/tracker.dm index 922f0ede646..d39840f875e 100644 --- a/code/modules/power/tracker.dm +++ b/code/modules/power/tracker.dm @@ -138,7 +138,7 @@ unset_control() /obj/machinery/power/tracker/deconstruct(disassembled = TRUE) - if(!(flags_1 & NODECONSTRUCT_1)) + if(!(obj_flags & NO_DECONSTRUCTION)) if(disassembled) var/obj/item/solar_assembly/S = locate() in src if(S) diff --git a/code/modules/reagents/chemistry/machinery/chem_dispenser.dm b/code/modules/reagents/chemistry/machinery/chem_dispenser.dm index bc5b14614c6..a0d1e88317a 100644 --- a/code/modules/reagents/chemistry/machinery/chem_dispenser.dm +++ b/code/modules/reagents/chemistry/machinery/chem_dispenser.dm @@ -698,8 +698,7 @@ /obj/machinery/chem_dispenser/drinks/fullupgrade //fully ugpraded stock parts, emagged desc = "Contains a large reservoir of soft drinks. This model has had its safeties shorted out." - obj_flags = CAN_BE_HIT | EMAGGED - flags_1 = NODECONSTRUCT_1 + obj_flags = CAN_BE_HIT | EMAGGED | NO_DECONSTRUCTION circuit = /obj/item/circuitboard/machine/chem_dispenser/drinks/fullupgrade /obj/machinery/chem_dispenser/drinks/fullupgrade/Initialize(mapload) @@ -762,8 +761,7 @@ /obj/machinery/chem_dispenser/drinks/beer/fullupgrade //fully ugpraded stock parts, emagged desc = "Contains a large reservoir of the good stuff. This model has had its safeties shorted out." - obj_flags = CAN_BE_HIT | EMAGGED - flags_1 = NODECONSTRUCT_1 + obj_flags = CAN_BE_HIT | EMAGGED | NO_DECONSTRUCTION circuit = /obj/item/circuitboard/machine/chem_dispenser/drinks/beer/fullupgrade /obj/machinery/chem_dispenser/drinks/beer/fullupgrade/Initialize(mapload) @@ -787,7 +785,7 @@ /obj/machinery/chem_dispenser/mutagensaltpeter name = "botanical chemical dispenser" desc = "Creates and dispenses chemicals useful for botany." - flags_1 = NODECONSTRUCT_1 + obj_flags = NO_DECONSTRUCTION circuit = /obj/item/circuitboard/machine/chem_dispenser/mutagensaltpeter /// The default list of dispensable reagents available in the mutagensaltpeter chem dispenser @@ -813,8 +811,7 @@ /obj/machinery/chem_dispenser/fullupgrade //fully ugpraded stock parts, emagged desc = "Creates and dispenses chemicals. This model has had its safeties shorted out." - obj_flags = CAN_BE_HIT | EMAGGED - flags_1 = NODECONSTRUCT_1 + obj_flags = CAN_BE_HIT | EMAGGED | NO_DECONSTRUCTION circuit = /obj/item/circuitboard/machine/chem_dispenser/fullupgrade /obj/machinery/chem_dispenser/fullupgrade/Initialize(mapload) diff --git a/code/modules/reagents/chemistry/machinery/chem_synthesizer.dm b/code/modules/reagents/chemistry/machinery/chem_synthesizer.dm index 89c720da0d4..6cee41bb3eb 100644 --- a/code/modules/reagents/chemistry/machinery/chem_synthesizer.dm +++ b/code/modules/reagents/chemistry/machinery/chem_synthesizer.dm @@ -6,7 +6,7 @@ base_icon_state = "dispenser" amount = 10 resistance_flags = INDESTRUCTIBLE | FIRE_PROOF | ACID_PROOF | LAVA_PROOF - flags_1 = NODECONSTRUCT_1 + obj_flags = NO_DECONSTRUCTION use_power = NO_POWER_USE var/static/list/shortcuts = list( "meth" = /datum/reagent/drug/methamphetamine diff --git a/code/modules/reagents/reagent_dispenser.dm b/code/modules/reagents/reagent_dispenser.dm index 8241331d7b0..7c9006c9582 100644 --- a/code/modules/reagents/reagent_dispenser.dm +++ b/code/modules/reagents/reagent_dispenser.dm @@ -195,7 +195,7 @@ qdel(src) /obj/structure/reagent_dispensers/deconstruct(disassembled = TRUE) - if(!(flags_1 & NODECONSTRUCT_1)) + if(!(obj_flags & NO_DECONSTRUCTION)) if(!disassembled) boom() else diff --git a/code/modules/recycling/disposal/bin.dm b/code/modules/recycling/disposal/bin.dm index cfdecfcd73c..ddfa9e0688b 100644 --- a/code/modules/recycling/disposal/bin.dm +++ b/code/modules/recycling/disposal/bin.dm @@ -278,7 +278,7 @@ /obj/machinery/disposal/deconstruct(disassembled = TRUE) var/turf/T = loc - if(!(flags_1 & NODECONSTRUCT_1)) + if(!(obj_flags & NO_DECONSTRUCTION)) if(stored) var/obj/structure/disposalconstruct/construct = stored stored = null diff --git a/code/modules/recycling/disposal/pipe.dm b/code/modules/recycling/disposal/pipe.dm index 30573746f5e..69519874cd2 100644 --- a/code/modules/recycling/disposal/pipe.dm +++ b/code/modules/recycling/disposal/pipe.dm @@ -171,7 +171,7 @@ // called when pipe is cut with welder /obj/structure/disposalpipe/deconstruct(disassembled = TRUE) - if(!(flags_1 & NODECONSTRUCT_1)) + if(!(obj_flags & NO_DECONSTRUCTION)) if(disassembled) if(spawn_pipe) var/obj/structure/disposalconstruct/construct = stored diff --git a/code/modules/shuttle/spaceship_navigation_beacon.dm b/code/modules/shuttle/spaceship_navigation_beacon.dm index d46396a0e8b..71e88c7fcc4 100644 --- a/code/modules/shuttle/spaceship_navigation_beacon.dm +++ b/code/modules/shuttle/spaceship_navigation_beacon.dm @@ -5,7 +5,7 @@ icon_state = "beacon_active" base_icon_state = "beacon" density = TRUE - flags_1 = NODECONSTRUCT_1 + obj_flags = NO_DECONSTRUCTION /// Locked beacons cannot be jumped to by ships. var/locked = FALSE diff --git a/code/modules/shuttle/special.dm b/code/modules/shuttle/special.dm index 0a18857efed..089e8b1f9fe 100644 --- a/code/modules/shuttle/special.dm +++ b/code/modules/shuttle/special.dm @@ -79,7 +79,7 @@ var/obj/machinery/power/emitter/energycannon/magical/our_statue var/list/mob/living/sleepers = list() var/never_spoken = TRUE - flags_1 = NODECONSTRUCT_1 + obj_flags = NO_DECONSTRUCTION /obj/structure/table/abductor/wabbajack/Initialize(mapload) . = ..() @@ -201,7 +201,7 @@ /obj/structure/table/wood/shuttle_bar resistance_flags = LAVA_PROOF | FIRE_PROOF | ACID_PROOF - flags_1 = NODECONSTRUCT_1 + obj_flags = NO_DECONSTRUCTION max_integrity = 1000 var/boot_dir = 1 diff --git a/code/modules/shuttle/syndicate.dm b/code/modules/shuttle/syndicate.dm index dcb8748bfcb..53d625dc758 100644 --- a/code/modules/shuttle/syndicate.dm +++ b/code/modules/shuttle/syndicate.dm @@ -11,7 +11,7 @@ shuttleId = "syndicate" possible_destinations = "syndicate_away;syndicate_z5;syndicate_ne;syndicate_nw;syndicate_n;syndicate_se;syndicate_sw;syndicate_s;syndicate_custom" resistance_flags = INDESTRUCTIBLE | LAVA_PROOF | FIRE_PROOF | ACID_PROOF - flags_1 = NODECONSTRUCT_1 + obj_flags = NO_DECONSTRUCTION /obj/machinery/computer/shuttle/syndicate/launch_check(mob/user) . = ..() diff --git a/code/modules/transport/tram/tram_controller.dm b/code/modules/transport/tram/tram_controller.dm index 39f3fcb0a8a..44a9a4db4b2 100644 --- a/code/modules/transport/tram/tram_controller.dm +++ b/code/modules/transport/tram/tram_controller.dm @@ -697,7 +697,7 @@ /obj/machinery/transport/tram_controller/hilbert configured_transport_id = HILBERT_LINE_1 - flags_1 = NODECONSTRUCT_1 + obj_flags = NO_DECONSTRUCTION /obj/machinery/transport/tram_controller/Initialize(mapload) . = ..() @@ -848,7 +848,7 @@ return SECONDARY_ATTACK_CANCEL_ATTACK_CHAIN /obj/machinery/transport/tram_controller/deconstruct(disassembled = TRUE) - if(flags_1 & NODECONSTRUCT_1) + if(obj_flags & NO_DECONSTRUCTION) return var/turf/drop_location = find_obstruction_free_location(1, src) diff --git a/code/modules/transport/tram/tram_displays.dm b/code/modules/transport/tram/tram_displays.dm index 908651f3b11..0e36295f97e 100644 --- a/code/modules/transport/tram/tram_displays.dm +++ b/code/modules/transport/tram/tram_displays.dm @@ -82,7 +82,7 @@ . += span_notice("It is secured to the tram wall with [EXAMINE_HINT("bolts.")]") /obj/machinery/transport/destination_sign/deconstruct(disassembled = TRUE) - if(flags_1 & NODECONSTRUCT_1) + if(obj_flags & NO_DECONSTRUCTION) return if(disassembled) new /obj/item/wallframe/indicator_display(drop_location()) diff --git a/code/modules/transport/tram/tram_structures.dm b/code/modules/transport/tram/tram_structures.dm index a7308189f67..8d9f132ff38 100644 --- a/code/modules/transport/tram/tram_structures.dm +++ b/code/modules/transport/tram/tram_structures.dm @@ -212,7 +212,7 @@ return ..() /obj/structure/tram/deconstruct(disassembled = TRUE) - if(!(flags_1 & NODECONSTRUCT_1)) + if(!(obj_flags & NO_DECONSTRUCTION)) if(disassembled) new girder_type(loc) if(mineral_amount) diff --git a/code/modules/vending/_vending.dm b/code/modules/vending/_vending.dm index ab882bf7997..0e5f9bee3ae 100644 --- a/code/modules/vending/_vending.dm +++ b/code/modules/vending/_vending.dm @@ -301,7 +301,7 @@ /obj/machinery/vending/deconstruct(disassembled = TRUE) if(refill_canister) return ..() - if(!(flags_1 & NODECONSTRUCT_1)) //the non constructable vendors drop metal instead of a machine frame. + if(!(obj_flags & NO_DECONSTRUCTION)) //the non constructable vendors drop metal instead of a machine frame. new /obj/item/stack/sheet/iron(loc, 3) qdel(src) @@ -1068,7 +1068,7 @@ /obj/machinery/vending/exchange_parts(mob/user, obj/item/storage/part_replacer/replacer) if(!istype(replacer)) return FALSE - if((flags_1 & NODECONSTRUCT_1) && !replacer.works_from_distance) + if((obj_flags & NO_DECONSTRUCTION) && !replacer.works_from_distance) return FALSE if(!component_parts || !refill_canister) return FALSE diff --git a/modular_skyrat/master_files/code/game/objects/structures/towel_bins.dm b/modular_skyrat/master_files/code/game/objects/structures/towel_bins.dm index 41e1a091907..c8eddc849ba 100644 --- a/modular_skyrat/master_files/code/game/objects/structures/towel_bins.dm +++ b/modular_skyrat/master_files/code/game/objects/structures/towel_bins.dm @@ -48,7 +48,7 @@ /obj/structure/towel_bin/screwdriver_act(mob/living/user, obj/item/tool) - if(flags_1 & NODECONSTRUCT_1) + if(obj_flags & NO_DECONSTRUCTION) return FALSE if(amount) diff --git a/modular_skyrat/modules/aesthetics/flag/code/signs_flags.dm b/modular_skyrat/modules/aesthetics/flag/code/signs_flags.dm index e8e4a431989..684ce00919b 100644 --- a/modular_skyrat/modules/aesthetics/flag/code/signs_flags.dm +++ b/modular_skyrat/modules/aesthetics/flag/code/signs_flags.dm @@ -16,7 +16,7 @@ /obj/structure/sign/flag/MouseDrop(over_object, src_location, over_location) . = ..() if(over_object == usr && Adjacent(usr)) - if(!item_flag || src.flags_1 & NODECONSTRUCT_1) + if(!item_flag || src.obj_flags & NO_DECONSTRUCTION) return if(!usr.can_perform_action(src, NEED_DEXTERITY)) return diff --git a/modular_skyrat/modules/aesthetics/rack/code/rack.dm b/modular_skyrat/modules/aesthetics/rack/code/rack.dm index 97815653714..23b0beaba07 100644 --- a/modular_skyrat/modules/aesthetics/rack/code/rack.dm +++ b/modular_skyrat/modules/aesthetics/rack/code/rack.dm @@ -41,7 +41,7 @@ /obj/structure/rack/gunrack/attackby(obj/item/W, mob/living/user, params) var/list/modifiers = params2list(params) - if (W.tool_behaviour == TOOL_WRENCH && !(flags_1&NODECONSTRUCT_1) && LAZYACCESS(modifiers, RIGHT_CLICK)) + if (W.tool_behaviour == TOOL_WRENCH && !(obj_flags & NO_DECONSTRUCTION) && LAZYACCESS(modifiers, RIGHT_CLICK)) W.play_tool_sound(src) deconstruct(TRUE) return diff --git a/modular_skyrat/modules/ashwalkers/code/buildings/fuelwell.dm b/modular_skyrat/modules/ashwalkers/code/buildings/fuelwell.dm index 0203a636230..862d311e16e 100644 --- a/modular_skyrat/modules/ashwalkers/code/buildings/fuelwell.dm +++ b/modular_skyrat/modules/ashwalkers/code/buildings/fuelwell.dm @@ -21,7 +21,7 @@ /obj/structure/sink/fuel_well/attackby(obj/item/O, mob/living/user, params) flick("puddle-oil-splash",src) - if(O.tool_behaviour == TOOL_SHOVEL && !(flags_1 & NODECONSTRUCT_1)) //attempt to deconstruct the puddle with a shovel + if(O.tool_behaviour == TOOL_SHOVEL && !(obj_flags & NO_DECONSTRUCTION)) //attempt to deconstruct the puddle with a shovel to_chat(user, "You fill in the fuel well with soil.") O.play_tool_sound(src) deconstruct() diff --git a/modular_skyrat/modules/cellguns/code/medigun_cells.dm b/modular_skyrat/modules/cellguns/code/medigun_cells.dm index a514ebdb3ee..15e31a7d20b 100644 --- a/modular_skyrat/modules/cellguns/code/medigun_cells.dm +++ b/modular_skyrat/modules/cellguns/code/medigun_cells.dm @@ -538,7 +538,7 @@ icon_state = "hardlight_down" base_icon_state = "hardlight" max_integrity = 1 - flags_1 = NODECONSTRUCT_1 //Made from nothing, can't deconstruct + obj_flags = CAN_BE_HIT | NO_DECONSTRUCTION //Made from nothing, can't deconstruct build_stack_type = null //It would not be good if people could use this to farm materials. var/deploy_time = 20 SECONDS //How long the roller beds lasts for without someone buckled to it. diff --git a/modular_skyrat/modules/colony_fabricator/code/appliances/wall_cell_charger.dm b/modular_skyrat/modules/colony_fabricator/code/appliances/wall_cell_charger.dm index e8afbca61a7..597b52ce5ea 100644 --- a/modular_skyrat/modules/colony_fabricator/code/appliances/wall_cell_charger.dm +++ b/modular_skyrat/modules/colony_fabricator/code/appliances/wall_cell_charger.dm @@ -5,7 +5,7 @@ icon_state = "wall_charger" base_icon_state = "wall_charger" circuit = null - flags_1 = NODECONSTRUCT_1 + obj_flags = CAN_BE_HIT | NO_DECONSTRUCTION max_batteries = 3 charge_rate = 750 /// The item we turn into when repacked diff --git a/modular_skyrat/modules/colony_fabricator/code/colony_fabricator.dm b/modular_skyrat/modules/colony_fabricator/code/colony_fabricator.dm index b547d5c555e..afda38b1339 100644 --- a/modular_skyrat/modules/colony_fabricator/code/colony_fabricator.dm +++ b/modular_skyrat/modules/colony_fabricator/code/colony_fabricator.dm @@ -9,7 +9,7 @@ production_animation = null circuit = null production_animation = "colony_lathe_n" - flags_1 = NODECONSTRUCT_1 + obj_flags = CAN_BE_HIT | NO_DECONSTRUCTION light_color = LIGHT_COLOR_BRIGHT_YELLOW light_power = 5 charges_tax = FALSE diff --git a/modular_skyrat/modules/colony_fabricator/code/machines/arc_furnace.dm b/modular_skyrat/modules/colony_fabricator/code/machines/arc_furnace.dm index e49383c52a2..078bbc96126 100644 --- a/modular_skyrat/modules/colony_fabricator/code/machines/arc_furnace.dm +++ b/modular_skyrat/modules/colony_fabricator/code/machines/arc_furnace.dm @@ -18,7 +18,7 @@ circuit = null light_color = LIGHT_COLOR_BRIGHT_YELLOW light_power = 10 - flags_1 = NODECONSTRUCT_1 + obj_flags = CAN_BE_HIT | NO_DECONSTRUCTION active_power_usage = BASE_MACHINE_ACTIVE_CONSUMPTION * 10 // This baby consumes so much power /// The item we turn into when repacked var/repacked_type = /obj/item/flatpacked_machine/arc_furnace diff --git a/modular_skyrat/modules/colony_fabricator/code/machines/power_storage_unit.dm b/modular_skyrat/modules/colony_fabricator/code/machines/power_storage_unit.dm index ca73a4711bd..d98040312af 100644 --- a/modular_skyrat/modules/colony_fabricator/code/machines/power_storage_unit.dm +++ b/modular_skyrat/modules/colony_fabricator/code/machines/power_storage_unit.dm @@ -9,7 +9,7 @@ input_level_max = 4e5 output_level_max = 4e5 circuit = null - flags_1 = NODECONSTRUCT_1 + obj_flags = CAN_BE_HIT | NO_DECONSTRUCTION /// The item we turn into when repacked var/repacked_type = /obj/item/flatpacked_machine/station_battery diff --git a/modular_skyrat/modules/colony_fabricator/code/machines/rtg.dm b/modular_skyrat/modules/colony_fabricator/code/machines/rtg.dm index 6e2c769b2fd..c01724200ac 100644 --- a/modular_skyrat/modules/colony_fabricator/code/machines/rtg.dm +++ b/modular_skyrat/modules/colony_fabricator/code/machines/rtg.dm @@ -6,7 +6,7 @@ application." icon = 'modular_skyrat/modules/colony_fabricator/icons/machines.dmi' circuit = null - flags_1 = NODECONSTRUCT_1 + obj_flags = CAN_BE_HIT | NO_DECONSTRUCTION power_gen = 7500 /// What we turn into when we are repacked var/repacked_type = /obj/item/flatpacked_machine/rtg diff --git a/modular_skyrat/modules/colony_fabricator/code/machines/solar_panels.dm b/modular_skyrat/modules/colony_fabricator/code/machines/solar_panels.dm index c7708bbdee1..03ca85b3b1f 100644 --- a/modular_skyrat/modules/colony_fabricator/code/machines/solar_panels.dm +++ b/modular_skyrat/modules/colony_fabricator/code/machines/solar_panels.dm @@ -2,7 +2,7 @@ /obj/machinery/power/solar/deployable icon = 'modular_skyrat/modules/colony_fabricator/icons/machines.dmi' - flags_1 = NODECONSTRUCT_1 + obj_flags = CAN_BE_HIT | NO_DECONSTRUCTION /// The item we turn into when repacked var/repacked_type = /obj/item/flatpacked_machine/solar @@ -36,7 +36,7 @@ /obj/machinery/power/tracker/deployable icon = 'modular_skyrat/modules/colony_fabricator/icons/machines.dmi' - flags_1 = NODECONSTRUCT_1 + obj_flags = CAN_BE_HIT | NO_DECONSTRUCTION /// The item we turn into when repacked var/repacked_type = /obj/item/flatpacked_machine/solar_tracker diff --git a/modular_skyrat/modules/colony_fabricator/code/machines/solid_fuel_generator.dm b/modular_skyrat/modules/colony_fabricator/code/machines/solid_fuel_generator.dm index 4fc0f9b781b..a3ac75a0825 100644 --- a/modular_skyrat/modules/colony_fabricator/code/machines/solid_fuel_generator.dm +++ b/modular_skyrat/modules/colony_fabricator/code/machines/solid_fuel_generator.dm @@ -11,7 +11,7 @@ icon_state = "fuel_generator_0" base_icon_state = "fuel_generator" circuit = null - flags_1 = NODECONSTRUCT_1 + obj_flags = CAN_BE_HIT | NO_DECONSTRUCTION anchored = TRUE max_sheets = 25 time_per_sheet = 100 diff --git a/modular_skyrat/modules/jukebox/code/dance_machine.dm b/modular_skyrat/modules/jukebox/code/dance_machine.dm index 1834f6a4306..17030d72740 100644 --- a/modular_skyrat/modules/jukebox/code/dance_machine.dm +++ b/modular_skyrat/modules/jukebox/code/dance_machine.dm @@ -36,7 +36,7 @@ desc = "Now redesigned with data gathered from the extensive disco and plasma research." anchored = TRUE resistance_flags = INDESTRUCTIBLE | LAVA_PROOF | FIRE_PROOF | UNACIDABLE | ACID_PROOF - flags_1 = NODECONSTRUCT_1 + obj_flags = CAN_BE_HIT | NO_DECONSTRUCTION /obj/machinery/jukebox/Initialize(mapload) . = ..() @@ -51,7 +51,7 @@ return ..() /obj/machinery/jukebox/attackby(obj/item/O, mob/user, params) - if(!active && !(flags_1 & NODECONSTRUCT_1)) + if(!active && !(obj_flags & NO_DECONSTRUCTION)) if(O.tool_behaviour == TOOL_WRENCH) if(!anchored && !isinspace()) to_chat(user,span_notice("You secure [src] to the floor.")) diff --git a/modular_skyrat/modules/mapping/code/machinery.dm b/modular_skyrat/modules/mapping/code/machinery.dm index 34dbfeb93b1..960dc2861d3 100644 --- a/modular_skyrat/modules/mapping/code/machinery.dm +++ b/modular_skyrat/modules/mapping/code/machinery.dm @@ -13,7 +13,7 @@ /obj/item/gps/computer/space/wrench_act(mob/living/user, obj/item/I) ..() - if(flags_1 & NODECONSTRUCT_1) + if(obj_flags & NO_DECONSTRUCTION) return TRUE user.visible_message(span_warning("[user] disassembles [src]."), diff --git a/modular_skyrat/modules/mapping/code/shuttles.dm b/modular_skyrat/modules/mapping/code/shuttles.dm index 1ad2e883eec..1b214fac609 100644 --- a/modular_skyrat/modules/mapping/code/shuttles.dm +++ b/modular_skyrat/modules/mapping/code/shuttles.dm @@ -69,7 +69,7 @@ shuttleId = "slaver_syndie" possible_destinations = "syndicate_ne;syndicate_nw;syndicate_n;syndicate_se;syndicate_sw;syndicate_s" resistance_flags = INDESTRUCTIBLE | LAVA_PROOF | FIRE_PROOF | ACID_PROOF - flags_1 = NODECONSTRUCT_1 + obj_flags = CAN_BE_HIT | NO_DECONSTRUCTION /datum/map_template/shuttle/slaver_ship port_id = "slaver ship" diff --git a/modular_skyrat/modules/modular_items/lewd_items/code/lewd_machinery/milking_machine.dm b/modular_skyrat/modules/modular_items/lewd_items/code/lewd_machinery/milking_machine.dm index 246e00ed861..b04539f95ad 100644 --- a/modular_skyrat/modules/modular_items/lewd_items/code/lewd_machinery/milking_machine.dm +++ b/modular_skyrat/modules/modular_items/lewd_items/code/lewd_machinery/milking_machine.dm @@ -16,7 +16,7 @@ icon_state = "milking_pink_off" max_buckled_mobs = 1 item_chair = null - flags_1 = NODECONSTRUCT_1 + obj_flags = CAN_BE_HIT | NO_DECONSTRUCTION max_integrity = 75 var/static/list/milkingmachine_designs diff --git a/modular_skyrat/modules/modular_items/lewd_items/code/lewd_structures/bdsm_furniture.dm b/modular_skyrat/modules/modular_items/lewd_items/code/lewd_structures/bdsm_furniture.dm index 16ac8cc1a25..9e46e1d018d 100644 --- a/modular_skyrat/modules/modular_items/lewd_items/code/lewd_structures/bdsm_furniture.dm +++ b/modular_skyrat/modules/modular_items/lewd_items/code/lewd_structures/bdsm_furniture.dm @@ -7,7 +7,7 @@ icon = 'modular_skyrat/modules/modular_items/lewd_items/icons/obj/lewd_structures/bdsm_furniture.dmi' icon_state = "bdsm_bed" max_integrity = 50 - flags_1 = NODECONSTRUCT_1 + obj_flags = CAN_BE_HIT | NO_DECONSTRUCTION /obj/item/bdsm_bed_kit name = "bdsm bed construction kit" diff --git a/modular_skyrat/modules/modular_items/lewd_items/code/lewd_structures/construction.dm b/modular_skyrat/modules/modular_items/lewd_items/code/lewd_structures/construction.dm index 4ee6fff31b0..cc3ed2cdce8 100644 --- a/modular_skyrat/modules/modular_items/lewd_items/code/lewd_structures/construction.dm +++ b/modular_skyrat/modules/modular_items/lewd_items/code/lewd_structures/construction.dm @@ -3,7 +3,7 @@ name = "construction kit" desc = "Used for constructing various things" w_class = WEIGHT_CLASS_BULKY - flags_1 = NODECONSTRUCT_1 + obj_flags = CAN_BE_HIT | NO_DECONSTRUCTION throwforce = 0 ///What is the path for the resulting structure generating by using this item? var/obj/structure/resulting_structure = /obj/structure/chair diff --git a/modular_skyrat/modules/modular_items/lewd_items/code/lewd_structures/shibari_stand.dm b/modular_skyrat/modules/modular_items/lewd_items/code/lewd_structures/shibari_stand.dm index de489207305..702d7293c62 100644 --- a/modular_skyrat/modules/modular_items/lewd_items/code/lewd_structures/shibari_stand.dm +++ b/modular_skyrat/modules/modular_items/lewd_items/code/lewd_structures/shibari_stand.dm @@ -7,7 +7,7 @@ layer = 4 item_chair = null buildstacktype = null - flags_1 = NODECONSTRUCT_1 + obj_flags = CAN_BE_HIT | NO_DECONSTRUCTION ///Overlays for ropes var/static/mutable_appearance/shibari_rope_overlay var/static/mutable_appearance/shibari_rope_overlay_behind @@ -124,7 +124,7 @@ return FALSE /obj/structure/chair/shibari_stand/deconstruct(disassembled) - if(flags_1 & NODECONSTRUCT_1) + if(obj_flags & NO_DECONSTRUCTION) return qdel(src) diff --git a/modular_skyrat/modules/primitive_cooking_additions/code/stone_oven.dm b/modular_skyrat/modules/primitive_cooking_additions/code/stone_oven.dm index 91bca3b5e95..42a0b9ad013 100644 --- a/modular_skyrat/modules/primitive_cooking_additions/code/stone_oven.dm +++ b/modular_skyrat/modules/primitive_cooking_additions/code/stone_oven.dm @@ -6,7 +6,7 @@ icon = 'modular_skyrat/modules/primitive_cooking_additions/icons/stone_kitchen_machines.dmi' circuit = null use_power = FALSE - flags_1 = NODECONSTRUCT_1 + obj_flags = CAN_BE_HIT | NO_DECONSTRUCTION /// A list of the different oven trays we can spawn with var/static/list/random_oven_tray_types = list( diff --git a/modular_skyrat/modules/primitive_cooking_additions/code/stone_stove.dm b/modular_skyrat/modules/primitive_cooking_additions/code/stone_stove.dm index 642835b93a7..eae9c5190a9 100644 --- a/modular_skyrat/modules/primitive_cooking_additions/code/stone_stove.dm +++ b/modular_skyrat/modules/primitive_cooking_additions/code/stone_stove.dm @@ -10,7 +10,7 @@ use_power = FALSE circuit = null resistance_flags = FIRE_PROOF - flags_1 = NODECONSTRUCT_1 + obj_flags = CAN_BE_HIT | NO_DECONSTRUCTION /obj/machinery/primitive_stove/Initialize(mapload) . = ..() diff --git a/modular_skyrat/modules/primitive_structures/code/fencing.dm b/modular_skyrat/modules/primitive_structures/code/fencing.dm index 86b0561c8ad..0aeb5a71e20 100644 --- a/modular_skyrat/modules/primitive_structures/code/fencing.dm +++ b/modular_skyrat/modules/primitive_structures/code/fencing.dm @@ -7,7 +7,7 @@ icon_state = "fence" layer = BELOW_OBJ_LAYER // I think this is the default but lets be safe? resistance_flags = FLAMMABLE - flags_1 = NODECONSTRUCT_1 | ON_BORDER_1 + flags_1 = NO_DECONSTRUCTION | ON_BORDER_1 /// If we randomize our icon on spawning var/random_icons = TRUE diff --git a/modular_skyrat/modules/primitive_structures/code/storage_structures.dm b/modular_skyrat/modules/primitive_structures/code/storage_structures.dm index 3a0b605fe36..32fb9a79d43 100644 --- a/modular_skyrat/modules/primitive_structures/code/storage_structures.dm +++ b/modular_skyrat/modules/primitive_structures/code/storage_structures.dm @@ -5,7 +5,7 @@ icon_state = "shelf_wood" icon = 'modular_skyrat/modules/primitive_structures/icons/storage.dmi' resistance_flags = FLAMMABLE - flags_1 = NODECONSTRUCT_1 + obj_flags = CAN_BE_HIT | NO_DECONSTRUCTION /obj/structure/rack/wooden/MouseDrop_T(obj/object, mob/user, params) . = ..() @@ -37,7 +37,7 @@ base_icon_state = "barrel" icon = 'modular_skyrat/modules/primitive_structures/icons/storage.dmi' resistance_flags = FLAMMABLE - flags_1 = NODECONSTRUCT_1 + obj_flags = CAN_BE_HIT | NO_DECONSTRUCTION /obj/structure/closet/crate/wooden/storage_barrel/crowbar_act(mob/living/user, obj/item/tool) user.balloon_alert_to_viewers("disassembling...") diff --git a/modular_skyrat/modules/primitive_structures/code/windows.dm b/modular_skyrat/modules/primitive_structures/code/windows.dm index bce34392bc4..ec861bb2d12 100644 --- a/modular_skyrat/modules/primitive_structures/code/windows.dm +++ b/modular_skyrat/modules/primitive_structures/code/windows.dm @@ -4,7 +4,7 @@ icon = 'modular_skyrat/modules/primitive_structures/icons/windows.dmi' icon_state = "green_glass" flags_1 = NONE - obj_flags = CAN_BE_HIT + obj_flags = CAN_BE_HIT | NO_DECONSTRUCTION can_be_unanchored = FALSE fulltile = TRUE - flags_1 = NODECONSTRUCT_1 | PREVENT_CLICK_UNDER_1 + flags_1 = PREVENT_CLICK_UNDER_1 diff --git a/modular_skyrat/modules/stasisrework/code/stasissleeper.dm b/modular_skyrat/modules/stasisrework/code/stasissleeper.dm index 3510fa5c269..dde2910bf04 100644 --- a/modular_skyrat/modules/stasisrework/code/stasissleeper.dm +++ b/modular_skyrat/modules/stasisrework/code/stasissleeper.dm @@ -142,7 +142,7 @@ /obj/machinery/stasissleeper/default_pry_open(obj/item/used_item) if(occupant) thaw_them(occupant) - . = !(state_open || panel_open || (flags_1 & NODECONSTRUCT_1)) && used_item.tool_behaviour == TOOL_CROWBAR + . = !(state_open || panel_open || (obj_flags & NO_DECONSTRUCTION)) && used_item.tool_behaviour == TOOL_CROWBAR if(.) used_item.play_tool_sound(src, 50) visible_message(span_notice("[usr] pries open [src]."), span_notice("You pry open [src].")) diff --git a/modular_skyrat/modules/wrestlingring/code/wrestlingring.dm b/modular_skyrat/modules/wrestlingring/code/wrestlingring.dm index 08649bbc93c..8c0e09deccc 100644 --- a/modular_skyrat/modules/wrestlingring/code/wrestlingring.dm +++ b/modular_skyrat/modules/wrestlingring/code/wrestlingring.dm @@ -114,7 +114,7 @@ return TRUE /obj/structure/wrestling_corner/deconstruct(disassembled) - if(!(flags_1 & NODECONSTRUCT_1)) + if(!(obj_flags & NO_DECONSTRUCTION)) var/obj/item/stack/sheet/iron/iron_sheets = new /obj/item/stack/sheet/iron(drop_location(), 3) transfer_fingerprints_to(iron_sheets) return ..() @@ -122,7 +122,7 @@ ///Implements behaviour that makes it possible to unanchor the railing. /obj/structure/wrestling_corner/wrench_act(mob/living/user, obj/item/tool) . = ..() - if(flags_1 & NODECONSTRUCT_1) + if(obj_flags & NO_DECONSTRUCTION) return to_chat(user, span_notice("You begin to [anchored ? "unfasten the turnbuckle from":"fasten the turnbuckle to"] the floor...")) if(tool.use_tool(src, user, volume = 75, extra_checks = CALLBACK(src, PROC_REF(check_anchored), anchored)))