From f9e709c18cfc9ea5e64f155d0977df99ff93edd4 Mon Sep 17 00:00:00 2001 From: Jordan Brown Date: Fri, 1 Jun 2018 12:27:38 -0400 Subject: [PATCH] Merge pull request #38116 from AutomaticFrenzy/patch/anchored Refactor machinery to default to being anchored --- code/game/machinery/Beacon.dm | 1 - code/game/machinery/PDApainter.dm | 3 +-- code/game/machinery/Sleeper.dm | 2 -- code/game/machinery/_machinery.dm | 1 + code/game/machinery/ai_slipper.dm | 1 - code/game/machinery/airlock_control.dm | 1 - code/game/machinery/announcement_system.dm | 1 - code/game/machinery/aug_manipulator.dm | 1 - code/game/machinery/autolathe.dm | 3 +-- code/game/machinery/buttons.dm | 1 - code/game/machinery/camera/camera.dm | 1 - code/game/machinery/cell_charger.dm | 1 - code/game/machinery/cloning.dm | 1 - code/game/machinery/computer/_computer.dm | 1 - code/game/machinery/computer/atmos_control.dm | 1 - code/game/machinery/computer/dna_console.dm | 1 - code/game/machinery/dance_machine.dm | 1 - code/game/machinery/defibrillator_mount.dm | 1 - code/game/machinery/dish_drive.dm | 1 - code/game/machinery/dna_scanner.dm | 1 - code/game/machinery/doors/brigdoors.dm | 1 - code/game/machinery/doors/door.dm | 1 - code/game/machinery/doppler_array.dm | 1 - code/game/machinery/droneDispenser.dm | 1 - .../machinery/embedded_controller/access_controller.dm | 1 - .../embedded_controller/embedded_controller_base.dm | 1 - code/game/machinery/firealarm.dm | 1 - code/game/machinery/flasher.dm | 1 - code/game/machinery/gulag_item_reclaimer.dm | 1 - code/game/machinery/gulag_teleporter.dm | 1 - code/game/machinery/hologram.dm | 1 - code/game/machinery/igniter.dm | 8 +++----- code/game/machinery/launch_pad.dm | 5 ++--- code/game/machinery/lightswitch.dm | 1 - code/game/machinery/limbgrower.dm | 1 - code/game/machinery/magnet.dm | 2 -- code/game/machinery/mass_driver.dm | 1 - code/game/machinery/navbeacon.dm | 1 - code/game/machinery/newscaster.dm | 1 - code/game/machinery/pipe/pipe_dispenser.dm | 3 --- code/game/machinery/porta_turret/portable_turret.dm | 2 -- .../machinery/porta_turret/portable_turret_construct.dm | 1 + .../game/machinery/porta_turret/portable_turret_cover.dm | 1 - code/game/machinery/quantum_pad.dm | 1 - code/game/machinery/recharger.dm | 1 - code/game/machinery/rechargestation.dm | 1 - code/game/machinery/recycler.dm | 1 - code/game/machinery/requests_console.dm | 1 - code/game/machinery/shieldgen.dm | 1 - code/game/machinery/slotmachine.dm | 1 - code/game/machinery/status_display.dm | 2 -- code/game/machinery/suit_storage_unit.dm | 1 - code/game/machinery/telecomms/machines/allinone.dm | 1 - code/game/machinery/telecomms/machines/broadcaster.dm | 1 - code/game/machinery/telecomms/machines/bus.dm | 1 - code/game/machinery/telecomms/machines/hub.dm | 1 - code/game/machinery/telecomms/machines/message_server.dm | 2 -- code/game/machinery/telecomms/machines/processor.dm | 1 - code/game/machinery/telecomms/machines/receiver.dm | 1 - code/game/machinery/telecomms/machines/relay.dm | 1 - code/game/machinery/telecomms/machines/server.dm | 1 - code/game/machinery/teleporter.dm | 1 - code/game/machinery/transformer.dm | 1 - code/game/machinery/washing_machine.dm | 1 - code/game/machinery/wishgranter.dm | 1 - code/game/mecha/mech_bay.dm | 1 - code/game/mecha/mech_fabricator.dm | 1 - code/game/objects/items/implants/implantchair.dm | 1 - code/game/objects/structures/manned_turret.dm | 1 + code/game/objects/structures/watercloset.dm | 1 - code/modules/NTNet/relays.dm | 1 - code/modules/VR/vr_sleeper.dm | 7 +++---- code/modules/antagonists/abductor/machinery/console.dm | 1 - code/modules/antagonists/abductor/machinery/dispenser.dm | 1 - .../modules/antagonists/abductor/machinery/experiment.dm | 1 - code/modules/antagonists/abductor/machinery/pad.dm | 1 - code/modules/antagonists/nukeop/equipment/nuclearbomb.dm | 1 + .../antagonists/traitor/equipment/Malf_Modules.dm | 1 - code/modules/atmospherics/machinery/airalarm.dm | 1 - .../machinery/components/binary_devices/circulator.dm | 1 - .../machinery/components/unary_devices/cryo.dm | 1 - .../machinery/components/unary_devices/thermomachine.dm | 1 - code/modules/atmospherics/machinery/other/meter.dm | 1 - code/modules/atmospherics/machinery/other/miner.dm | 1 - .../machinery/portable/portable_atmospherics.dm | 2 +- code/modules/awaymissions/bluespaceartillery.dm | 1 - code/modules/awaymissions/capture_the_flag.dm | 2 -- code/modules/awaymissions/gateway.dm | 1 - code/modules/awaymissions/mission_code/wildwest.dm | 1 - code/modules/events/pirates.dm | 2 -- .../food_and_drinks/kitchen_machinery/deep_fryer.dm | 1 - code/modules/food_and_drinks/kitchen_machinery/gibber.dm | 1 - .../food_and_drinks/kitchen_machinery/microwave.dm | 1 - .../food_and_drinks/kitchen_machinery/monkeyrecycler.dm | 1 - .../food_and_drinks/kitchen_machinery/processor.dm | 1 - .../food_and_drinks/kitchen_machinery/smartfridge.dm | 1 - code/modules/holodeck/items.dm | 1 - code/modules/hydroponics/biogenerator.dm | 1 - code/modules/hydroponics/gene_modder.dm | 1 - code/modules/hydroponics/hydroponics.dm | 1 - code/modules/hydroponics/seed_extractor.dm | 1 - code/modules/library/lib_machines.dm | 2 -- code/modules/mining/laborcamp/laborstacker.dm | 2 -- code/modules/mining/machine_processing.dm | 2 -- code/modules/mining/machine_redemption.dm | 1 - code/modules/mining/machine_stacking.dm | 2 -- code/modules/mining/machine_unloading.dm | 1 - code/modules/mining/machine_vending.dm | 1 - code/modules/mining/mint.dm | 1 - code/modules/mob/living/simple_animal/bot/bot.dm | 1 + .../living/simple_animal/hostile/megafauna/colossus.dm | 1 + .../computers/machinery/modular_console.dm | 3 +-- code/modules/modular_computers/laptop_vendor.dm | 1 - code/modules/paperwork/photocopier.dm | 1 - code/modules/power/antimatter/shielding.dm | 1 - code/modules/power/apc.dm | 1 - code/modules/power/floodlight.dm | 1 - code/modules/power/generator.dm | 1 - code/modules/power/gravitygenerator.dm | 1 - code/modules/power/lighting.dm | 1 - code/modules/power/rtg.dm | 1 - code/modules/power/singularity/containment_field.dm | 1 - code/modules/power/smes.dm | 1 - code/modules/power/solar.dm | 2 -- code/modules/power/terminal.dm | 3 +-- code/modules/power/tracker.dm | 1 - code/modules/power/turbine.dm | 2 -- .../reagents/chemistry/machinery/chem_dispenser.dm | 3 --- code/modules/reagents/chemistry/machinery/chem_heater.dm | 1 - code/modules/reagents/chemistry/machinery/chem_master.dm | 1 - code/modules/reagents/chemistry/machinery/pandemic.dm | 1 - .../reagents/chemistry/machinery/reagentgrinder.dm | 1 - .../reagents/chemistry/machinery/smoke_machine.dm | 1 - code/modules/recycling/conveyor2.dm | 9 ++------- code/modules/recycling/disposal/bin.dm | 1 - code/modules/research/experimentor.dm | 1 - code/modules/research/rdmachines.dm | 1 - code/modules/security_levels/keycard_authentication.dm | 1 - code/modules/shuttle/manipulator.dm | 1 - code/modules/shuttle/on_move.dm | 5 ----- code/modules/station_goals/shield.dm | 5 +++-- code/modules/vending/_vending.dm | 1 - 142 files changed, 24 insertions(+), 177 deletions(-) diff --git a/code/game/machinery/Beacon.dm b/code/game/machinery/Beacon.dm index 61e862452faa..3d0931d534b9 100644 --- a/code/game/machinery/Beacon.dm +++ b/code/game/machinery/Beacon.dm @@ -6,7 +6,6 @@ desc = "A device that draws power from bluespace and creates a permanent tracking beacon." level = 1 // underfloor layer = LOW_OBJ_LAYER - anchored = TRUE use_power = IDLE_POWER_USE idle_power_usage = 0 var/obj/item/beacon/Beacon diff --git a/code/game/machinery/PDApainter.dm b/code/game/machinery/PDApainter.dm index d595906b456f..3ac916550e4c 100644 --- a/code/game/machinery/PDApainter.dm +++ b/code/game/machinery/PDApainter.dm @@ -4,10 +4,9 @@ icon = 'icons/obj/pda.dmi' icon_state = "pdapainter" density = TRUE - anchored = TRUE + max_integrity = 200 var/obj/item/pda/storedpda = null var/list/colorlist = list() - max_integrity = 200 /obj/machinery/pdapainter/update_icon() diff --git a/code/game/machinery/Sleeper.dm b/code/game/machinery/Sleeper.dm index d7d1288ab33f..b3acda626019 100644 --- a/code/game/machinery/Sleeper.dm +++ b/code/game/machinery/Sleeper.dm @@ -3,7 +3,6 @@ icon = 'icons/obj/machines/sleeper.dmi' icon_state = "console" density = FALSE - anchored = TRUE /obj/machinery/sleeper name = "sleeper" @@ -11,7 +10,6 @@ icon = 'icons/obj/machines/sleeper.dmi' icon_state = "sleeper" density = FALSE - anchored = TRUE state_open = TRUE circuit = /obj/item/circuitboard/machine/sleeper var/efficiency = 1 diff --git a/code/game/machinery/_machinery.dm b/code/game/machinery/_machinery.dm index 3d1d20dcae05..7f661b4556f8 100644 --- a/code/game/machinery/_machinery.dm +++ b/code/game/machinery/_machinery.dm @@ -92,6 +92,7 @@ Class Procs: pressure_resistance = 15 max_integrity = 200 + anchored = TRUE interaction_flags_atom = INTERACT_ATOM_ATTACK_HAND | INTERACT_ATOM_UI_INTERACT var/stat = 0 diff --git a/code/game/machinery/ai_slipper.dm b/code/game/machinery/ai_slipper.dm index a09db0a3cc27..cac29404d21a 100644 --- a/code/game/machinery/ai_slipper.dm +++ b/code/game/machinery/ai_slipper.dm @@ -5,7 +5,6 @@ icon_state = "ai-slipper0" layer = PROJECTILE_HIT_THRESHHOLD_LAYER plane = FLOOR_PLANE - anchored = TRUE max_integrity = 200 armor = list("melee" = 50, "bullet" = 20, "laser" = 20, "energy" = 20, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 30) diff --git a/code/game/machinery/airlock_control.dm b/code/game/machinery/airlock_control.dm index a04b86a5d819..be0f14a155b8 100644 --- a/code/game/machinery/airlock_control.dm +++ b/code/game/machinery/airlock_control.dm @@ -90,7 +90,6 @@ name = "airlock sensor" resistance_flags = INDESTRUCTIBLE | LAVA_PROOF | FIRE_PROOF | UNACIDABLE | ACID_PROOF - anchored = TRUE power_channel = ENVIRON var/id_tag diff --git a/code/game/machinery/announcement_system.dm b/code/game/machinery/announcement_system.dm index 625e327f5d6e..995b175948cd 100644 --- a/code/game/machinery/announcement_system.dm +++ b/code/game/machinery/announcement_system.dm @@ -2,7 +2,6 @@ GLOBAL_LIST_EMPTY(announcement_systems) /obj/machinery/announcement_system density = TRUE - anchored = TRUE name = "\improper Automated Announcement System" desc = "An automated announcement system that handles minor announcements over the radio." icon = 'icons/obj/machines/telecomms.dmi' diff --git a/code/game/machinery/aug_manipulator.dm b/code/game/machinery/aug_manipulator.dm index 8445f62d9779..a168cdd4d50f 100644 --- a/code/game/machinery/aug_manipulator.dm +++ b/code/game/machinery/aug_manipulator.dm @@ -4,7 +4,6 @@ icon = 'icons/obj/pda.dmi' icon_state = "pdapainter" density = TRUE - anchored = TRUE obj_integrity = 200 max_integrity = 200 var/obj/item/bodypart/storedpart diff --git a/code/game/machinery/autolathe.dm b/code/game/machinery/autolathe.dm index 57c0233322a6..22db77090b4e 100644 --- a/code/game/machinery/autolathe.dm +++ b/code/game/machinery/autolathe.dm @@ -7,13 +7,12 @@ desc = "It produces items using metal and glass." icon_state = "autolathe" density = TRUE - anchored = TRUE use_power = IDLE_POWER_USE idle_power_usage = 10 active_power_usage = 100 circuit = /obj/item/circuitboard/machine/autolathe layer = BELOW_OBJ_LAYER - + var/operating = FALSE var/list/L = list() var/list/LL = list() diff --git a/code/game/machinery/buttons.dm b/code/game/machinery/buttons.dm index a2fea8d88ace..08c0d5899d87 100644 --- a/code/game/machinery/buttons.dm +++ b/code/game/machinery/buttons.dm @@ -11,7 +11,6 @@ var/id = null var/initialized_button = 0 armor = list("melee" = 50, "bullet" = 50, "laser" = 50, "energy" = 50, "bomb" = 10, "bio" = 100, "rad" = 100, "fire" = 90, "acid" = 70) - anchored = TRUE use_power = IDLE_POWER_USE idle_power_usage = 2 resistance_flags = INDESTRUCTIBLE | LAVA_PROOF | FIRE_PROOF | UNACIDABLE | ACID_PROOF diff --git a/code/game/machinery/camera/camera.dm b/code/game/machinery/camera/camera.dm index 2ea74637d567..45260deac9cf 100644 --- a/code/game/machinery/camera/camera.dm +++ b/code/game/machinery/camera/camera.dm @@ -21,7 +21,6 @@ var/c_tag = null var/c_tag_order = 999 var/status = TRUE - anchored = TRUE var/start_active = FALSE //If it ignores the random chance to start broken on round start var/invuln = null var/obj/item/camera_bug/bug = null diff --git a/code/game/machinery/cell_charger.dm b/code/game/machinery/cell_charger.dm index e6816a3170be..9a59d4aea5ec 100644 --- a/code/game/machinery/cell_charger.dm +++ b/code/game/machinery/cell_charger.dm @@ -3,7 +3,6 @@ desc = "It charges power cells." icon = 'icons/obj/power.dmi' icon_state = "ccharger" - anchored = TRUE use_power = IDLE_POWER_USE idle_power_usage = 5 active_power_usage = 60 diff --git a/code/game/machinery/cloning.dm b/code/game/machinery/cloning.dm index 003c33c0e7cb..79d81c0d75dc 100644 --- a/code/game/machinery/cloning.dm +++ b/code/game/machinery/cloning.dm @@ -9,7 +9,6 @@ #define SPEAK(message) radio.talk_into(src, message, radio_channel, get_spans(), get_default_language()) /obj/machinery/clonepod - anchored = TRUE name = "cloning pod" desc = "An electronically-lockable pod for growing organic tissue." density = TRUE diff --git a/code/game/machinery/computer/_computer.dm b/code/game/machinery/computer/_computer.dm index cbb680658103..2a9a57e63094 100644 --- a/code/game/machinery/computer/_computer.dm +++ b/code/game/machinery/computer/_computer.dm @@ -3,7 +3,6 @@ icon = 'icons/obj/computer.dmi' icon_state = "computer" density = TRUE - anchored = TRUE use_power = IDLE_POWER_USE idle_power_usage = 300 active_power_usage = 300 diff --git a/code/game/machinery/computer/atmos_control.dm b/code/game/machinery/computer/atmos_control.dm index 6e4507c465c3..7eb8e206b52f 100644 --- a/code/game/machinery/computer/atmos_control.dm +++ b/code/game/machinery/computer/atmos_control.dm @@ -6,7 +6,6 @@ name = "gas sensor" icon = 'icons/obj/stationobjs.dmi' icon_state = "gsensor1" - anchored = TRUE var/on = TRUE diff --git a/code/game/machinery/computer/dna_console.dm b/code/game/machinery/computer/dna_console.dm index 0b90f1df14a0..72e17679f5ad 100644 --- a/code/game/machinery/computer/dna_console.dm +++ b/code/game/machinery/computer/dna_console.dm @@ -33,7 +33,6 @@ var/obj/machinery/dna_scannernew/connected = null var/obj/item/disk/data/diskette = null var/list/delayed_action = null - anchored = TRUE use_power = IDLE_POWER_USE idle_power_usage = 10 active_power_usage = 400 diff --git a/code/game/machinery/dance_machine.dm b/code/game/machinery/dance_machine.dm index 750d83eeccc5..5fd40a401ec2 100644 --- a/code/game/machinery/dance_machine.dm +++ b/code/game/machinery/dance_machine.dm @@ -3,7 +3,6 @@ desc = "A classic music player." icon = 'icons/obj/stationobjs.dmi' icon_state = "jukebox" - anchored = TRUE verb_say = "states" density = TRUE req_access = list(ACCESS_BAR) diff --git a/code/game/machinery/defibrillator_mount.dm b/code/game/machinery/defibrillator_mount.dm index 2b17118cc8d5..5a041e6baa5f 100644 --- a/code/game/machinery/defibrillator_mount.dm +++ b/code/game/machinery/defibrillator_mount.dm @@ -7,7 +7,6 @@ icon = 'icons/obj/machines/defib_mount.dmi' icon_state = "defibrillator_mount" density = FALSE - anchored = TRUE use_power = IDLE_POWER_USE idle_power_usage = 1 power_channel = EQUIP diff --git a/code/game/machinery/dish_drive.dm b/code/game/machinery/dish_drive.dm index 2254500afe63..7e960d4ebcf4 100644 --- a/code/game/machinery/dish_drive.dm +++ b/code/game/machinery/dish_drive.dm @@ -7,7 +7,6 @@ icon_state = "synthesizer" idle_power_usage = 8 //5 with default parts active_power_usage = 13 //10 with default parts - anchored = TRUE density = FALSE circuit = /obj/item/circuitboard/machine/dish_drive var/static/list/item_types = list(/obj/item/trash/waffles, diff --git a/code/game/machinery/dna_scanner.dm b/code/game/machinery/dna_scanner.dm index 2a8868cb4f1a..507d6c6f4366 100644 --- a/code/game/machinery/dna_scanner.dm +++ b/code/game/machinery/dna_scanner.dm @@ -4,7 +4,6 @@ icon = 'icons/obj/machines/cloning.dmi' icon_state = "scanner" density = TRUE - anchored = TRUE use_power = IDLE_POWER_USE idle_power_usage = 50 active_power_usage = 300 diff --git a/code/game/machinery/doors/brigdoors.dm b/code/game/machinery/doors/brigdoors.dm index 3ab819f2759f..3542b4e8bd08 100644 --- a/code/game/machinery/doors/brigdoors.dm +++ b/code/game/machinery/doors/brigdoors.dm @@ -24,7 +24,6 @@ icon_state = "frame" desc = "A remote control for a door." req_access = list(ACCESS_SECURITY) - anchored = TRUE density = FALSE var/id = null // id of linked machinery/lockers diff --git a/code/game/machinery/doors/door.dm b/code/game/machinery/doors/door.dm index baba3f0009a7..e169c66c2423 100644 --- a/code/game/machinery/doors/door.dm +++ b/code/game/machinery/doors/door.dm @@ -3,7 +3,6 @@ desc = "It opens and closes." icon = 'icons/obj/doors/Doorint.dmi' icon_state = "door1" - anchored = TRUE opacity = 1 density = TRUE layer = OPEN_DOOR_LAYER diff --git a/code/game/machinery/doppler_array.dm b/code/game/machinery/doppler_array.dm index 0abc3e8ceacc..1131c55eb3ca 100644 --- a/code/game/machinery/doppler_array.dm +++ b/code/game/machinery/doppler_array.dm @@ -6,7 +6,6 @@ GLOBAL_LIST_EMPTY(doppler_arrays) icon = 'icons/obj/machines/research.dmi' icon_state = "tdoppler" density = TRUE - anchored = TRUE var/integrated = FALSE var/max_dist = 150 verb_say = "states coldly" diff --git a/code/game/machinery/droneDispenser.dm b/code/game/machinery/droneDispenser.dm index ffed5c766182..ffe7961534f6 100644 --- a/code/game/machinery/droneDispenser.dm +++ b/code/game/machinery/droneDispenser.dm @@ -8,7 +8,6 @@ icon = 'icons/obj/machines/droneDispenser.dmi' icon_state = "on" - anchored = TRUE density = TRUE max_integrity = 250 diff --git a/code/game/machinery/embedded_controller/access_controller.dm b/code/game/machinery/embedded_controller/access_controller.dm index 63b7f2caebc1..70ce3d36aea9 100644 --- a/code/game/machinery/embedded_controller/access_controller.dm +++ b/code/game/machinery/embedded_controller/access_controller.dm @@ -6,7 +6,6 @@ /obj/machinery/doorButtons power_channel = ENVIRON - anchored = TRUE use_power = IDLE_POWER_USE idle_power_usage = 2 active_power_usage = 4 diff --git a/code/game/machinery/embedded_controller/embedded_controller_base.dm b/code/game/machinery/embedded_controller/embedded_controller_base.dm index 3ea730b579d9..063cfa6805ac 100644 --- a/code/game/machinery/embedded_controller/embedded_controller_base.dm +++ b/code/game/machinery/embedded_controller/embedded_controller_base.dm @@ -22,7 +22,6 @@ name = "embedded controller" density = FALSE - anchored = TRUE var/on = TRUE diff --git a/code/game/machinery/firealarm.dm b/code/game/machinery/firealarm.dm index b2e1ad7e5b02..973f96b09d90 100644 --- a/code/game/machinery/firealarm.dm +++ b/code/game/machinery/firealarm.dm @@ -16,7 +16,6 @@ desc = "\"Pull this in case of emergency\". Thus, keep pulling it forever." icon = 'icons/obj/monitors.dmi' icon_state = "fire0" - anchored = TRUE max_integrity = 250 integrity_failure = 100 armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 100, "rad" = 100, "fire" = 90, "acid" = 30) diff --git a/code/game/machinery/flasher.dm b/code/game/machinery/flasher.dm index 701c637a56b5..56c9544a1a18 100644 --- a/code/game/machinery/flasher.dm +++ b/code/game/machinery/flasher.dm @@ -7,7 +7,6 @@ icon_state = "mflash1" max_integrity = 250 integrity_failure = 100 - anchored = TRUE var/obj/item/assembly/flash/handheld/bulb var/id = null var/range = 2 //this is roughly the size of brig cell diff --git a/code/game/machinery/gulag_item_reclaimer.dm b/code/game/machinery/gulag_item_reclaimer.dm index 628071bd2198..c955edbcd0d8 100644 --- a/code/game/machinery/gulag_item_reclaimer.dm +++ b/code/game/machinery/gulag_item_reclaimer.dm @@ -5,7 +5,6 @@ icon_state = "dorm_taken" req_access = list(ACCESS_SECURITY) //REQACCESS TO ACCESS ALL STORED ITEMS density = FALSE - anchored = TRUE use_power = IDLE_POWER_USE idle_power_usage = 100 active_power_usage = 2500 diff --git a/code/game/machinery/gulag_teleporter.dm b/code/game/machinery/gulag_teleporter.dm index 08db7b41e2d3..4e993cf8c8a6 100644 --- a/code/game/machinery/gulag_teleporter.dm +++ b/code/game/machinery/gulag_teleporter.dm @@ -13,7 +13,6 @@ The console is located at computer/gulag_teleporter.dm icon_state = "implantchair" state_open = FALSE density = TRUE - anchored = TRUE use_power = IDLE_POWER_USE idle_power_usage = 200 active_power_usage = 5000 diff --git a/code/game/machinery/hologram.dm b/code/game/machinery/hologram.dm index 61ee4eb1782f..887335f16a1c 100644 --- a/code/game/machinery/hologram.dm +++ b/code/game/machinery/hologram.dm @@ -34,7 +34,6 @@ Possible to do for anyone motivated enough: layer = LOW_OBJ_LAYER plane = FLOOR_PLANE flags_1 = HEAR_1 - anchored = TRUE use_power = IDLE_POWER_USE idle_power_usage = 5 active_power_usage = 100 diff --git a/code/game/machinery/igniter.dm b/code/game/machinery/igniter.dm index d5bb8db0e389..041161e1fa30 100644 --- a/code/game/machinery/igniter.dm +++ b/code/game/machinery/igniter.dm @@ -4,15 +4,14 @@ icon = 'icons/obj/stationobjs.dmi' icon_state = "igniter0" plane = FLOOR_PLANE - var/id = null - var/on = FALSE - anchored = TRUE use_power = IDLE_POWER_USE idle_power_usage = 2 active_power_usage = 4 max_integrity = 300 armor = list("melee" = 50, "bullet" = 30, "laser" = 70, "energy" = 50, "bomb" = 20, "bio" = 0, "rad" = 0, "fire" = 100, "acid" = 70) resistance_flags = FIRE_PROOF + var/id = null + var/on = FALSE /obj/machinery/igniter/on on = TRUE @@ -52,13 +51,12 @@ desc = "A wall-mounted ignition device." icon = 'icons/obj/stationobjs.dmi' icon_state = "migniter" + resistance_flags = FIRE_PROOF var/id = null var/disable = 0 var/last_spark = 0 var/base_state = "migniter" var/datum/effect_system/spark_spread/spark_system - anchored = TRUE - resistance_flags = FIRE_PROOF /obj/machinery/sparker/Initialize() . = ..() diff --git a/code/game/machinery/launch_pad.dm b/code/game/machinery/launch_pad.dm index 95bf10bc6c9f..54bf0cf36e48 100644 --- a/code/game/machinery/launch_pad.dm +++ b/code/game/machinery/launch_pad.dm @@ -3,12 +3,11 @@ desc = "A bluespace pad able to thrust matter through bluespace, teleporting it to or from nearby locations." icon = 'icons/obj/telescience.dmi' icon_state = "lpad-idle" - var/icon_teleport = "lpad-beam" - anchored = TRUE use_power = TRUE idle_power_usage = 200 active_power_usage = 2500 circuit = /obj/item/circuitboard/machine/launchpad + var/icon_teleport = "lpad-beam" var/stationary = TRUE //to prevent briefcase pad deconstruction and such var/display_name = "Launchpad" var/teleport_speed = 35 @@ -53,7 +52,7 @@ if(teleporting) to_chat(user, "ERROR: Launchpad busy.") return - + var/turf/dest = get_turf(src) if(dest && is_centcom_level(dest.z)) diff --git a/code/game/machinery/lightswitch.dm b/code/game/machinery/lightswitch.dm index 8c0e65fa82d5..cbb9b4f2531b 100644 --- a/code/game/machinery/lightswitch.dm +++ b/code/game/machinery/lightswitch.dm @@ -5,7 +5,6 @@ name = "light switch" icon = 'icons/obj/power.dmi' icon_state = "light1" - anchored = TRUE desc = "Make dark." var/on = TRUE var/area/area = null diff --git a/code/game/machinery/limbgrower.dm b/code/game/machinery/limbgrower.dm index 8347e5f548b9..8a0658fd0f81 100644 --- a/code/game/machinery/limbgrower.dm +++ b/code/game/machinery/limbgrower.dm @@ -11,7 +11,6 @@ icon_state = "limbgrower_idleoff" density = TRUE container_type = OPENCONTAINER - anchored = TRUE use_power = IDLE_POWER_USE idle_power_usage = 10 active_power_usage = 100 diff --git a/code/game/machinery/magnet.dm b/code/game/machinery/magnet.dm index 03455d5dd59d..094db5a67614 100644 --- a/code/game/machinery/magnet.dm +++ b/code/game/machinery/magnet.dm @@ -11,7 +11,6 @@ desc = "A device that uses station power to create points of magnetic energy." level = 1 // underfloor layer = LOW_OBJ_LAYER - anchored = TRUE use_power = IDLE_POWER_USE idle_power_usage = 50 @@ -195,7 +194,6 @@ icon = 'icons/obj/airlock_machines.dmi' // uses an airlock machine icon, THINK GREEN HELP THE ENVIRONMENT - RECYCLING! icon_state = "airlock_control_standby" density = FALSE - anchored = TRUE use_power = IDLE_POWER_USE idle_power_usage = 45 var/frequency = FREQ_MAGNETS diff --git a/code/game/machinery/mass_driver.dm b/code/game/machinery/mass_driver.dm index c3162d640d0f..7ebed0ab0cfd 100644 --- a/code/game/machinery/mass_driver.dm +++ b/code/game/machinery/mass_driver.dm @@ -3,7 +3,6 @@ desc = "The finest in spring-loaded piston toy technology, now on a space station near you." icon = 'icons/obj/stationobjs.dmi' icon_state = "mass_driver" - anchored = TRUE use_power = IDLE_POWER_USE idle_power_usage = 2 active_power_usage = 50 diff --git a/code/game/machinery/navbeacon.dm b/code/game/machinery/navbeacon.dm index 1426625c929a..139769e26976 100644 --- a/code/game/machinery/navbeacon.dm +++ b/code/game/machinery/navbeacon.dm @@ -9,7 +9,6 @@ desc = "A radio beacon used for bot navigation." level = 1 // underfloor layer = LOW_OBJ_LAYER - anchored = TRUE max_integrity = 500 armor = list("melee" = 70, "bullet" = 70, "laser" = 70, "energy" = 70, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 80, "acid" = 80) diff --git a/code/game/machinery/newscaster.dm b/code/game/machinery/newscaster.dm index 234b8510cdbc..c02f165bbdfe 100644 --- a/code/game/machinery/newscaster.dm +++ b/code/game/machinery/newscaster.dm @@ -202,7 +202,6 @@ GLOBAL_LIST_EMPTY(allCasters) var/c_locked=0 var/datum/newscaster/feed_channel/viewing_channel = null var/allow_comments = 1 - anchored = TRUE /obj/machinery/newscaster/security_unit name = "security newscaster" diff --git a/code/game/machinery/pipe/pipe_dispenser.dm b/code/game/machinery/pipe/pipe_dispenser.dm index 555f4eee1b49..11d9ee8df5e9 100644 --- a/code/game/machinery/pipe/pipe_dispenser.dm +++ b/code/game/machinery/pipe/pipe_dispenser.dm @@ -4,7 +4,6 @@ icon_state = "pipe_d" desc = "Dispenses countless types of pipes. Very useful if you need pipes." density = TRUE - anchored = TRUE interaction_flags_machine = INTERACT_MACHINE_ALLOW_SILICON | INTERACT_MACHINE_OPEN_SILICON | INTERACT_MACHINE_OFFLINE var/wait = 0 var/piping_layer = PIPING_LAYER_DEFAULT @@ -80,7 +79,6 @@ icon_state = "pipe_d" desc = "Dispenses pipes that will ultimately be used to move trash around." density = TRUE - anchored = TRUE //Allow you to drag-drop disposal pipes and transit tubes into it @@ -147,7 +145,6 @@ icon_state = "pipe_d" density = TRUE desc = "Dispenses pipes that will move beings around." - anchored = TRUE /obj/machinery/pipedispenser/disposal/transit_tube/interact(mob/user) diff --git a/code/game/machinery/porta_turret/portable_turret.dm b/code/game/machinery/porta_turret/portable_turret.dm index ef0af7ae7450..19f95e8cc295 100644 --- a/code/game/machinery/porta_turret/portable_turret.dm +++ b/code/game/machinery/porta_turret/portable_turret.dm @@ -8,7 +8,6 @@ name = "turret" icon = 'icons/obj/turrets.dmi' icon_state = "turretCover" - anchored = TRUE layer = OBJ_LAYER invisibility = INVISIBILITY_OBSERVER //the turret is invisible if it's inside its cover density = TRUE @@ -754,7 +753,6 @@ desc = "Used to control a room's automated defenses." icon = 'icons/obj/machines/turret_control.dmi' icon_state = "control_standby" - anchored = TRUE density = FALSE var/enabled = 1 var/lethal = 0 diff --git a/code/game/machinery/porta_turret/portable_turret_construct.dm b/code/game/machinery/porta_turret/portable_turret_construct.dm index 4bc5db4d5e8e..db3a1fad6022 100644 --- a/code/game/machinery/porta_turret/portable_turret_construct.dm +++ b/code/game/machinery/porta_turret/portable_turret_construct.dm @@ -13,6 +13,7 @@ icon = 'icons/obj/turrets.dmi' icon_state = "turret_frame" desc = "An unfinished covered turret frame." + anchored = FALSE density = TRUE var/build_step = PTURRET_UNSECURED //the current step in the building process var/finish_name = "turret" //the name applied to the product turret diff --git a/code/game/machinery/porta_turret/portable_turret_cover.dm b/code/game/machinery/porta_turret/portable_turret_cover.dm index 8abb5c3fb7ec..74acdd41e808 100644 --- a/code/game/machinery/porta_turret/portable_turret_cover.dm +++ b/code/game/machinery/porta_turret/portable_turret_cover.dm @@ -7,7 +7,6 @@ name = "turret" icon = 'icons/obj/turrets.dmi' icon_state = "turretCover" - anchored = TRUE layer = HIGH_OBJ_LAYER density = FALSE max_integrity = 80 diff --git a/code/game/machinery/quantum_pad.dm b/code/game/machinery/quantum_pad.dm index 7236e683a534..8962ab60a59f 100644 --- a/code/game/machinery/quantum_pad.dm +++ b/code/game/machinery/quantum_pad.dm @@ -3,7 +3,6 @@ desc = "A bluespace quantum-linked telepad used for teleporting objects to other quantum pads." icon = 'icons/obj/telescience.dmi' icon_state = "qpad-idle" - anchored = TRUE use_power = IDLE_POWER_USE idle_power_usage = 200 active_power_usage = 5000 diff --git a/code/game/machinery/recharger.dm b/code/game/machinery/recharger.dm index ece35564bf0e..1cc5d7c83567 100755 --- a/code/game/machinery/recharger.dm +++ b/code/game/machinery/recharger.dm @@ -3,7 +3,6 @@ icon = 'icons/obj/stationobjs.dmi' icon_state = "recharger0" desc = "A charging dock for energy based weaponry." - anchored = TRUE use_power = IDLE_POWER_USE idle_power_usage = 4 active_power_usage = 250 diff --git a/code/game/machinery/rechargestation.dm b/code/game/machinery/rechargestation.dm index 8cdae470cf2c..4ed541ef10e3 100644 --- a/code/game/machinery/rechargestation.dm +++ b/code/game/machinery/rechargestation.dm @@ -4,7 +4,6 @@ icon = 'icons/obj/objects.dmi' icon_state = "borgcharger0" density = FALSE - anchored = TRUE use_power = IDLE_POWER_USE idle_power_usage = 5 active_power_usage = 1000 diff --git a/code/game/machinery/recycler.dm b/code/game/machinery/recycler.dm index 08fcb1baa81b..002f0b089a94 100644 --- a/code/game/machinery/recycler.dm +++ b/code/game/machinery/recycler.dm @@ -6,7 +6,6 @@ icon = 'icons/obj/recycling.dmi' icon_state = "grinder-o0" layer = ABOVE_ALL_MOB_LAYER // Overhead - anchored = TRUE density = TRUE circuit = /obj/item/circuitboard/machine/recycler var/safety_mode = FALSE // Temporarily stops machine if it detects a mob diff --git a/code/game/machinery/requests_console.dm b/code/game/machinery/requests_console.dm index a9d19c399580..2cbf29642f75 100644 --- a/code/game/machinery/requests_console.dm +++ b/code/game/machinery/requests_console.dm @@ -14,7 +14,6 @@ GLOBAL_LIST_EMPTY(allConsoles) /obj/machinery/requests_console name = "requests console" desc = "A console intended to send requests to different departments on the station." - anchored = TRUE icon = 'icons/obj/terminals.dmi' icon_state = "req_comp0" var/department = "Unknown" //The list of all departments on the station (Determined from this variable on each unit) Set this to the same thing if you want several consoles in one department diff --git a/code/game/machinery/shieldgen.dm b/code/game/machinery/shieldgen.dm index 302d1352e7ba..4447c9d00b3e 100644 --- a/code/game/machinery/shieldgen.dm +++ b/code/game/machinery/shieldgen.dm @@ -406,7 +406,6 @@ desc = "An energy shield." icon = 'icons/effects/effects.dmi' icon_state = "shieldwall" - anchored = TRUE density = TRUE resistance_flags = INDESTRUCTIBLE | LAVA_PROOF | FIRE_PROOF | UNACIDABLE | ACID_PROOF light_range = 3 diff --git a/code/game/machinery/slotmachine.dm b/code/game/machinery/slotmachine.dm index 994e74d6eb78..298587cdea4a 100644 --- a/code/game/machinery/slotmachine.dm +++ b/code/game/machinery/slotmachine.dm @@ -17,7 +17,6 @@ desc = "Gambling for the antisocial." icon = 'icons/obj/economy.dmi' icon_state = "slots1" - anchored = TRUE density = TRUE use_power = IDLE_POWER_USE idle_power_usage = 50 diff --git a/code/game/machinery/status_display.dm b/code/game/machinery/status_display.dm index e7d6bf04917b..105d47a71921 100644 --- a/code/game/machinery/status_display.dm +++ b/code/game/machinery/status_display.dm @@ -15,7 +15,6 @@ icon = 'icons/obj/status_display.dmi' icon_state = "frame" name = "status display" - anchored = TRUE density = FALSE use_power = IDLE_POWER_USE idle_power_usage = 10 @@ -227,7 +226,6 @@ desc = "A small screen which the AI can use to present itself." icon_state = "frame" name = "\improper AI display" - anchored = TRUE density = FALSE var/mode = 0 // 0 = Blank diff --git a/code/game/machinery/suit_storage_unit.dm b/code/game/machinery/suit_storage_unit.dm index e17c54315497..2ff0a6758d8f 100644 --- a/code/game/machinery/suit_storage_unit.dm +++ b/code/game/machinery/suit_storage_unit.dm @@ -4,7 +4,6 @@ desc = "An industrial unit made to hold space suits. It comes with a built-in UV cauterization mechanism. A small warning label advises that organic matter should not be placed into the unit." icon = 'icons/obj/machines/suit_storage.dmi' icon_state = "close" - anchored = TRUE density = TRUE max_integrity = 250 diff --git a/code/game/machinery/telecomms/machines/allinone.dm b/code/game/machinery/telecomms/machines/allinone.dm index 98f4bd9e2cd1..7a04869b93fe 100644 --- a/code/game/machinery/telecomms/machines/allinone.dm +++ b/code/game/machinery/telecomms/machines/allinone.dm @@ -8,7 +8,6 @@ icon_state = "comm_server" desc = "A compact machine used for portable subspace telecommuniations processing." density = TRUE - anchored = TRUE use_power = NO_POWER_USE idle_power_usage = 0 var/intercept = FALSE // If true, only works on the Syndicate frequency. diff --git a/code/game/machinery/telecomms/machines/broadcaster.dm b/code/game/machinery/telecomms/machines/broadcaster.dm index 89e2d38de1aa..0abe97c72e7d 100644 --- a/code/game/machinery/telecomms/machines/broadcaster.dm +++ b/code/game/machinery/telecomms/machines/broadcaster.dm @@ -13,7 +13,6 @@ GLOBAL_VAR_INIT(message_delay, 0) // To make sure restarting the recentmessages icon_state = "broadcaster" desc = "A dish-shaped machine used to broadcast processed subspace signals." density = TRUE - anchored = TRUE use_power = IDLE_POWER_USE idle_power_usage = 25 circuit = /obj/item/circuitboard/machine/telecomms/broadcaster diff --git a/code/game/machinery/telecomms/machines/bus.dm b/code/game/machinery/telecomms/machines/bus.dm index 6f9757eb456e..b92ebc0d7d04 100644 --- a/code/game/machinery/telecomms/machines/bus.dm +++ b/code/game/machinery/telecomms/machines/bus.dm @@ -13,7 +13,6 @@ icon_state = "bus" desc = "A mighty piece of hardware used to send massive amounts of data quickly." density = TRUE - anchored = TRUE use_power = IDLE_POWER_USE idle_power_usage = 50 netspeed = 40 diff --git a/code/game/machinery/telecomms/machines/hub.dm b/code/game/machinery/telecomms/machines/hub.dm index 7a481b206963..b23c44367862 100644 --- a/code/game/machinery/telecomms/machines/hub.dm +++ b/code/game/machinery/telecomms/machines/hub.dm @@ -13,7 +13,6 @@ icon_state = "hub" desc = "A mighty piece of hardware used to send/receive massive amounts of data." density = TRUE - anchored = TRUE use_power = IDLE_POWER_USE idle_power_usage = 80 long_range_link = TRUE diff --git a/code/game/machinery/telecomms/machines/message_server.dm b/code/game/machinery/telecomms/machines/message_server.dm index d3d4b871b050..45661add0d9e 100644 --- a/code/game/machinery/telecomms/machines/message_server.dm +++ b/code/game/machinery/telecomms/machines/message_server.dm @@ -11,7 +11,6 @@ icon_state = "blackbox" name = "Blackbox Recorder" density = TRUE - anchored = TRUE use_power = IDLE_POWER_USE idle_power_usage = 10 active_power_usage = 100 @@ -25,7 +24,6 @@ name = "Messaging Server" desc = "A machine that attempts to gather the secret knowledge of the universe." density = TRUE - anchored = TRUE use_power = IDLE_POWER_USE idle_power_usage = 10 active_power_usage = 100 diff --git a/code/game/machinery/telecomms/machines/processor.dm b/code/game/machinery/telecomms/machines/processor.dm index 8b7e0f8672fb..2362273469a0 100644 --- a/code/game/machinery/telecomms/machines/processor.dm +++ b/code/game/machinery/telecomms/machines/processor.dm @@ -11,7 +11,6 @@ icon_state = "processor" desc = "This machine is used to process large quantities of information." density = TRUE - anchored = TRUE use_power = IDLE_POWER_USE idle_power_usage = 30 circuit = /obj/item/circuitboard/machine/telecomms/processor diff --git a/code/game/machinery/telecomms/machines/receiver.dm b/code/game/machinery/telecomms/machines/receiver.dm index 527c0e6d8f30..0fd3aec012b7 100644 --- a/code/game/machinery/telecomms/machines/receiver.dm +++ b/code/game/machinery/telecomms/machines/receiver.dm @@ -11,7 +11,6 @@ icon_state = "broadcast receiver" desc = "This machine has a dish-like shape and green lights. It is designed to detect and process subspace radio activity." density = TRUE - anchored = TRUE use_power = IDLE_POWER_USE idle_power_usage = 30 circuit = /obj/item/circuitboard/machine/telecomms/receiver diff --git a/code/game/machinery/telecomms/machines/relay.dm b/code/game/machinery/telecomms/machines/relay.dm index 1a436e56d551..9e6716278bf4 100644 --- a/code/game/machinery/telecomms/machines/relay.dm +++ b/code/game/machinery/telecomms/machines/relay.dm @@ -11,7 +11,6 @@ icon_state = "relay" desc = "A mighty piece of hardware used to send massive amounts of data far away." density = TRUE - anchored = TRUE use_power = IDLE_POWER_USE idle_power_usage = 30 netspeed = 5 diff --git a/code/game/machinery/telecomms/machines/server.dm b/code/game/machinery/telecomms/machines/server.dm index 18a498efe6aa..6bbd8cfd38e4 100644 --- a/code/game/machinery/telecomms/machines/server.dm +++ b/code/game/machinery/telecomms/machines/server.dm @@ -10,7 +10,6 @@ icon_state = "comm_server" desc = "A machine used to store data and network statistics." density = TRUE - anchored = TRUE use_power = IDLE_POWER_USE idle_power_usage = 15 circuit = /obj/item/circuitboard/machine/telecomms/server diff --git a/code/game/machinery/teleporter.dm b/code/game/machinery/teleporter.dm index cef200173ce5..3d217e52c5f8 100644 --- a/code/game/machinery/teleporter.dm +++ b/code/game/machinery/teleporter.dm @@ -2,7 +2,6 @@ name = "teleport" icon = 'icons/obj/machines/teleporter.dmi' density = TRUE - anchored = TRUE /obj/machinery/teleport/hub name = "teleporter hub" diff --git a/code/game/machinery/transformer.dm b/code/game/machinery/transformer.dm index 7624312f8420..4fa40910a8b9 100644 --- a/code/game/machinery/transformer.dm +++ b/code/game/machinery/transformer.dm @@ -6,7 +6,6 @@ icon = 'icons/obj/recycling.dmi' icon_state = "separator-AO1" layer = ABOVE_ALL_MOB_LAYER // Overhead - anchored = TRUE density = FALSE var/transform_dead = 0 var/transform_standing = 0 diff --git a/code/game/machinery/washing_machine.dm b/code/game/machinery/washing_machine.dm index ab906f1bfad3..8575a6f2dc2b 100644 --- a/code/game/machinery/washing_machine.dm +++ b/code/game/machinery/washing_machine.dm @@ -4,7 +4,6 @@ icon = 'icons/obj/machines/washing_machine.dmi' icon_state = "wm_1_0" density = TRUE - anchored = TRUE state_open = TRUE var/busy = FALSE var/bloody_mess = 0 diff --git a/code/game/machinery/wishgranter.dm b/code/game/machinery/wishgranter.dm index aa238f934165..bec51d1d3055 100644 --- a/code/game/machinery/wishgranter.dm +++ b/code/game/machinery/wishgranter.dm @@ -5,7 +5,6 @@ icon_state = "syndbeacon" use_power = NO_POWER_USE - anchored = TRUE density = TRUE var/charges = 1 diff --git a/code/game/mecha/mech_bay.dm b/code/game/mecha/mech_bay.dm index d2d9ac5e5776..f198bfbd876f 100644 --- a/code/game/mecha/mech_bay.dm +++ b/code/game/mecha/mech_bay.dm @@ -15,7 +15,6 @@ name = "mech bay power port" desc = "This port recharges a mech's internal power cell." density = TRUE - anchored = TRUE dir = EAST icon = 'icons/mecha/mech_bay.dmi' icon_state = "recharge_port" diff --git a/code/game/mecha/mech_fabricator.dm b/code/game/mecha/mech_fabricator.dm index 65eabf128300..c1f41ac5c5fd 100644 --- a/code/game/mecha/mech_fabricator.dm +++ b/code/game/mecha/mech_fabricator.dm @@ -4,7 +4,6 @@ name = "exosuit fabricator" desc = "Nothing is being built." density = TRUE - anchored = TRUE use_power = IDLE_POWER_USE idle_power_usage = 20 active_power_usage = 5000 diff --git a/code/game/objects/items/implants/implantchair.dm b/code/game/objects/items/implants/implantchair.dm index b1d0130fccc0..a135cc3af40f 100644 --- a/code/game/objects/items/implants/implantchair.dm +++ b/code/game/objects/items/implants/implantchair.dm @@ -5,7 +5,6 @@ icon_state = "implantchair" density = TRUE opacity = 0 - anchored = TRUE var/ready = TRUE var/replenishing = FALSE diff --git a/code/game/objects/structures/manned_turret.dm b/code/game/objects/structures/manned_turret.dm index 9b35a6e519d6..df145baf9409 100644 --- a/code/game/objects/structures/manned_turret.dm +++ b/code/game/objects/structures/manned_turret.dm @@ -6,6 +6,7 @@ icon = 'icons/obj/turrets.dmi' icon_state = "machinegun" can_buckle = TRUE + anchored = FALSE density = TRUE max_integrity = 100 buckle_lying = FALSE diff --git a/code/game/objects/structures/watercloset.dm b/code/game/objects/structures/watercloset.dm index 4e85128a8591..61e18f206619 100644 --- a/code/game/objects/structures/watercloset.dm +++ b/code/game/objects/structures/watercloset.dm @@ -210,7 +210,6 @@ icon = 'icons/obj/watercloset.dmi' icon_state = "shower" density = FALSE - anchored = TRUE use_power = NO_POWER_USE var/on = FALSE var/obj/effect/mist/mymist = null diff --git a/code/modules/NTNet/relays.dm b/code/modules/NTNet/relays.dm index ab482f1f16e2..eaf2aa466b87 100644 --- a/code/modules/NTNet/relays.dm +++ b/code/modules/NTNet/relays.dm @@ -7,7 +7,6 @@ idle_power_usage = 100 icon = 'icons/obj/machines/telecomms.dmi' icon_state = "bus" - anchored = TRUE density = TRUE circuit = /obj/item/circuitboard/machine/ntnet_relay var/datum/ntnet/NTNet = null // This is mostly for backwards reference and to allow varedit modifications from ingame. diff --git a/code/modules/VR/vr_sleeper.dm b/code/modules/VR/vr_sleeper.dm index 21db27ce198f..dd89a08c9e5c 100644 --- a/code/modules/VR/vr_sleeper.dm +++ b/code/modules/VR/vr_sleeper.dm @@ -8,7 +8,6 @@ icon = 'icons/obj/machines/sleeper.dmi' icon_state = "sleeper" state_open = TRUE - anchored = TRUE occupant_typecache = list(/mob/living/carbon/human) // turned into typecache in Initialize circuit = /obj/item/circuitboard/machine/vr_sleeper var/you_die_in_the_game_you_die_for_real = FALSE @@ -179,7 +178,7 @@ vr_human.vr_sleeper = null // Prevents race condition where a new human could get created out of order and set to null. QDEL_NULL(vr_human) -/obj/machinery/vr_sleeper/proc/emagNotify() +/obj/machinery/vr_sleeper/proc/emagNotify() if(vr_human) vr_human.Dizzy(10) @@ -199,10 +198,10 @@ vr_category = "team_1" /obj/effect/landmark/vr_spawn/team_2 - vr_category = "team_2" + vr_category = "team_2" /obj/effect/landmark/vr_spawn/admin - vr_category = "event" + vr_category = "event" /obj/effect/landmark/vr_spawn/syndicate // Multiple missions will use syndicate gear vr_outfit = /datum/outfit/vr/syndicate diff --git a/code/modules/antagonists/abductor/machinery/console.dm b/code/modules/antagonists/abductor/machinery/console.dm index 3d6bacdfb224..a14b667069ac 100644 --- a/code/modules/antagonists/abductor/machinery/console.dm +++ b/code/modules/antagonists/abductor/machinery/console.dm @@ -17,7 +17,6 @@ icon = 'icons/obj/abductor.dmi' icon_state = "console" density = TRUE - anchored = TRUE var/obj/item/abductor/gizmo/gizmo var/obj/item/clothing/suit/armor/abductor/vest/vest var/obj/machinery/abductor/experiment/experiment diff --git a/code/modules/antagonists/abductor/machinery/dispenser.dm b/code/modules/antagonists/abductor/machinery/dispenser.dm index c837adf1f02d..17fa311c8f6d 100644 --- a/code/modules/antagonists/abductor/machinery/dispenser.dm +++ b/code/modules/antagonists/abductor/machinery/dispenser.dm @@ -4,7 +4,6 @@ icon = 'icons/obj/abductor.dmi' icon_state = "dispenser" density = TRUE - anchored = TRUE var/list/gland_types var/list/gland_colors var/list/amounts diff --git a/code/modules/antagonists/abductor/machinery/experiment.dm b/code/modules/antagonists/abductor/machinery/experiment.dm index 527913e6aa9e..5614fc910511 100644 --- a/code/modules/antagonists/abductor/machinery/experiment.dm +++ b/code/modules/antagonists/abductor/machinery/experiment.dm @@ -4,7 +4,6 @@ icon = 'icons/obj/abductor.dmi' icon_state = "experiment-open" density = FALSE - anchored = TRUE state_open = TRUE var/points = 0 var/credits = 0 diff --git a/code/modules/antagonists/abductor/machinery/pad.dm b/code/modules/antagonists/abductor/machinery/pad.dm index dff2fe812e4f..1cb95fbf0523 100644 --- a/code/modules/antagonists/abductor/machinery/pad.dm +++ b/code/modules/antagonists/abductor/machinery/pad.dm @@ -3,7 +3,6 @@ desc = "Use this to transport to and from the humans' habitat." icon = 'icons/obj/abductor.dmi' icon_state = "alien-pad-idle" - anchored = TRUE var/turf/teleport_target /obj/machinery/abductor/pad/proc/Warp(mob/living/target) diff --git a/code/modules/antagonists/nukeop/equipment/nuclearbomb.dm b/code/modules/antagonists/nukeop/equipment/nuclearbomb.dm index a4dd053a3fd5..4d3ccf8a3447 100644 --- a/code/modules/antagonists/nukeop/equipment/nuclearbomb.dm +++ b/code/modules/antagonists/nukeop/equipment/nuclearbomb.dm @@ -3,6 +3,7 @@ desc = "You probably shouldn't stick around to see if this is armed." icon = 'icons/obj/machines/nuke.dmi' icon_state = "nuclearbomb_base" + anchored = FALSE density = TRUE resistance_flags = INDESTRUCTIBLE | LAVA_PROOF | FIRE_PROOF | UNACIDABLE | ACID_PROOF diff --git a/code/modules/antagonists/traitor/equipment/Malf_Modules.dm b/code/modules/antagonists/traitor/equipment/Malf_Modules.dm index 4482629a2ef7..4400a3c0dcc6 100644 --- a/code/modules/antagonists/traitor/equipment/Malf_Modules.dm +++ b/code/modules/antagonists/traitor/equipment/Malf_Modules.dm @@ -319,7 +319,6 @@ GLOBAL_LIST_INIT(blacklisted_malf_machines, typecacheof(list( name = "doomsday device" icon_state = "nuclearbomb_base" desc = "A weapon which disintegrates all organic life in a large area." - anchored = TRUE density = TRUE verb_exclaim = "blares" var/timing = FALSE diff --git a/code/modules/atmospherics/machinery/airalarm.dm b/code/modules/atmospherics/machinery/airalarm.dm index 7bfacbee267f..6e6355ed7217 100644 --- a/code/modules/atmospherics/machinery/airalarm.dm +++ b/code/modules/atmospherics/machinery/airalarm.dm @@ -61,7 +61,6 @@ desc = "A machine that monitors atmosphere levels. Goes off if the area is dangerous." icon = 'icons/obj/monitors.dmi' icon_state = "alarm0" - anchored = TRUE use_power = IDLE_POWER_USE idle_power_usage = 4 active_power_usage = 8 diff --git a/code/modules/atmospherics/machinery/components/binary_devices/circulator.dm b/code/modules/atmospherics/machinery/components/binary_devices/circulator.dm index 7f37e049dde0..e8007a66081d 100644 --- a/code/modules/atmospherics/machinery/components/binary_devices/circulator.dm +++ b/code/modules/atmospherics/machinery/components/binary_devices/circulator.dm @@ -13,7 +13,6 @@ var/last_pressure_delta = 0 pipe_flags = PIPING_ONE_PER_TURF - anchored = TRUE density = TRUE var/global/const/CIRC_LEFT = 1 diff --git a/code/modules/atmospherics/machinery/components/unary_devices/cryo.dm b/code/modules/atmospherics/machinery/components/unary_devices/cryo.dm index a07dc8f8b870..cca6c4d15a42 100644 --- a/code/modules/atmospherics/machinery/components/unary_devices/cryo.dm +++ b/code/modules/atmospherics/machinery/components/unary_devices/cryo.dm @@ -5,7 +5,6 @@ icon = 'icons/obj/cryogenics.dmi' icon_state = "pod-off" density = TRUE - anchored = TRUE max_integrity = 350 armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 100, "bomb" = 0, "bio" = 100, "rad" = 100, "fire" = 30, "acid" = 30) layer = ABOVE_WINDOW_LAYER diff --git a/code/modules/atmospherics/machinery/components/unary_devices/thermomachine.dm b/code/modules/atmospherics/machinery/components/unary_devices/thermomachine.dm index 085c18475f47..5359e2324e8a 100644 --- a/code/modules/atmospherics/machinery/components/unary_devices/thermomachine.dm +++ b/code/modules/atmospherics/machinery/components/unary_devices/thermomachine.dm @@ -6,7 +6,6 @@ var/icon_state_on = "cold_on" var/icon_state_open = "cold_off" density = TRUE - anchored = TRUE max_integrity = 300 armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 100, "bomb" = 0, "bio" = 100, "rad" = 100, "fire" = 80, "acid" = 30) layer = OBJ_LAYER diff --git a/code/modules/atmospherics/machinery/other/meter.dm b/code/modules/atmospherics/machinery/other/meter.dm index 9a310fb5452d..b0afefd58a2f 100644 --- a/code/modules/atmospherics/machinery/other/meter.dm +++ b/code/modules/atmospherics/machinery/other/meter.dm @@ -4,7 +4,6 @@ icon = 'icons/obj/atmospherics/pipes/meter.dmi' icon_state = "meterX" layer = GAS_PUMP_LAYER - anchored = TRUE power_channel = ENVIRON use_power = IDLE_POWER_USE idle_power_usage = 2 diff --git a/code/modules/atmospherics/machinery/other/miner.dm b/code/modules/atmospherics/machinery/other/miner.dm index 61681c0b38d0..20251418bc2e 100644 --- a/code/modules/atmospherics/machinery/other/miner.dm +++ b/code/modules/atmospherics/machinery/other/miner.dm @@ -10,7 +10,6 @@ desc = "Gasses mined from the gas giant below (above?) flow out through this massive vent." icon = 'icons/obj/atmospherics/components/miners.dmi' icon_state = "miner" - anchored = TRUE density = FALSE resistance_flags = INDESTRUCTIBLE|ACID_PROOF|FIRE_PROOF var/spawn_id = null diff --git a/code/modules/atmospherics/machinery/portable/portable_atmospherics.dm b/code/modules/atmospherics/machinery/portable/portable_atmospherics.dm index 68223d85a2a7..1a276d03c563 100644 --- a/code/modules/atmospherics/machinery/portable/portable_atmospherics.dm +++ b/code/modules/atmospherics/machinery/portable/portable_atmospherics.dm @@ -4,7 +4,7 @@ use_power = NO_POWER_USE max_integrity = 250 armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 100, "bomb" = 0, "bio" = 100, "rad" = 100, "fire" = 60, "acid" = 30) - + anchored = FALSE var/datum/gas_mixture/air_contents var/obj/machinery/atmospherics/components/unary/portables_connector/connected_port diff --git a/code/modules/awaymissions/bluespaceartillery.dm b/code/modules/awaymissions/bluespaceartillery.dm index 70d5fc0f4c7e..9bebcfe54621 100644 --- a/code/modules/awaymissions/bluespaceartillery.dm +++ b/code/modules/awaymissions/bluespaceartillery.dm @@ -10,7 +10,6 @@ icon_state = "control_boxp1" icon = 'icons/obj/machines/particle_accelerator.dmi' density = TRUE - anchored = TRUE /obj/machinery/artillerycontrol/process() if(reload < reload_cooldown) diff --git a/code/modules/awaymissions/capture_the_flag.dm b/code/modules/awaymissions/capture_the_flag.dm index b3c5078af9b5..56f5d63b0c49 100644 --- a/code/modules/awaymissions/capture_the_flag.dm +++ b/code/modules/awaymissions/capture_the_flag.dm @@ -135,7 +135,6 @@ desc = "Used for running friendly games of capture the flag." icon = 'icons/obj/device.dmi' icon_state = "syndbeacon" - anchored = TRUE resistance_flags = INDESTRUCTIBLE var/team = WHITE_TEAM var/team_span = "" @@ -652,7 +651,6 @@ desc = "You should capture this." icon = 'icons/obj/machines/dominator.dmi' icon_state = "dominator" - anchored = TRUE resistance_flags = INDESTRUCTIBLE var/obj/machinery/capture_the_flag/controlling var/team = "none" diff --git a/code/modules/awaymissions/gateway.dm b/code/modules/awaymissions/gateway.dm index 2293ac809828..5c3e87a36782 100644 --- a/code/modules/awaymissions/gateway.dm +++ b/code/modules/awaymissions/gateway.dm @@ -6,7 +6,6 @@ GLOBAL_DATUM(the_gateway, /obj/machinery/gateway/centerstation) icon = 'icons/obj/machines/gateway.dmi' icon_state = "off" density = TRUE - anchored = TRUE resistance_flags = INDESTRUCTIBLE | LAVA_PROOF | FIRE_PROOF | UNACIDABLE | ACID_PROOF var/active = 0 var/checkparts = TRUE diff --git a/code/modules/awaymissions/mission_code/wildwest.dm b/code/modules/awaymissions/mission_code/wildwest.dm index ba06b969599b..acb329b5c52c 100644 --- a/code/modules/awaymissions/mission_code/wildwest.dm +++ b/code/modules/awaymissions/mission_code/wildwest.dm @@ -63,7 +63,6 @@ icon = 'icons/obj/device.dmi' icon_state = "syndbeacon" - anchored = TRUE density = TRUE use_power = NO_POWER_USE diff --git a/code/modules/events/pirates.dm b/code/modules/events/pirates.dm index 5fa34f493804..ea341c2997de 100644 --- a/code/modules/events/pirates.dm +++ b/code/modules/events/pirates.dm @@ -92,7 +92,6 @@ icon = 'icons/obj/machines/dominator.dmi' icon_state = "dominator" density = TRUE - anchored = TRUE var/active = FALSE var/obj/item/gps/gps var/credits_stored = 0 @@ -234,7 +233,6 @@ icon = 'icons/obj/machines/research.dmi' icon_state = "tdoppler" density = TRUE - anchored = TRUE var/cooldown = 0 var/result_count = 3 //Show X results. diff --git a/code/modules/food_and_drinks/kitchen_machinery/deep_fryer.dm b/code/modules/food_and_drinks/kitchen_machinery/deep_fryer.dm index 494761526841..5e7a3db504b3 100644 --- a/code/modules/food_and_drinks/kitchen_machinery/deep_fryer.dm +++ b/code/modules/food_and_drinks/kitchen_machinery/deep_fryer.dm @@ -26,7 +26,6 @@ God bless America. icon = 'icons/obj/kitchen.dmi' icon_state = "fryer_off" density = TRUE - anchored = TRUE use_power = IDLE_POWER_USE idle_power_usage = 5 container_type = OPENCONTAINER diff --git a/code/modules/food_and_drinks/kitchen_machinery/gibber.dm b/code/modules/food_and_drinks/kitchen_machinery/gibber.dm index 85ec25abc6d6..e6734b4b58f4 100644 --- a/code/modules/food_and_drinks/kitchen_machinery/gibber.dm +++ b/code/modules/food_and_drinks/kitchen_machinery/gibber.dm @@ -4,7 +4,6 @@ icon = 'icons/obj/kitchen.dmi' icon_state = "grinder" density = TRUE - anchored = TRUE use_power = IDLE_POWER_USE idle_power_usage = 2 active_power_usage = 500 diff --git a/code/modules/food_and_drinks/kitchen_machinery/microwave.dm b/code/modules/food_and_drinks/kitchen_machinery/microwave.dm index 7363f262b4b5..ee04e73fbe84 100644 --- a/code/modules/food_and_drinks/kitchen_machinery/microwave.dm +++ b/code/modules/food_and_drinks/kitchen_machinery/microwave.dm @@ -5,7 +5,6 @@ icon_state = "mw" layer = BELOW_OBJ_LAYER density = TRUE - anchored = TRUE use_power = IDLE_POWER_USE idle_power_usage = 5 active_power_usage = 100 diff --git a/code/modules/food_and_drinks/kitchen_machinery/monkeyrecycler.dm b/code/modules/food_and_drinks/kitchen_machinery/monkeyrecycler.dm index 397f5c7a6dc2..c25cb2288f8a 100644 --- a/code/modules/food_and_drinks/kitchen_machinery/monkeyrecycler.dm +++ b/code/modules/food_and_drinks/kitchen_machinery/monkeyrecycler.dm @@ -5,7 +5,6 @@ icon_state = "grinder" layer = BELOW_OBJ_LAYER density = TRUE - anchored = TRUE use_power = IDLE_POWER_USE idle_power_usage = 5 active_power_usage = 50 diff --git a/code/modules/food_and_drinks/kitchen_machinery/processor.dm b/code/modules/food_and_drinks/kitchen_machinery/processor.dm index 91a73eececd5..2ec1e56adbfd 100644 --- a/code/modules/food_and_drinks/kitchen_machinery/processor.dm +++ b/code/modules/food_and_drinks/kitchen_machinery/processor.dm @@ -6,7 +6,6 @@ icon_state = "processor1" layer = BELOW_OBJ_LAYER density = TRUE - anchored = TRUE use_power = IDLE_POWER_USE idle_power_usage = 5 active_power_usage = 50 diff --git a/code/modules/food_and_drinks/kitchen_machinery/smartfridge.dm b/code/modules/food_and_drinks/kitchen_machinery/smartfridge.dm index 833f65fc16cd..1a36f244f537 100644 --- a/code/modules/food_and_drinks/kitchen_machinery/smartfridge.dm +++ b/code/modules/food_and_drinks/kitchen_machinery/smartfridge.dm @@ -8,7 +8,6 @@ icon_state = "smartfridge" layer = BELOW_OBJ_LAYER density = TRUE - anchored = TRUE use_power = IDLE_POWER_USE idle_power_usage = 5 active_power_usage = 100 diff --git a/code/modules/holodeck/items.dm b/code/modules/holodeck/items.dm index d967eebd5943..5c143f7a250d 100644 --- a/code/modules/holodeck/items.dm +++ b/code/modules/holodeck/items.dm @@ -150,7 +150,6 @@ var/area/currentarea = null var/eventstarted = FALSE - anchored = TRUE use_power = IDLE_POWER_USE idle_power_usage = 2 active_power_usage = 6 diff --git a/code/modules/hydroponics/biogenerator.dm b/code/modules/hydroponics/biogenerator.dm index 6da117da887c..c7a775523ae6 100644 --- a/code/modules/hydroponics/biogenerator.dm +++ b/code/modules/hydroponics/biogenerator.dm @@ -4,7 +4,6 @@ icon = 'icons/obj/machines/biogenerator.dmi' icon_state = "biogen-empty" density = TRUE - anchored = TRUE use_power = IDLE_POWER_USE idle_power_usage = 40 circuit = /obj/item/circuitboard/machine/biogenerator diff --git a/code/modules/hydroponics/gene_modder.dm b/code/modules/hydroponics/gene_modder.dm index f1b9da28f543..084fffbafac3 100644 --- a/code/modules/hydroponics/gene_modder.dm +++ b/code/modules/hydroponics/gene_modder.dm @@ -4,7 +4,6 @@ icon = 'icons/obj/hydroponics/equipment.dmi' icon_state = "dnamod" density = TRUE - anchored = TRUE circuit = /obj/item/circuitboard/machine/plantgenes var/obj/item/seeds/seed diff --git a/code/modules/hydroponics/hydroponics.dm b/code/modules/hydroponics/hydroponics.dm index fb6915aef9f8..ed0e1df554f9 100644 --- a/code/modules/hydroponics/hydroponics.dm +++ b/code/modules/hydroponics/hydroponics.dm @@ -3,7 +3,6 @@ icon = 'icons/obj/hydroponics/equipment.dmi' icon_state = "hydrotray" density = TRUE - anchored = TRUE pixel_z = 8 obj_flags = CAN_BE_HIT | UNIQUE_RENAME circuit = /obj/item/circuitboard/machine/hydroponics diff --git a/code/modules/hydroponics/seed_extractor.dm b/code/modules/hydroponics/seed_extractor.dm index 3d0ffdfd5331..ffa9e2e21d90 100644 --- a/code/modules/hydroponics/seed_extractor.dm +++ b/code/modules/hydroponics/seed_extractor.dm @@ -45,7 +45,6 @@ icon = 'icons/obj/hydroponics/equipment.dmi' icon_state = "sextractor" density = TRUE - anchored = TRUE circuit = /obj/item/circuitboard/machine/seed_extractor var/piles = list() var/max_seeds = 1000 diff --git a/code/modules/library/lib_machines.dm b/code/modules/library/lib_machines.dm index 9a1fa4ae5030..410b51633e84 100644 --- a/code/modules/library/lib_machines.dm +++ b/code/modules/library/lib_machines.dm @@ -494,7 +494,6 @@ GLOBAL_LIST(cachedbooks) // List of our cached book datums icon = 'icons/obj/library.dmi' icon_state = "bigscanner" desc = "It servers the purpose of scanning stuff." - anchored = TRUE density = TRUE var/obj/item/book/cache // Last scanned book @@ -553,7 +552,6 @@ GLOBAL_LIST(cachedbooks) // List of our cached book datums icon = 'icons/obj/library.dmi' icon_state = "binder" desc = "Only intended for binding paper products." - anchored = TRUE density = TRUE var/busy = FALSE diff --git a/code/modules/mining/laborcamp/laborstacker.dm b/code/modules/mining/laborcamp/laborstacker.dm index 43faa483377f..4a90a08cf3e4 100644 --- a/code/modules/mining/laborcamp/laborstacker.dm +++ b/code/modules/mining/laborcamp/laborstacker.dm @@ -6,7 +6,6 @@ icon = 'icons/obj/machines/mining_machines.dmi' icon_state = "console" density = FALSE - anchored = TRUE var/obj/machinery/mineral/stacking_machine/laborstacker/stacking_machine = null var/machinedir = SOUTH var/obj/item/card/id/prisoner/inserted_id @@ -147,7 +146,6 @@ icon = 'icons/obj/machines/mining_machines.dmi' icon_state = "console" density = FALSE - anchored = TRUE /obj/machinery/mineral/labor_points_checker/attack_hand(mob/user) . = ..() diff --git a/code/modules/mining/machine_processing.dm b/code/modules/mining/machine_processing.dm index 47c1201323d7..026170da09e6 100644 --- a/code/modules/mining/machine_processing.dm +++ b/code/modules/mining/machine_processing.dm @@ -17,7 +17,6 @@ icon = 'icons/obj/machines/mining_machines.dmi' icon_state = "console" density = TRUE - anchored = TRUE var/obj/machinery/mineral/processing_unit/machine = null var/machinedir = EAST speed_process = TRUE @@ -74,7 +73,6 @@ icon = 'icons/obj/machines/mining_machines.dmi' icon_state = "furnace" density = TRUE - anchored = TRUE var/obj/machinery/mineral/CONSOLE = null var/on = FALSE var/selected_material = MAT_METAL diff --git a/code/modules/mining/machine_redemption.dm b/code/modules/mining/machine_redemption.dm index d4735d1c75ee..35292146090b 100644 --- a/code/modules/mining/machine_redemption.dm +++ b/code/modules/mining/machine_redemption.dm @@ -7,7 +7,6 @@ icon = 'icons/obj/machines/mining_machines.dmi' icon_state = "ore_redemption" density = TRUE - anchored = TRUE input_dir = NORTH output_dir = SOUTH req_access = list(ACCESS_MINERAL_STOREROOM) diff --git a/code/modules/mining/machine_stacking.dm b/code/modules/mining/machine_stacking.dm index 0f84d11082be..f0a06429c555 100644 --- a/code/modules/mining/machine_stacking.dm +++ b/code/modules/mining/machine_stacking.dm @@ -6,7 +6,6 @@ icon_state = "console" desc = "Controls a stacking machine... in theory." density = FALSE - anchored = TRUE circuit = /obj/item/circuitboard/machine/stacking_unit_console var/obj/machinery/mineral/stacking_machine/machine var/machinedir = SOUTHEAST @@ -71,7 +70,6 @@ icon_state = "stacker" desc = "A machine that automatically stacks acquired materials. Controlled by a nearby console." density = TRUE - anchored = TRUE circuit = /obj/item/circuitboard/machine/stacking_machine var/obj/machinery/mineral/stacking_unit_console/CONSOLE var/stk_types = list() diff --git a/code/modules/mining/machine_unloading.dm b/code/modules/mining/machine_unloading.dm index 380509f41501..e84c2d6d0d56 100644 --- a/code/modules/mining/machine_unloading.dm +++ b/code/modules/mining/machine_unloading.dm @@ -6,7 +6,6 @@ icon = 'icons/obj/machines/mining_machines.dmi' icon_state = "unloader" density = TRUE - anchored = TRUE input_dir = WEST output_dir = EAST speed_process = TRUE diff --git a/code/modules/mining/machine_vending.dm b/code/modules/mining/machine_vending.dm index ead00a56e3b5..e13a8e5c395f 100644 --- a/code/modules/mining/machine_vending.dm +++ b/code/modules/mining/machine_vending.dm @@ -6,7 +6,6 @@ icon = 'icons/obj/machines/mining_machines.dmi' icon_state = "mining" density = TRUE - anchored = TRUE circuit = /obj/item/circuitboard/machine/mining_equipment_vendor var/icon_deny = "mining-deny" var/obj/item/card/id/inserted_id diff --git a/code/modules/mining/mint.dm b/code/modules/mining/mint.dm index b7cc0db43fba..66b6b94d6c8f 100644 --- a/code/modules/mining/mint.dm +++ b/code/modules/mining/mint.dm @@ -6,7 +6,6 @@ icon = 'icons/obj/economy.dmi' icon_state = "coinpress0" density = TRUE - anchored = TRUE var/newCoins = 0 //how many coins the machine made in it's last load var/processing = FALSE var/chosen = MAT_METAL //which material will be used to make coins diff --git a/code/modules/mob/living/simple_animal/bot/bot.dm b/code/modules/mob/living/simple_animal/bot/bot.dm index 6ec6d59228d3..f1521323778c 100644 --- a/code/modules/mob/living/simple_animal/bot/bot.dm +++ b/code/modules/mob/living/simple_animal/bot/bot.dm @@ -837,6 +837,7 @@ Pass a positive integer as an argument to override a bot's default speed. // Machinery to simplify topic and access calls /obj/machinery/bot_core use_power = NO_POWER_USE + anchored = FALSE var/mob/living/simple_animal/bot/owner = null /obj/machinery/bot_core/Initialize() diff --git a/code/modules/mob/living/simple_animal/hostile/megafauna/colossus.dm b/code/modules/mob/living/simple_animal/hostile/megafauna/colossus.dm index d727c285c0d0..a6dce0e8e334 100644 --- a/code/modules/mob/living/simple_animal/hostile/megafauna/colossus.dm +++ b/code/modules/mob/living/simple_animal/hostile/megafauna/colossus.dm @@ -355,6 +355,7 @@ Difficulty: Very Hard light_range = 8 resistance_flags = INDESTRUCTIBLE | LAVA_PROOF | FIRE_PROOF | ACID_PROOF use_power = NO_POWER_USE + anchored = FALSE density = TRUE flags_1 = HEAR_1 var/activation_method diff --git a/code/modules/modular_computers/computers/machinery/modular_console.dm b/code/modules/modular_computers/computers/machinery/modular_console.dm index b9a054402173..026091f88b16 100644 --- a/code/modules/modular_computers/computers/machinery/modular_console.dm +++ b/code/modules/modular_computers/computers/machinery/modular_console.dm @@ -8,8 +8,6 @@ icon_state_unpowered = "console-off" screen_icon_state_menu = "menu" hardware_flag = PROGRAM_CONSOLE - var/console_department = "" // Used in New() to set network tag according to our area. - anchored = TRUE density = TRUE base_idle_power_usage = 100 base_active_power_usage = 500 @@ -18,6 +16,7 @@ light_strength = 2 max_integrity = 300 integrity_failure = 150 + var/console_department = "" // Used in New() to set network tag according to our area. /obj/machinery/modular_computer/console/buildable/Initialize() . = ..() diff --git a/code/modules/modular_computers/laptop_vendor.dm b/code/modules/modular_computers/laptop_vendor.dm index ef0538a1ee87..6e4f80458ac1 100644 --- a/code/modules/modular_computers/laptop_vendor.dm +++ b/code/modules/modular_computers/laptop_vendor.dm @@ -6,7 +6,6 @@ icon = 'icons/obj/vending.dmi' icon_state = "robotics" layer = 2.9 - anchored = TRUE density = TRUE // The actual laptop/tablet diff --git a/code/modules/paperwork/photocopier.dm b/code/modules/paperwork/photocopier.dm index 2b0c6c0aec78..e8a4c26d1094 100644 --- a/code/modules/paperwork/photocopier.dm +++ b/code/modules/paperwork/photocopier.dm @@ -12,7 +12,6 @@ desc = "Used to copy important documents and anatomy studies." icon = 'icons/obj/library.dmi' icon_state = "photocopier" - anchored = TRUE density = TRUE use_power = IDLE_POWER_USE idle_power_usage = 30 diff --git a/code/modules/power/antimatter/shielding.dm b/code/modules/power/antimatter/shielding.dm index 8f4508be3550..43b24002994a 100644 --- a/code/modules/power/antimatter/shielding.dm +++ b/code/modules/power/antimatter/shielding.dm @@ -14,7 +14,6 @@ icon = 'icons/obj/machines/antimatter.dmi' icon_state = "shield" - anchored = TRUE density = TRUE dir = NORTH use_power = NO_POWER_USE//Living things generally dont use power diff --git a/code/modules/power/apc.dm b/code/modules/power/apc.dm index 6d001dd11121..e9deb8233b36 100644 --- a/code/modules/power/apc.dm +++ b/code/modules/power/apc.dm @@ -50,7 +50,6 @@ desc = "A control terminal for the area's electrical systems." icon_state = "apc0" - anchored = TRUE use_power = NO_POWER_USE req_access = null max_integrity = 200 diff --git a/code/modules/power/floodlight.dm b/code/modules/power/floodlight.dm index 62abcdb44045..8da3594d5e58 100644 --- a/code/modules/power/floodlight.dm +++ b/code/modules/power/floodlight.dm @@ -41,7 +41,6 @@ desc = "A pole with powerful mounted lights on it. Due to its high power draw, it must be powered by a direct connection to a wire node." icon = 'icons/obj/lighting.dmi' icon_state = "floodlight" - anchored = TRUE density = TRUE max_integrity = 100 integrity_failure = 80 diff --git a/code/modules/power/generator.dm b/code/modules/power/generator.dm index ce9d2de4db1d..eb6e82a2422b 100644 --- a/code/modules/power/generator.dm +++ b/code/modules/power/generator.dm @@ -2,7 +2,6 @@ name = "thermoelectric generator" desc = "It's a high efficiency thermoelectric generator." icon_state = "teg" - anchored = TRUE density = TRUE use_power = NO_POWER_USE diff --git a/code/modules/power/gravitygenerator.dm b/code/modules/power/gravitygenerator.dm index 22c41ad2fd49..0e6c3176e702 100644 --- a/code/modules/power/gravitygenerator.dm +++ b/code/modules/power/gravitygenerator.dm @@ -22,7 +22,6 @@ GLOBAL_LIST_EMPTY(gravity_generators) // We will keep track of this by adding ne name = "gravitational generator" desc = "A device which produces a graviton field when set up." icon = 'icons/obj/machines/gravity_generator.dmi' - anchored = TRUE density = TRUE use_power = NO_POWER_USE resistance_flags = INDESTRUCTIBLE | LAVA_PROOF | FIRE_PROOF | UNACIDABLE | ACID_PROOF diff --git a/code/modules/power/lighting.dm b/code/modules/power/lighting.dm index 7e43178e1930..39014ff2e31d 100644 --- a/code/modules/power/lighting.dm +++ b/code/modules/power/lighting.dm @@ -187,7 +187,6 @@ var/base_state = "tube" // base description and icon_state icon_state = "tube" desc = "A lighting fixture." - anchored = TRUE layer = WALL_OBJ_LAYER max_integrity = 100 use_power = ACTIVE_POWER_USE diff --git a/code/modules/power/rtg.dm b/code/modules/power/rtg.dm index c5759c5adb5f..79e94be7f052 100644 --- a/code/modules/power/rtg.dm +++ b/code/modules/power/rtg.dm @@ -7,7 +7,6 @@ icon = 'icons/obj/power.dmi' icon_state = "rtg" density = TRUE - anchored = TRUE use_power = NO_POWER_USE circuit = /obj/item/circuitboard/machine/rtg diff --git a/code/modules/power/singularity/containment_field.dm b/code/modules/power/singularity/containment_field.dm index c8153b4a89e8..f6004b664a6d 100644 --- a/code/modules/power/singularity/containment_field.dm +++ b/code/modules/power/singularity/containment_field.dm @@ -5,7 +5,6 @@ desc = "An energy field." icon = 'icons/obj/singularity.dmi' icon_state = "Contain_F" - anchored = TRUE density = FALSE resistance_flags = INDESTRUCTIBLE | LAVA_PROOF | FIRE_PROOF | UNACIDABLE | ACID_PROOF use_power = NO_POWER_USE diff --git a/code/modules/power/smes.dm b/code/modules/power/smes.dm index a9772d485e80..8612b2d9ec45 100644 --- a/code/modules/power/smes.dm +++ b/code/modules/power/smes.dm @@ -19,7 +19,6 @@ desc = "A high-capacity superconducting magnetic energy storage (SMES) unit." icon_state = "smes" density = TRUE - anchored = TRUE use_power = NO_POWER_USE circuit = /obj/item/circuitboard/machine/smes var/capacity = 5e6 // maximum charge diff --git a/code/modules/power/solar.dm b/code/modules/power/solar.dm index 3661162d3512..06f42e49cbc9 100644 --- a/code/modules/power/solar.dm +++ b/code/modules/power/solar.dm @@ -6,7 +6,6 @@ desc = "A solar panel. Generates electricity when in contact with sunlight." icon = 'goon/icons/obj/power.dmi' icon_state = "sp_base" - anchored = TRUE density = TRUE use_power = NO_POWER_USE idle_power_usage = 0 @@ -257,7 +256,6 @@ desc = "A controller for solar panel arrays." icon = 'icons/obj/computer.dmi' icon_state = "computer" - anchored = TRUE density = TRUE use_power = IDLE_POWER_USE idle_power_usage = 250 diff --git a/code/modules/power/terminal.dm b/code/modules/power/terminal.dm index d82189e52014..3fa815bf998b 100644 --- a/code/modules/power/terminal.dm +++ b/code/modules/power/terminal.dm @@ -8,9 +8,8 @@ icon_state = "term" desc = "It's an underfloor wiring terminal for power equipment." level = 1 - var/obj/machinery/power/master = null - anchored = TRUE layer = WIRE_TERMINAL_LAYER //a bit above wires + var/obj/machinery/power/master = null /obj/machinery/power/terminal/Initialize() diff --git a/code/modules/power/tracker.dm b/code/modules/power/tracker.dm index c999554d87d0..cc5b1d632221 100644 --- a/code/modules/power/tracker.dm +++ b/code/modules/power/tracker.dm @@ -8,7 +8,6 @@ desc = "A solar directional tracker." icon = 'goon/icons/obj/power.dmi' icon_state = "tracker" - anchored = TRUE density = TRUE use_power = NO_POWER_USE max_integrity = 250 diff --git a/code/modules/power/turbine.dm b/code/modules/power/turbine.dm index 22777e4fcf43..85ee7589b9af 100644 --- a/code/modules/power/turbine.dm +++ b/code/modules/power/turbine.dm @@ -27,7 +27,6 @@ desc = "The compressor stage of a gas turbine generator." icon = 'icons/obj/atmospherics/pipes/simple.dmi' icon_state = "compressor" - anchored = TRUE density = TRUE resistance_flags = FIRE_PROOF CanAtmosPass = ATMOS_PASS_DENSITY @@ -48,7 +47,6 @@ desc = "A gas turbine used for backup power generation." icon = 'icons/obj/atmospherics/pipes/simple.dmi' icon_state = "turbine" - anchored = TRUE density = TRUE resistance_flags = FIRE_PROOF CanAtmosPass = ATMOS_PASS_DENSITY diff --git a/code/modules/reagents/chemistry/machinery/chem_dispenser.dm b/code/modules/reagents/chemistry/machinery/chem_dispenser.dm index 4f35b33ad45c..bf0a96b50013 100644 --- a/code/modules/reagents/chemistry/machinery/chem_dispenser.dm +++ b/code/modules/reagents/chemistry/machinery/chem_dispenser.dm @@ -2,7 +2,6 @@ name = "chem dispenser" desc = "Creates and dispenses chemicals." density = TRUE - anchored = TRUE icon = 'icons/obj/chemical.dmi' icon_state = "dispenser" use_power = IDLE_POWER_USE @@ -405,7 +404,6 @@ obj/machinery/chem_dispenser/proc/work_animation() /obj/machinery/chem_dispenser/drinks name = "soda dispenser" desc = "Contains a large reservoir of soft drinks." - anchored = TRUE icon = 'icons/obj/chemical.dmi' icon_state = "soda_dispenser" has_panel_overlay = FALSE @@ -449,7 +447,6 @@ obj/machinery/chem_dispenser/proc/work_animation() /obj/machinery/chem_dispenser/drinks/beer name = "booze dispenser" desc = "Contains a large reservoir of the good stuff." - anchored = TRUE icon = 'icons/obj/chemical.dmi' icon_state = "booze_dispenser" circuit = /obj/item/circuitboard/machine/chem_dispenser/drinks/beer diff --git a/code/modules/reagents/chemistry/machinery/chem_heater.dm b/code/modules/reagents/chemistry/machinery/chem_heater.dm index 415ce1528d52..ffa1e085b263 100644 --- a/code/modules/reagents/chemistry/machinery/chem_heater.dm +++ b/code/modules/reagents/chemistry/machinery/chem_heater.dm @@ -1,7 +1,6 @@ /obj/machinery/chem_heater name = "chemical heater" density = TRUE - anchored = TRUE icon = 'icons/obj/chemical.dmi' icon_state = "mixer0b" use_power = IDLE_POWER_USE diff --git a/code/modules/reagents/chemistry/machinery/chem_master.dm b/code/modules/reagents/chemistry/machinery/chem_master.dm index abe6fb5b6356..153cb54bcdc7 100644 --- a/code/modules/reagents/chemistry/machinery/chem_master.dm +++ b/code/modules/reagents/chemistry/machinery/chem_master.dm @@ -2,7 +2,6 @@ name = "ChemMaster 3000" desc = "Used to separate chemicals and distribute them in a variety of forms." density = TRUE - anchored = TRUE layer = BELOW_OBJ_LAYER icon = 'icons/obj/chemical.dmi' icon_state = "mixer0" diff --git a/code/modules/reagents/chemistry/machinery/pandemic.dm b/code/modules/reagents/chemistry/machinery/pandemic.dm index 88b9b5e1d4a6..25385ca2ff6a 100644 --- a/code/modules/reagents/chemistry/machinery/pandemic.dm +++ b/code/modules/reagents/chemistry/machinery/pandemic.dm @@ -5,7 +5,6 @@ name = "PanD.E.M.I.C 2200" desc = "Used to work with viruses." density = TRUE - anchored = TRUE icon = 'icons/obj/chemical.dmi' icon_state = "mixer0" circuit = /obj/item/circuitboard/computer/pandemic diff --git a/code/modules/reagents/chemistry/machinery/reagentgrinder.dm b/code/modules/reagents/chemistry/machinery/reagentgrinder.dm index ead81ae2fd29..4fb079a8902b 100644 --- a/code/modules/reagents/chemistry/machinery/reagentgrinder.dm +++ b/code/modules/reagents/chemistry/machinery/reagentgrinder.dm @@ -7,7 +7,6 @@ icon = 'icons/obj/kitchen.dmi' icon_state = "juicer1" layer = BELOW_OBJ_LAYER - anchored = TRUE use_power = IDLE_POWER_USE idle_power_usage = 5 active_power_usage = 100 diff --git a/code/modules/reagents/chemistry/machinery/smoke_machine.dm b/code/modules/reagents/chemistry/machinery/smoke_machine.dm index 4a67b222e6b9..a8b091990664 100644 --- a/code/modules/reagents/chemistry/machinery/smoke_machine.dm +++ b/code/modules/reagents/chemistry/machinery/smoke_machine.dm @@ -6,7 +6,6 @@ icon = 'icons/obj/chemical.dmi' icon_state = "smoke0" density = TRUE - anchored = TRUE circuit = /obj/item/circuitboard/machine/smoke_machine var/efficiency = 10 var/on = FALSE diff --git a/code/modules/recycling/conveyor2.dm b/code/modules/recycling/conveyor2.dm index 792055742720..a29722b4af45 100644 --- a/code/modules/recycling/conveyor2.dm +++ b/code/modules/recycling/conveyor2.dm @@ -8,7 +8,6 @@ GLOBAL_LIST_EMPTY(conveyors_by_id) icon_state = "conveyor_map" name = "conveyor belt" desc = "A conveyor belt." - anchored = TRUE layer = BELOW_OPEN_DOOR_LAYER var/operating = 0 // 1 if running forward, -1 if backwards, 0 if off var/operable = 1 // true if can operate (no broken segments in this belt run) @@ -215,11 +214,12 @@ GLOBAL_LIST_EMPTY(conveyors_by_id) // /obj/machinery/conveyor_switch - name = "conveyor switch" desc = "A conveyor control switch." icon = 'icons/obj/recycling.dmi' icon_state = "switch-off" + speed_process = TRUE + var/position = 0 // 0 off, -1 reverse, 1 forward var/last_pos = -1 // last direction setting var/operated = 1 // true if just operated @@ -228,11 +228,6 @@ GLOBAL_LIST_EMPTY(conveyors_by_id) var/id = "" // must match conveyor IDs to control them - anchored = TRUE - speed_process = TRUE - - - /obj/machinery/conveyor_switch/Initialize(mapload, newid) . = ..() if (newid) diff --git a/code/modules/recycling/disposal/bin.dm b/code/modules/recycling/disposal/bin.dm index 178fb19e3ebc..737f50859dc8 100644 --- a/code/modules/recycling/disposal/bin.dm +++ b/code/modules/recycling/disposal/bin.dm @@ -4,7 +4,6 @@ /obj/machinery/disposal icon = 'icons/obj/atmospherics/pipes/disposal.dmi' - anchored = TRUE density = TRUE armor = list("melee" = 25, "bullet" = 10, "laser" = 10, "energy" = 100, "bomb" = 0, "bio" = 100, "rad" = 100, "fire" = 90, "acid" = 30) max_integrity = 200 diff --git a/code/modules/research/experimentor.dm b/code/modules/research/experimentor.dm index 23d7a9fba3ab..5b42c777f1f1 100644 --- a/code/modules/research/experimentor.dm +++ b/code/modules/research/experimentor.dm @@ -23,7 +23,6 @@ icon = 'icons/obj/machines/heavy_lathe.dmi' icon_state = "h_lathe" density = TRUE - anchored = TRUE use_power = IDLE_POWER_USE circuit = /obj/item/circuitboard/machine/experimentor var/recentlyExperimented = 0 diff --git a/code/modules/research/rdmachines.dm b/code/modules/research/rdmachines.dm index 47f34a9b1507..87f8cefe783b 100644 --- a/code/modules/research/rdmachines.dm +++ b/code/modules/research/rdmachines.dm @@ -6,7 +6,6 @@ name = "R&D Device" icon = 'icons/obj/machines/research.dmi' density = TRUE - anchored = TRUE use_power = IDLE_POWER_USE var/busy = FALSE var/hacked = FALSE diff --git a/code/modules/security_levels/keycard_authentication.dm b/code/modules/security_levels/keycard_authentication.dm index 15d5abf5e8a7..162942d1d808 100644 --- a/code/modules/security_levels/keycard_authentication.dm +++ b/code/modules/security_levels/keycard_authentication.dm @@ -9,7 +9,6 @@ GLOBAL_DATUM_INIT(keycard_events, /datum/events, new) desc = "This device is used to trigger station functions, which require more than one ID card to authenticate." icon = 'icons/obj/monitors.dmi' icon_state = "auth_off" - anchored = TRUE use_power = IDLE_POWER_USE idle_power_usage = 2 active_power_usage = 6 diff --git a/code/modules/shuttle/manipulator.dm b/code/modules/shuttle/manipulator.dm index c8c6a6632174..a033032d41ad 100644 --- a/code/modules/shuttle/manipulator.dm +++ b/code/modules/shuttle/manipulator.dm @@ -9,7 +9,6 @@ icon = 'icons/obj/machines/shuttle_manipulator.dmi' icon_state = "holograph_on" - anchored = TRUE density = TRUE // UI state variables diff --git a/code/modules/shuttle/on_move.dm b/code/modules/shuttle/on_move.dm index 1a5ba07576ae..76293c327cc4 100644 --- a/code/modules/shuttle/on_move.dm +++ b/code/modules/shuttle/on_move.dm @@ -204,11 +204,6 @@ All ShuttleMove procs go here on = TRUE update_list() -/obj/machinery/thruster/beforeShuttleMove(turf/newT, rotation, move_mode, obj/docking_port/mobile/moving_dock) - . = ..() - if(. & MOVE_AREA) - . |= MOVE_CONTENTS - /obj/machinery/atmospherics/afterShuttleMove(turf/oldT, list/movement_force, shuttle_dir, shuttle_preferred_direction, move_dir, rotation) . = ..() var/missing_nodes = FALSE diff --git a/code/modules/station_goals/shield.dm b/code/modules/station_goals/shield.dm index 9c92ac4bd55c..44746e595e0b 100644 --- a/code/modules/station_goals/shield.dm +++ b/code/modules/station_goals/shield.dm @@ -87,10 +87,11 @@ desc = "" icon = 'icons/obj/machines/satellite.dmi' icon_state = "sat_inactive" - var/mode = "NTPROBEV0.8" - var/active = FALSE + anchored = FALSE density = TRUE use_power = FALSE + var/mode = "NTPROBEV0.8" + var/active = FALSE var/static/gid = 0 var/id = 0 diff --git a/code/modules/vending/_vending.dm b/code/modules/vending/_vending.dm index ae4c83d01657..31de01b1590a 100644 --- a/code/modules/vending/_vending.dm +++ b/code/modules/vending/_vending.dm @@ -33,7 +33,6 @@ IF YOU MODIFY THE PRODUCTS LIST OF A MACHINE, MAKE SURE TO UPDATE ITS RESUPPLY C icon = 'icons/obj/vending.dmi' icon_state = "generic" layer = BELOW_OBJ_LAYER - anchored = TRUE density = TRUE verb_say = "beeps" verb_ask = "beeps"