Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[MIRROR] Alien nests and some other stuf can be hit again. #1215

Merged
merged 1 commit into from
Dec 20, 2023
Merged

[MIRROR] Alien nests and some other stuf can be hit again. #1215

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion code/game/machinery/dance_machine.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
req_access = null
anchored = TRUE
resistance_flags = INDESTRUCTIBLE | LAVA_PROOF | FIRE_PROOF | UNACIDABLE | ACID_PROOF
obj_flags = NO_DECONSTRUCTION
obj_flags = /obj::obj_flags | NO_DECONSTRUCTION

/datum/track
var/song_name = "generic"
Expand Down
2 changes: 1 addition & 1 deletion code/game/machinery/hologram.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
obj_flags = NO_DECONSTRUCTION
obj_flags = /obj::obj_flags | NO_DECONSTRUCTION
on_network = FALSE
///Proximity monitor associated with this atom, needed for proximity checks.
var/datum/proximity_monitor/proximity_monitor
Expand Down
2 changes: 1 addition & 1 deletion code/game/machinery/limbgrower.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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."
obj_flags = NO_DECONSTRUCTION
obj_flags = /obj::obj_flags | NO_DECONSTRUCTION
circuit = /obj/item/circuitboard/machine/limbgrower/fullupgrade

/obj/machinery/limbgrower/fullupgrade/Initialize(mapload)
Expand Down
2 changes: 1 addition & 1 deletion code/game/machinery/telecomms/machines/allinone.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@

/obj/machinery/telecomms/allinone/indestructible
resistance_flags = INDESTRUCTIBLE | LAVA_PROOF | FIRE_PROOF | UNACIDABLE | ACID_PROOF
obj_flags = NO_DECONSTRUCTION
obj_flags = /obj::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
Expand Down
2 changes: 1 addition & 1 deletion code/game/objects/structures/beds_chairs/alien_nest.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
smoothing_groups = SMOOTH_GROUP_ALIEN_NEST
canSmoothWith = SMOOTH_GROUP_ALIEN_NEST
build_stack_type = null
obj_flags = NO_DECONSTRUCTION
obj_flags = /obj::obj_flags | NO_DECONSTRUCTION
elevation = 0
var/static/mutable_appearance/nest_overlay = mutable_appearance('icons/mob/nonhuman-player/alien.dmi', "nestoverlay", LYING_MOB_LAYER)

Expand Down
2 changes: 1 addition & 1 deletion code/game/objects/structures/beds_chairs/chair.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -495,7 +495,7 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/structure/chair/stool/bar, 0)
icon_state = null
buildstacktype = null
item_chair = null
obj_flags = NO_DECONSTRUCTION
obj_flags = /obj::obj_flags | NO_DECONSTRUCTION
alpha = 0

/obj/structure/chair/mime/post_buckle_mob(mob/living/M)
Expand Down
3 changes: 2 additions & 1 deletion code/game/objects/structures/flora.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -446,11 +446,12 @@
name = "xmas tree"
desc = "A wondrous decorated Christmas tree."
icon_state = "pine_c"
obj_flags = NO_DECONSTRUCTION //protected by the christmas spirit

/obj/structure/flora/tree/pine/xmas/presents
icon_state = "pinepresents"
desc = "A wondrous decorated Christmas tree. It has presents!"
resistance_flags = INDESTRUCTIBLE | LAVA_PROOF | FIRE_PROOF | UNACIDABLE | ACID_PROOF //protected by the christmas spirit
obj_flags = /obj::obj_flags | NO_DECONSTRUCTION
var/gift_type = /obj/item/gift/anything
var/unlimited = FALSE
var/static/list/took_presents //shared between all xmas trees
Expand Down
2 changes: 1 addition & 1 deletion code/game/objects/structures/window.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -803,7 +803,7 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/structure/window/reinforced/tinted/frosted/spaw

/obj/structure/window/reinforced/shuttle/indestructible
name = "hardened shuttle window"
obj_flags = NO_DECONSTRUCTION
obj_flags = /obj::obj_flags | NO_DECONSTRUCTION
flags_1 = PREVENT_CLICK_UNDER_1
resistance_flags = INDESTRUCTIBLE | LAVA_PROOF | FIRE_PROOF | UNACIDABLE | ACID_PROOF

Expand Down
2 changes: 1 addition & 1 deletion code/modules/awaymissions/mission_code/murderdome.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@

/obj/structure/window/reinforced/fulltile/indestructible
name = "robust window"
obj_flags = NO_DECONSTRUCTION
obj_flags = /obj::obj_flags | NO_DECONSTRUCTION
flags_1 = PREVENT_CLICK_UNDER_1
resistance_flags = INDESTRUCTIBLE | LAVA_PROOF | FIRE_PROOF | UNACIDABLE | ACID_PROOF

Expand Down
2 changes: 1 addition & 1 deletion code/modules/capture_the_flag/ctf_game.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -464,7 +464,7 @@

/obj/structure/table/reinforced/ctf
resistance_flags = INDESTRUCTIBLE
obj_flags = NO_DECONSTRUCTION
obj_flags = /obj::obj_flags | NO_DECONSTRUCTION

#define CTF_LOADING_UNLOADED 0
#define CTF_LOADING_LOADING 1
Expand Down
2 changes: 1 addition & 1 deletion code/modules/food_and_drinks/machinery/food_cart.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
anchored = FALSE
use_power = NO_POWER_USE
req_access = list(ACCESS_KITCHEN)
obj_flags = NO_DECONSTRUCTION
obj_flags = /obj::obj_flags | NO_DECONSTRUCTION
var/unpacked = FALSE
var/obj/machinery/griddle/stand/cart_griddle
var/obj/machinery/smartfridge/food/cart_smartfridge
Expand Down
2 changes: 1 addition & 1 deletion code/modules/hydroponics/hydroponics.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1159,7 +1159,7 @@
circuit = null
density = FALSE
use_power = NO_POWER_USE
obj_flags = NO_DECONSTRUCTION
obj_flags = /obj::obj_flags | NO_DECONSTRUCTION
unwrenchable = FALSE
self_sustaining_overlay_icon_state = null
maxnutri = 15
Expand Down
2 changes: 1 addition & 1 deletion code/modules/mining/equipment/survival_pod.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
obj_flags = NO_DECONSTRUCTION
obj_flags = /obj::obj_flags | NO_DECONSTRUCTION

/obj/machinery/smartfridge/survival_pod/Initialize(mapload)
AddElement(/datum/element/update_icon_blocker)
Expand Down
2 changes: 1 addition & 1 deletion code/modules/reagents/chemistry/machinery/chem_dispenser.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -785,7 +785,7 @@
/obj/machinery/chem_dispenser/mutagensaltpeter
name = "botanical chemical dispenser"
desc = "Creates and dispenses chemicals useful for botany."
obj_flags = NO_DECONSTRUCTION
obj_flags = /obj::obj_flags | NO_DECONSTRUCTION
circuit = /obj/item/circuitboard/machine/chem_dispenser/mutagensaltpeter

/// The default list of dispensable reagents available in the mutagensaltpeter chem dispenser
Expand Down
2 changes: 1 addition & 1 deletion code/modules/reagents/chemistry/machinery/chem_synthesizer.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
base_icon_state = "dispenser"
amount = 10
resistance_flags = INDESTRUCTIBLE | FIRE_PROOF | ACID_PROOF | LAVA_PROOF
obj_flags = NO_DECONSTRUCTION
obj_flags = /obj::obj_flags | NO_DECONSTRUCTION
use_power = NO_POWER_USE
var/static/list/shortcuts = list(
"meth" = /datum/reagent/drug/methamphetamine
Expand Down
2 changes: 1 addition & 1 deletion code/modules/shuttle/spaceship_navigation_beacon.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
icon_state = "beacon_active"
base_icon_state = "beacon"
density = TRUE
obj_flags = NO_DECONSTRUCTION
obj_flags = /obj::obj_flags | NO_DECONSTRUCTION

/// Locked beacons cannot be jumped to by ships.
var/locked = FALSE
Expand Down
4 changes: 2 additions & 2 deletions code/modules/shuttle/special.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@
var/obj/machinery/power/emitter/energycannon/magical/our_statue
var/list/mob/living/sleepers = list()
var/never_spoken = TRUE
obj_flags = NO_DECONSTRUCTION
obj_flags = /obj::obj_flags | NO_DECONSTRUCTION

/obj/structure/table/abductor/wabbajack/Initialize(mapload)
. = ..()
Expand Down Expand Up @@ -201,7 +201,7 @@

/obj/structure/table/wood/shuttle_bar
resistance_flags = LAVA_PROOF | FIRE_PROOF | ACID_PROOF
obj_flags = NO_DECONSTRUCTION
obj_flags = /obj::obj_flags | NO_DECONSTRUCTION
max_integrity = 1000
var/boot_dir = 1

Expand Down
2 changes: 1 addition & 1 deletion code/modules/shuttle/syndicate.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
obj_flags = NO_DECONSTRUCTION
obj_flags = /obj::obj_flags | NO_DECONSTRUCTION

/obj/machinery/computer/shuttle/syndicate/launch_check(mob/user)
. = ..()
Expand Down
2 changes: 1 addition & 1 deletion code/modules/transport/tram/tram_controller.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -697,7 +697,7 @@

/obj/machinery/transport/tram_controller/hilbert
configured_transport_id = HILBERT_LINE_1
obj_flags = NO_DECONSTRUCTION
obj_flags = /obj::obj_flags | NO_DECONSTRUCTION

/obj/machinery/transport/tram_controller/Initialize(mapload)
. = ..()
Expand Down
Loading