diff --git a/code/ATMOSPHERICS/atmospherics.dm b/code/ATMOSPHERICS/atmospherics.dm index 39e9e44da2..093a8e544d 100644 --- a/code/ATMOSPHERICS/atmospherics.dm +++ b/code/ATMOSPHERICS/atmospherics.dm @@ -10,7 +10,7 @@ Pipelines + Other Objects -> Pipe network */ /obj/machinery/atmospherics - anchored = 1 + anchored = TRUE idle_power_usage = 0 active_power_usage = 0 power_channel = ENVIRON diff --git a/code/ATMOSPHERICS/components/binary_devices/algae_generator_vr.dm b/code/ATMOSPHERICS/components/binary_devices/algae_generator_vr.dm index e43bc4b25a..451a2a8bce 100644 --- a/code/ATMOSPHERICS/components/binary_devices/algae_generator_vr.dm +++ b/code/ATMOSPHERICS/components/binary_devices/algae_generator_vr.dm @@ -6,8 +6,8 @@ icon = 'icons/obj/machines/algae_vr.dmi' icon_state = "algae-off" circuit = /obj/item/weapon/circuitboard/algae_farm - anchored = 1 - density = 1 + anchored = TRUE + density = TRUE power_channel = EQUIP use_power = USE_POWER_IDLE idle_power_usage = 100 // Minimal lights to keep algae alive diff --git a/code/ATMOSPHERICS/components/binary_devices/circulator.dm b/code/ATMOSPHERICS/components/binary_devices/circulator.dm index c09c482cc1..5291627786 100644 --- a/code/ATMOSPHERICS/components/binary_devices/circulator.dm +++ b/code/ATMOSPHERICS/components/binary_devices/circulator.dm @@ -5,7 +5,7 @@ desc = "A gas circulator turbine and heat exchanger." icon = 'icons/obj/power.dmi' icon_state = "circ-unassembled" - anchored = 0 + anchored = FALSE pipe_flags = PIPING_DEFAULT_LAYER_ONLY|PIPING_ONE_PER_TURF var/kinetic_efficiency = 0.04 //combined kinetic and kinetic-to-electric efficiency @@ -21,7 +21,7 @@ var/stored_energy = 0 var/temperature_overlay - density = 1 + density = TRUE /obj/machinery/atmospherics/binary/circulator/New() ..() diff --git a/code/ATMOSPHERICS/components/binary_devices/pipeturbine.dm b/code/ATMOSPHERICS/components/binary_devices/pipeturbine.dm index 2a83dd5933..da5f37ff0c 100644 --- a/code/ATMOSPHERICS/components/binary_devices/pipeturbine.dm +++ b/code/ATMOSPHERICS/components/binary_devices/pipeturbine.dm @@ -3,8 +3,8 @@ desc = "A gas turbine. Converting pressure into energy since 1884." icon = 'icons/obj/pipeturbine.dmi' icon_state = "turbine" - anchored = 0 - density = 1 + anchored = FALSE + density = TRUE var/efficiency = 0.4 var/kin_energy = 0 @@ -229,8 +229,8 @@ desc = "Electrogenerator. Converts rotation into power." icon = 'icons/obj/pipeturbine.dmi' icon_state = "motor" - anchored = 0 - density = 1 + anchored = FALSE + density = TRUE var/kin_to_el_ratio = 0.1 //How much kinetic energy will be taken from turbine and converted into electricity var/obj/machinery/atmospherics/pipeturbine/turbine diff --git a/code/ATMOSPHERICS/components/trinary_devices/filter.dm b/code/ATMOSPHERICS/components/trinary_devices/filter.dm index a787aa1873..48085569bc 100755 --- a/code/ATMOSPHERICS/components/trinary_devices/filter.dm +++ b/code/ATMOSPHERICS/components/trinary_devices/filter.dm @@ -3,7 +3,7 @@ icon_state = "map" construction_type = /obj/item/pipe/trinary/flippable pipe_state = "filter" - density = 0 + density = FALSE level = 1 name = "Gas filter" diff --git a/code/ATMOSPHERICS/components/trinary_devices/mixer.dm b/code/ATMOSPHERICS/components/trinary_devices/mixer.dm index 7344a3e732..8cecbc6c65 100644 --- a/code/ATMOSPHERICS/components/trinary_devices/mixer.dm +++ b/code/ATMOSPHERICS/components/trinary_devices/mixer.dm @@ -3,7 +3,7 @@ icon_state = "map" construction_type = /obj/item/pipe/trinary/flippable pipe_state = "mixer" - density = 0 + density = FALSE level = 1 name = "Gas mixer" diff --git a/code/ATMOSPHERICS/components/unary/cold_sink.dm b/code/ATMOSPHERICS/components/unary/cold_sink.dm index 3568a87a42..dea0487b48 100644 --- a/code/ATMOSPHERICS/components/unary/cold_sink.dm +++ b/code/ATMOSPHERICS/components/unary/cold_sink.dm @@ -6,8 +6,8 @@ desc = "Cools gas when connected to pipe network" icon = 'icons/obj/Cryogenic2_vr.dmi' icon_state = "freezer_0" - density = 1 - anchored = 1 + density = TRUE + anchored = TRUE use_power = USE_POWER_OFF idle_power_usage = 5 // 5 Watts for thermostat related circuitry circuit = /obj/item/weapon/circuitboard/unary_atmos/cooler diff --git a/code/ATMOSPHERICS/components/unary/heat_exchanger.dm b/code/ATMOSPHERICS/components/unary/heat_exchanger.dm index a3571fed8b..91616f8d8f 100644 --- a/code/ATMOSPHERICS/components/unary/heat_exchanger.dm +++ b/code/ATMOSPHERICS/components/unary/heat_exchanger.dm @@ -3,7 +3,7 @@ icon = 'icons/obj/atmospherics/heat_exchanger.dmi' icon_state = "intact" pipe_state = "heunary" - density = 1 + density = TRUE name = "Heat Exchanger" desc = "Exchanges heat between two input gases. Setup for fast heat transfer" diff --git a/code/ATMOSPHERICS/components/unary/heat_source.dm b/code/ATMOSPHERICS/components/unary/heat_source.dm index 365be85b70..aea5730672 100644 --- a/code/ATMOSPHERICS/components/unary/heat_source.dm +++ b/code/ATMOSPHERICS/components/unary/heat_source.dm @@ -6,8 +6,8 @@ desc = "Heats gas when connected to a pipe network" icon = 'icons/obj/Cryogenic2_vr.dmi' icon_state = "heater_0" - density = 1 - anchored = 1 + density = TRUE + anchored = TRUE use_power = USE_POWER_OFF idle_power_usage = 5 //5 Watts for thermostat related circuitry circuit = /obj/item/weapon/circuitboard/unary_atmos/heater diff --git a/code/ATMOSPHERICS/pipes/pipe_base.dm b/code/ATMOSPHERICS/pipes/pipe_base.dm index 5f384ed457..0d687b8db0 100644 --- a/code/ATMOSPHERICS/pipes/pipe_base.dm +++ b/code/ATMOSPHERICS/pipes/pipe_base.dm @@ -17,7 +17,7 @@ var/in_stasis = FALSE //minimum pressure before check_pressure(...) should be called - can_buckle = 1 + can_buckle = TRUE buckle_require_restraints = 1 buckle_lying = -1 diff --git a/code/ATMOSPHERICS/pipes/tank.dm b/code/ATMOSPHERICS/pipes/tank.dm index a893facff6..6380786288 100644 --- a/code/ATMOSPHERICS/pipes/tank.dm +++ b/code/ATMOSPHERICS/pipes/tank.dm @@ -16,7 +16,7 @@ dir = SOUTH initialize_directions = SOUTH pipe_flags = PIPING_DEFAULT_LAYER_ONLY - density = 1 + density = TRUE /obj/machinery/atmospherics/pipe/tank/New() icon_state = "air" diff --git a/code/ZAS/Fire.dm b/code/ZAS/Fire.dm index 9c8ec74d4d..1f281d334a 100644 --- a/code/ZAS/Fire.dm +++ b/code/ZAS/Fire.dm @@ -108,7 +108,7 @@ If it gains pressure too slowly, it may leak or just rupture instead of explodin /obj/fire //Icon for fire on turfs. - anchored = 1 + anchored = TRUE mouse_opacity = 0 blend_mode = BLEND_ADD diff --git a/code/_helpers/unsorted.dm b/code/_helpers/unsorted.dm index df5d0b81bf..cef24751a2 100644 --- a/code/_helpers/unsorted.dm +++ b/code/_helpers/unsorted.dm @@ -1177,10 +1177,10 @@ var/mob/dview/dview_mob = new /mob/dview invisibility = 101 - density = 0 + density = FALSE - anchored = 1 - simulated = 0 + anchored = TRUE + simulated = FALSE see_in_dark = 1e6 diff --git a/code/_onclick/hud/screen_objects.dm b/code/_onclick/hud/screen_objects.dm index 0c10066e58..00446add6d 100644 --- a/code/_onclick/hud/screen_objects.dm +++ b/code/_onclick/hud/screen_objects.dm @@ -12,7 +12,7 @@ appearance_flags = TILE_BOUND|PIXEL_SCALE|NO_CLIENT_COLOR layer = LAYER_HUD_BASE plane = PLANE_PLAYER_HUD - unacidable = 1 + unacidable = TRUE var/obj/master = null //A reference to the object in the slot. Grabs or items, generally. var/datum/hud/hud = null // A reference to the owner HUD, if any. diff --git a/code/controllers/subsystems/airflow.dm b/code/controllers/subsystems/airflow.dm index 48361ba067..7561ad8cca 100644 --- a/code/controllers/subsystems/airflow.dm +++ b/code/controllers/subsystems/airflow.dm @@ -135,7 +135,7 @@ SUBSYSTEM_DEF(airflow) airflow_od = 0 if (!density) - density = 1 + density = TRUE airflow_od = 1 return TRUE diff --git a/code/defines/obj.dm b/code/defines/obj.dm index e6228ab2e2..4e60163547 100644 --- a/code/defines/obj.dm +++ b/code/defines/obj.dm @@ -1,8 +1,8 @@ /obj/structure/signpost icon = 'icons/obj/stationobjs.dmi' icon_state = "signpost" - anchored = 1 - density = 1 + anchored = TRUE + density = TRUE /obj/structure/signpost/attackby(obj/item/weapon/W as obj, mob/user as mob) return attack_hand(user) @@ -16,15 +16,15 @@ var/mark = "" icon = 'icons/misc/mark.dmi' icon_state = "blank" - anchored = 1 + anchored = TRUE layer = 99 mouse_opacity = 0 - unacidable = 1//Just to be sure. + unacidable = TRUE//Just to be sure. /obj/effect/beam name = "beam" - density = 0 - unacidable = 1//Just to be sure. + density = FALSE + unacidable = TRUE//Just to be sure. var/def_zone pass_flags = PASSTABLE @@ -33,8 +33,8 @@ name = "begin" icon = 'icons/obj/stationobjs.dmi' icon_state = "begin" - anchored = 1.0 - unacidable = 1 + anchored = TRUE + unacidable = TRUE /* * This item is completely unused, but removing it will break something in R&D and Radio code causing PDA and Ninja code to fail on compile @@ -58,7 +58,7 @@ /obj/effect/projection name = "Projection" desc = "This looks like a projection of something." - anchored = 1.0 + anchored = TRUE /obj/effect/shut_controller name = "shut controller" @@ -70,9 +70,9 @@ icon = 'icons/obj/stationobjs.dmi' icon_state = "showcase_1" desc = "A stand with the empty body of a cyborg bolted to it." - density = 1 - anchored = 1 - unacidable = 1//temporary until I decide whether the borg can be removed. -veyveyr + density = TRUE + anchored = TRUE + unacidable = TRUE//temporary until I decide whether the borg can be removed. -veyveyr /obj/structure/showcase/sign name = "WARNING: WILDERNESS" @@ -116,8 +116,8 @@ icon = 'icons/misc/beach.dmi' icon_state = "beachball" name = "beach ball" - density = 0 - anchored = 0 + density = FALSE + anchored = FALSE w_class = ITEMSIZE_LARGE force = 0.0 throwforce = 0.0 diff --git a/code/defines/obj/weapon.dm b/code/defines/obj/weapon.dm index da096d8fca..0b5d1a0719 100644 --- a/code/defines/obj/weapon.dm +++ b/code/defines/obj/weapon.dm @@ -19,8 +19,8 @@ icon = 'icons/obj/items.dmi' icon_state = "rcd" opacity = 0 - density = 0 - anchored = 0.0 + density = FALSE + anchored = FALSE var/stored_matter = 0 var/mode = 1 w_class = ITEMSIZE_NORMAL @@ -303,7 +303,7 @@ w_class = ITEMSIZE_HUGE can_hold = list(/obj/item/weapon/stock_parts) storage_slots = 50 - use_to_pickup = 1 + use_to_pickup = TRUE allow_quick_gather = 1 allow_quick_empty = 1 collection_mode = 1 @@ -326,7 +326,7 @@ /obj/item/weapon/reagent_containers/glass/beaker) //End of YAWN Changes storage_slots = 200 - use_to_pickup = 1 + use_to_pickup = TRUE allow_quick_gather = 1 allow_quick_empty = 1 collection_mode = 1 diff --git a/code/game/atoms.dm b/code/game/atoms.dm index acf31b5079..5c8ff8974d 100644 --- a/code/game/atoms.dm +++ b/code/game/atoms.dm @@ -11,7 +11,7 @@ var/pass_flags = 0 var/throwpass = 0 var/germ_level = GERM_LEVEL_AMBIENT // The higher the germ level, the more germ on the atom. - var/simulated = 1 //filter for actions - used by lighting overlays + var/simulated = TRUE //filter for actions - used by lighting overlays var/atom_say_verb = "says" var/bubble_icon = "normal" ///what icon the atom uses for speechbubbles var/fluorescent // Shows up under a UV light. @@ -454,7 +454,7 @@ if(!blood_DNA || !istype(blood_DNA, /list)) //if our list of DNA doesn't exist yet (or isn't a list) initialise it. blood_DNA = list() - was_bloodied = 1 + was_bloodied = TRUE if(!blood_color) blood_color = "#A10808" if(istype(M)) diff --git a/code/game/atoms_movable.dm b/code/game/atoms_movable.dm index d443b0bf0a..08b0f3e056 100644 --- a/code/game/atoms_movable.dm +++ b/code/game/atoms_movable.dm @@ -3,7 +3,7 @@ appearance_flags = TILE_BOUND|PIXEL_SCALE|KEEP_TOGETHER|LONG_GLIDE glide_size = 8 var/last_move = null //The direction the atom last moved - var/anchored = 0 + var/anchored = FALSE // var/elevation = 2 - not used anywhere var/moving_diagonally var/move_speed = 10 @@ -523,7 +523,7 @@ //Overlays /atom/movable/overlay var/atom/master = null - anchored = 1 + anchored = TRUE /atom/movable/overlay/New() for(var/x in src.verbs) diff --git a/code/game/dna/dna_modifier.dm b/code/game/dna/dna_modifier.dm index 908651abf9..1f2815426b 100644 --- a/code/game/dna/dna_modifier.dm +++ b/code/game/dna/dna_modifier.dm @@ -65,8 +65,8 @@ desc = "It scans DNA structures." icon = 'icons/obj/Cryogenic2.dmi' icon_state = "scanner_0" - density = 1 - anchored = 1.0 + density = TRUE + anchored = TRUE use_power = USE_POWER_IDLE idle_power_usage = 50 active_power_usage = 300 @@ -274,7 +274,7 @@ desc = "Scan DNA." icon_keyboard = "med_key" icon_screen = "dna" - density = 1 + density = TRUE circuit = /obj/item/weapon/circuitboard/scan_consolenew var/selected_ui_block = 1.0 var/selected_ui_subblock = 1.0 @@ -290,7 +290,7 @@ var/obj/machinery/dna_scannernew/connected = null var/obj/item/weapon/disk/data/disk = null var/selected_menu_key = PAGE_UI - anchored = 1 + anchored = TRUE use_power = USE_POWER_IDLE idle_power_usage = 10 active_power_usage = 400 diff --git a/code/game/gamemodes/changeling/powers/armblade.dm b/code/game/gamemodes/changeling/powers/armblade.dm index 4a84fde371..fc54b32891 100644 --- a/code/game/gamemodes/changeling/powers/armblade.dm +++ b/code/game/gamemodes/changeling/powers/armblade.dm @@ -54,7 +54,7 @@ icon_state = "arm_blade" w_class = ITEMSIZE_HUGE force = 5 - anchored = 1 + anchored = TRUE throwforce = 0 //Just to be on the safe side throw_range = 0 throw_speed = 0 @@ -138,8 +138,8 @@ icon_state = "arm_blade" force = 40 armor_penetration = 15 - sharp = 1 - edge = 1 + sharp = TRUE + edge = TRUE pry = 1 attack_verb = list("attacked", "slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut") defend_chance = 60 @@ -157,8 +157,8 @@ desc = "A grotesque claw made out of bone and flesh that cleaves through people as a hot knife through butter." icon_state = "ling_claw" force = 15 - sharp = 1 - edge = 1 + sharp = TRUE + edge = TRUE attack_verb = list("attacked", "slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut") defend_chance = 50 projectile_parry_chance = 15 diff --git a/code/game/gamemodes/changeling/powers/armor.dm b/code/game/gamemodes/changeling/powers/armor.dm index aa6e2bf0b0..5a6db52833 100644 --- a/code/game/gamemodes/changeling/powers/armor.dm +++ b/code/game/gamemodes/changeling/powers/armor.dm @@ -39,7 +39,7 @@ //it still ends up in your blood. (also balance but muh fluff) allowed = list(/obj/item/device/flashlight, /obj/item/weapon/tank/emergency/oxygen, /obj/item/weapon/tank/oxygen) armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 0, rad = 0) //No armor at all. - canremove = 0 + canremove = FALSE /obj/item/clothing/suit/space/changeling/New() ..() @@ -58,7 +58,7 @@ flags = BLOCKHAIR //Again, no THICKMATERIAL. armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 0, rad = 0) body_parts_covered = HEAD|FACE|EYES - canremove = 0 + canremove = FALSE /obj/item/clothing/head/helmet/space/changeling/dropped() qdel(src) @@ -68,7 +68,7 @@ name = "fleshy grippers" icon_state = "lingspacesuit" action_button_name = "Toggle Grippers" - canremove = 0 + canremove = FALSE /obj/item/clothing/shoes/magboots/changeling/set_slowdown() slowdown = shoes? max(SHOES_SLOWDOWN, shoes.slowdown): SHOES_SLOWDOWN //So you can't put on magboots to make you walk faster. diff --git a/code/game/gamemodes/changeling/powers/fabricate_clothing.dm b/code/game/gamemodes/changeling/powers/fabricate_clothing.dm index 6ec87a64d4..c3c5f2aa15 100644 --- a/code/game/gamemodes/changeling/powers/fabricate_clothing.dm +++ b/code/game/gamemodes/changeling/powers/fabricate_clothing.dm @@ -42,7 +42,7 @@ var/global/list/changeling_fabricated_clothing = list( desc = "The flesh all around us has grown a new layer of cells that can shift appearance and create a biological fabric that cannot be distinguished from \ ordinary cloth, allowing us to make ourselves appear to wear almost anything." origin_tech = list() //The base chameleon items have origin technology, which we will inherit if we don't null out this variable. - canremove = 0 //Since this is essentially flesh impersonating clothes, tearing someone's skin off as if it were clothing isn't possible. + canremove = FALSE //Since this is essentially flesh impersonating clothes, tearing someone's skin off as if it were clothing isn't possible. /obj/item/clothing/under/chameleon/changeling/emp_act(severity) //As these are purely organic, EMP does nothing to them. return @@ -63,7 +63,7 @@ var/global/list/changeling_fabricated_clothing = list( desc = "Our head is swelled with a large quanity of rapidly shifting skin cells. We can reform our head to resemble various hats and \ helmets that biologicals are so fond of wearing." origin_tech = list() - canremove = 0 + canremove = FALSE /obj/item/clothing/head/chameleon/changeling/emp_act(severity) return @@ -88,7 +88,7 @@ var/global/list/changeling_fabricated_clothing = list( item_state = "armor" desc = "The cells in our chest are rapidly shifting, ready to reform into material that can resemble most pieces of clothing." origin_tech = list() - canremove = 0 + canremove = FALSE /obj/item/clothing/suit/chameleon/changeling/emp_act(severity) return @@ -113,7 +113,7 @@ var/global/list/changeling_fabricated_clothing = list( item_state = "black" desc = "Our feet are overlayed with another layer of flesh and bone on top. We can reform our feet to resemble various boots and shoes." origin_tech = list() - canremove = 0 + canremove = FALSE /obj/item/clothing/shoes/chameleon/changeling/emp_act() return @@ -138,7 +138,7 @@ var/global/list/changeling_fabricated_clothing = list( item_state = "backpack" desc = "A large pouch imbedded in our back, it can shift form to resemble many common backpacks that other biologicals are fond of using." origin_tech = list() - canremove = 0 + canremove = FALSE /obj/item/weapon/storage/backpack/chameleon/changeling/emp_act() return @@ -166,7 +166,7 @@ var/global/list/changeling_fabricated_clothing = list( desc = "Our hands have a second layer of flesh on top. We can reform our hands to resemble a large variety of fabrics and materials that biologicals \ tend to wear on their hands. Remember that these won't protect your hands from harm." origin_tech = list() - canremove = 0 + canremove = FALSE /obj/item/clothing/gloves/chameleon/changeling/emp_act() return @@ -192,7 +192,7 @@ var/global/list/changeling_fabricated_clothing = list( desc = "A transparent visor of brittle chitin covers our face. We can reform it to resemble various masks that biologicals use. It can also utilize internal \ tanks.." origin_tech = list() - canremove = 0 + canremove = FALSE /obj/item/clothing/mask/chameleon/changeling/emp_act() return @@ -213,7 +213,7 @@ var/global/list/changeling_fabricated_clothing = list( item_state = "glasses" desc = "A transparent piece of eyewear made out of brittle chitin. We can reform it to resemble various glasses and goggles." origin_tech = list() - canremove = 0 + canremove = FALSE /obj/item/clothing/glasses/chameleon/changeling/emp_act() return @@ -238,7 +238,7 @@ var/global/list/changeling_fabricated_clothing = list( ) item_state = "utility" origin_tech = list() - canremove = 0 + canremove = FALSE /obj/item/weapon/storage/belt/chameleon/changeling/emp_act() return @@ -262,7 +262,7 @@ var/global/list/changeling_fabricated_clothing = list( electronic_warfare = 1 //The lack of RFID stuff makes it hard for AIs to track, I guess. *handwaves* registered_user = null access = null - canremove = 0 + canremove = FALSE /obj/item/weapon/card/id/syndicate/changeling/New(mob/user as mob) ..() diff --git a/code/game/gamemodes/cult/cult_items.dm b/code/game/gamemodes/cult/cult_items.dm index c3e87f193c..3622998eef 100644 --- a/code/game/gamemodes/cult/cult_items.dm +++ b/code/game/gamemodes/cult/cult_items.dm @@ -10,8 +10,8 @@ drop_sound = 'sound/items/drop/sword.ogg' pickup_sound = 'sound/items/pickup/sword.ogg' attack_verb = list("attacked", "slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut") - edge = 1 - sharp = 1 + edge = TRUE + sharp = TRUE /obj/item/weapon/melee/cultblade/cultify() return diff --git a/code/game/gamemodes/cult/cult_structures.dm b/code/game/gamemodes/cult/cult_structures.dm index 241d613275..3740010914 100644 --- a/code/game/gamemodes/cult/cult_structures.dm +++ b/code/game/gamemodes/cult/cult_structures.dm @@ -1,6 +1,6 @@ /obj/structure/cult - density = 1 - anchored = 1 + density = TRUE + anchored = TRUE icon = 'icons/obj/cult.dmi' /obj/structure/cult/cultify() @@ -59,7 +59,7 @@ STOP_PROCESSING(SSobj, src) playsound(src,shatter_sound, 75, 1) isbroken = 1 - density = 0 + density = FALSE icon_state = "[initial(icon_state)]-broken" set_light(0) @@ -75,7 +75,7 @@ user.do_attack_animation(src) playsound(src,shatter_sound, 75, 1) isbroken = 1 - density = 0 + density = FALSE icon_state = "[initial(icon_state)]-broken" set_light(0) else @@ -94,7 +94,7 @@ START_PROCESSING(SSobj, src) to_chat(user, "You repair \the [src].") isbroken = 0 - density = 1 + density = TRUE icon_state = initial(icon_state) set_light(5) @@ -127,9 +127,9 @@ desc = "You're pretty sure that abyss is staring back." icon = 'icons/obj/cult.dmi' icon_state = "hole" - density = 1 - unacidable = 1 - anchored = 1.0 + density = TRUE + unacidable = TRUE + anchored = TRUE var/spawnable = null /obj/effect/gateway/active diff --git a/code/game/gamemodes/cult/cultify/obj.dm b/code/game/gamemodes/cult/cultify/obj.dm index 3ac41e0047..91dabc556f 100644 --- a/code/game/gamemodes/cult/cultify/obj.dm +++ b/code/game/gamemodes/cult/cultify/obj.dm @@ -48,7 +48,7 @@ /obj/machinery/atmospherics/cultify() if(src.invisibility != INVISIBILITY_MAXIMUM) src.invisibility = INVISIBILITY_MAXIMUM - density = 0 + density = FALSE /obj/machinery/appliance/cooker/cultify() new /obj/structure/cult/talisman(loc) @@ -65,7 +65,7 @@ /obj/machinery/door/cultify() if(invisibility != INVISIBILITY_MAXIMUM) invisibility = INVISIBILITY_MAXIMUM - density = 0 + density = FALSE anim(target = src, a_icon = 'icons/effects/effects.dmi', a_icon_state = "breakdoor", sleeptime = 10) qdel(src) diff --git a/code/game/gamemodes/cult/ritual.dm b/code/game/gamemodes/cult/ritual.dm index 5a33a1d49a..f62221f752 100644 --- a/code/game/gamemodes/cult/ritual.dm +++ b/code/game/gamemodes/cult/ritual.dm @@ -22,11 +22,11 @@ var/global/list/rnwords = list("ire","ego","nahlizet","certum","veri","jatkaa"," /obj/effect/rune desc = "A strange collection of symbols drawn in blood." - anchored = 1 + anchored = TRUE icon = 'icons/obj/rune.dmi' icon_state = "1" var/visibility = 0 - unacidable = 1 + unacidable = TRUE layer = TURF_LAYER diff --git a/code/game/gamemodes/events/black_hole.dm b/code/game/gamemodes/events/black_hole.dm index 821a27b4b2..b18310ed88 100644 --- a/code/game/gamemodes/events/black_hole.dm +++ b/code/game/gamemodes/events/black_hole.dm @@ -4,9 +4,9 @@ desc = "FUCK FUCK FUCK AAAHHH" icon_state = "bhole3" opacity = 1 - unacidable = 1 - density = 0 - anchored = 1 + unacidable = TRUE + density = FALSE + anchored = TRUE /obj/effect/bhole/New() spawn(4) diff --git a/code/game/gamemodes/events/clang.dm b/code/game/gamemodes/events/clang.dm index fd6a36e3d4..5aa3372e32 100644 --- a/code/game/gamemodes/events/clang.dm +++ b/code/game/gamemodes/events/clang.dm @@ -13,8 +13,8 @@ In my current plan for it, 'solid' will be defined as anything with density == 1 icon = 'icons/obj/objects.dmi' icon_state = "immrod" throwforce = 100 - density = 1 - anchored = 1 + density = TRUE + anchored = TRUE /obj/effect/immovablerod/Bump(atom/clong) if(istype(clong, /turf/simulated/shuttle)) //Skip shuttles without actually deleting the rod diff --git a/code/game/gamemodes/events/dust.dm b/code/game/gamemodes/events/dust.dm index 750de2ebd5..85391b7352 100644 --- a/code/game/gamemodes/events/dust.dm +++ b/code/game/gamemodes/events/dust.dm @@ -64,8 +64,8 @@ The "dust" will damage the hull of the station causin minor hull breaches. desc = "Dust in space." icon = 'icons/obj/meteor.dmi' icon_state = "space_dust" - density = 1 - anchored = 1 + density = TRUE + anchored = TRUE var/strength = 2 //ex_act severity number var/life = 2 //how many things we hit before qdel(src) diff --git a/code/game/gamemodes/technomancer/core_obj.dm b/code/game/gamemodes/technomancer/core_obj.dm index cc2102cc45..56611103f7 100644 --- a/code/game/gamemodes/technomancer/core_obj.dm +++ b/code/game/gamemodes/technomancer/core_obj.dm @@ -7,7 +7,7 @@ item_state = "technomancer_core" w_class = ITEMSIZE_HUGE slot_flags = SLOT_BACK - unacidable = 1 + unacidable = TRUE origin_tech = list( TECH_MATERIAL = 8, TECH_ENGINEERING = 8, TECH_POWER = 8, TECH_BLUESPACE = 10, TECH_COMBAT = 7, TECH_MAGNET = 9, TECH_DATA = 5 diff --git a/code/game/gamemodes/technomancer/spells/energy_siphon.dm b/code/game/gamemodes/technomancer/spells/energy_siphon.dm index 9bf8dd578f..1659b8f17b 100644 --- a/code/game/gamemodes/technomancer/spells/energy_siphon.dm +++ b/code/game/gamemodes/technomancer/spells/energy_siphon.dm @@ -181,7 +181,7 @@ if(A == firer) // For this, you CAN shoot yourself. on_impact(A) - density = 0 + density = FALSE invisibility = 101 qdel(src) diff --git a/code/game/machinery/Beacon.dm b/code/game/machinery/Beacon.dm index b6f6cb25ac..f1066caffc 100644 --- a/code/game/machinery/Beacon.dm +++ b/code/game/machinery/Beacon.dm @@ -5,7 +5,7 @@ desc = "A device that draws power from bluespace and creates a permanent tracking beacon." level = 1 // underfloor layer = UNDER_JUNK_LAYER - anchored = 1 + anchored = TRUE use_power = USE_POWER_IDLE idle_power_usage = 0 var/obj/item/device/radio/beacon/Beacon diff --git a/code/game/machinery/CableLayer.dm b/code/game/machinery/CableLayer.dm index 8edc131ac8..d4045aefe8 100644 --- a/code/game/machinery/CableLayer.dm +++ b/code/game/machinery/CableLayer.dm @@ -2,7 +2,7 @@ name = "automatic cable layer" icon = 'icons/obj/stationobjs.dmi' icon_state = "pipe_d" - density = 1 + density = TRUE var/obj/structure/cable/last_piece var/obj/item/stack/cable_coil/cable var/max_cable = 100 diff --git a/code/game/machinery/OpTable.dm b/code/game/machinery/OpTable.dm index 2200ef94c6..228857a2dc 100644 --- a/code/game/machinery/OpTable.dm +++ b/code/game/machinery/OpTable.dm @@ -3,8 +3,8 @@ desc = "Used for advanced medical procedures." icon = 'icons/obj/surgery.dmi' icon_state = "table2-idle" - density = 1 - anchored = 1.0 + density = TRUE + anchored = TRUE use_power = USE_POWER_IDLE idle_power_usage = 1 active_power_usage = 5 @@ -37,14 +37,14 @@ return if(3.0) if(prob(25)) - density = 0 + density = FALSE else return /obj/machinery/optable/attack_hand(mob/user as mob) if(HULK in usr.mutations) visible_message("\The [usr] destroys \the [src]!") - density = 0 + density = FALSE qdel(src) return diff --git a/code/game/machinery/Sleeper.dm b/code/game/machinery/Sleeper.dm index e53cd7818c..c3be1bbf46 100644 --- a/code/game/machinery/Sleeper.dm +++ b/code/game/machinery/Sleeper.dm @@ -4,8 +4,8 @@ icon = 'icons/obj/Cryogenic2_vr.dmi' //VOREStation Edit - Better icon. icon_state = "sleeperconsole" var/obj/machinery/sleeper/sleeper - anchored = 1 //About time someone fixed this. - density = 1 //VOREStation Edit - Big console + anchored = TRUE //About time someone fixed this. + density = TRUE //VOREStation Edit - Big console dir = 8 use_power = USE_POWER_IDLE idle_power_usage = 40 @@ -87,8 +87,8 @@ desc = "A stasis pod with built-in injectors, a dialysis machine, and a limited health scanner." icon = 'icons/obj/Cryogenic2_vr.dmi' //VOREStation Edit - Better icons icon_state = "sleeper_0" - density = 1 - anchored = 1 + density = TRUE + anchored = TRUE circuit = /obj/item/weapon/circuitboard/sleeper var/mob/living/carbon/human/occupant = null var/list/available_chemicals = list() diff --git a/code/game/machinery/adv_med.dm b/code/game/machinery/adv_med.dm index de0d8dbcd9..d54f3e6521 100644 --- a/code/game/machinery/adv_med.dm +++ b/code/game/machinery/adv_med.dm @@ -6,8 +6,8 @@ name = "Body Scanner" icon = 'icons/obj/Cryogenic2.dmi' icon_state = "body_scanner_0" - density = 1 - anchored = 1 + density = TRUE + anchored = TRUE circuit = /obj/item/weapon/circuitboard/body_scanner use_power = USE_POWER_IDLE idle_power_usage = 60 @@ -546,8 +546,8 @@ icon = 'icons/obj/Cryogenic2.dmi' icon_state = "body_scannerconsole" dir = 8 - density = 0 - anchored = 1 + density = FALSE + anchored = TRUE circuit = /obj/item/weapon/circuitboard/scanner_console var/printing = null diff --git a/code/game/machinery/adv_med_vr.dm b/code/game/machinery/adv_med_vr.dm index c7bcf0d065..e8ff59adc0 100644 --- a/code/game/machinery/adv_med_vr.dm +++ b/code/game/machinery/adv_med_vr.dm @@ -5,7 +5,7 @@ /obj/machinery/body_scanconsole icon = 'icons/obj/Cryogenic2_vr.dmi' icon_state = "scanner_terminal_off" - density = 1 + density = TRUE /obj/machinery/bodyscanner/proc/get_occupant_data_vr(list/incoming, mob/living/carbon/human/H) var/humanprey = 0 diff --git a/code/game/machinery/ai_slipper.dm b/code/game/machinery/ai_slipper.dm index aead0c79f1..86f55631a4 100644 --- a/code/game/machinery/ai_slipper.dm +++ b/code/game/machinery/ai_slipper.dm @@ -2,7 +2,7 @@ name = "\improper AI Liquid Dispenser" icon = 'icons/obj/device.dmi' icon_state = "liquid_dispenser" - anchored = 1.0 + anchored = TRUE use_power = USE_POWER_IDLE idle_power_usage = 10 var/uses = 20 diff --git a/code/game/machinery/air_alarm.dm b/code/game/machinery/air_alarm.dm index 32cc9d0a3f..228cf5472f 100644 --- a/code/game/machinery/air_alarm.dm +++ b/code/game/machinery/air_alarm.dm @@ -31,7 +31,7 @@ icon_state = "alarm_0" layer = ABOVE_WINDOW_LAYER vis_flags = VIS_HIDE // They have an emissive that looks bad in openspace due to their wall-mounted nature - anchored = 1 + anchored = TRUE use_power = USE_POWER_IDLE idle_power_usage = 80 active_power_usage = 1000 //For heating/cooling rooms. 1000 joules equates to about 1 degree every 2 seconds for a single tile of air. @@ -50,7 +50,7 @@ var/rcon_setting = 2 var/rcon_time = 0 var/locked = 1 - panel_open = 0 // If it's been screwdrivered open. + panel_open = FALSE // If it's been screwdrivered open. var/aidisabled = 0 var/shorted = 0 circuit = /obj/item/weapon/circuitboard/airalarm diff --git a/code/game/machinery/airconditioner_vr.dm b/code/game/machinery/airconditioner_vr.dm index ea54edfa2e..f9a1437041 100644 --- a/code/game/machinery/airconditioner_vr.dm +++ b/code/game/machinery/airconditioner_vr.dm @@ -7,8 +7,8 @@ desc = "A massive machine that can either add or remove thermal energy from the surrounding environment. Must be secured onto a powered wire node to function." icon = 'icons/obj/machines/thermoregulator_vr.dmi' icon_state = "lasergen" - density = 1 - anchored = 0 + density = TRUE + anchored = FALSE use_power = USE_POWER_OFF //is powered directly from cables active_power_usage = 150 KILOWATTS //BIG POWER diff --git a/code/game/machinery/atmo_control.dm b/code/game/machinery/atmo_control.dm index 29d9ed5562..27fc21f4f1 100644 --- a/code/game/machinery/atmo_control.dm +++ b/code/game/machinery/atmo_control.dm @@ -4,7 +4,7 @@ name = "Gas Sensor" desc = "Senses atmospheric conditions." - anchored = 1 + anchored = TRUE var/state = 0 var/id_tag diff --git a/code/game/machinery/atmoalter/canister.dm b/code/game/machinery/atmoalter/canister.dm index a2d93adccf..783ee16225 100644 --- a/code/game/machinery/atmoalter/canister.dm +++ b/code/game/machinery/atmoalter/canister.dm @@ -2,7 +2,7 @@ name = "canister" icon = 'icons/obj/atmos.dmi' icon_state = "yellow" - density = 1 + density = TRUE var/health = 100.0 w_class = ITEMSIZE_HUGE diff --git a/code/game/machinery/atmoalter/clamp.dm b/code/game/machinery/atmoalter/clamp.dm index 318145c229..a77999a661 100644 --- a/code/game/machinery/atmoalter/clamp.dm +++ b/code/game/machinery/atmoalter/clamp.dm @@ -7,7 +7,7 @@ description_info = "Click-dragging this to yourself while adjacent will attempt to remove it from the pipe." icon = 'icons/atmos/clamp.dmi' icon_state = "pclamp0" - anchored = 1.0 + anchored = TRUE var/obj/machinery/atmospherics/pipe/simple/target = null var/open = 1 diff --git a/code/game/machinery/atmoalter/meter.dm b/code/game/machinery/atmoalter/meter.dm index e5e4b65ab4..25f5e12567 100644 --- a/code/game/machinery/atmoalter/meter.dm +++ b/code/game/machinery/atmoalter/meter.dm @@ -5,7 +5,7 @@ icon_state = "meterX" var/obj/machinery/atmospherics/pipe/target = null var/list/pipes_on_turf = list() - anchored = 1.0 + anchored = TRUE power_channel = ENVIRON var/frequency = 0 var/id diff --git a/code/game/machinery/atmoalter/portable_atmospherics.dm b/code/game/machinery/atmoalter/portable_atmospherics.dm index dc530ecc2f..e51b4825cc 100644 --- a/code/game/machinery/atmoalter/portable_atmospherics.dm +++ b/code/game/machinery/atmoalter/portable_atmospherics.dm @@ -71,7 +71,7 @@ connected_port.connected_device = src connected_port.on = 1 //Activate port updates - anchored = 1 //Prevent movement + anchored = TRUE //Prevent movement //Actually enforce the air sharing var/datum/pipe_network/network = connected_port.return_network(src) @@ -89,7 +89,7 @@ if(network) network.gases -= air_contents - anchored = 0 + anchored = FALSE connected_port.connected_device = null connected_port = null diff --git a/code/game/machinery/atmoalter/pump.dm b/code/game/machinery/atmoalter/pump.dm index f97a66bd78..1a502c675f 100644 --- a/code/game/machinery/atmoalter/pump.dm +++ b/code/game/machinery/atmoalter/pump.dm @@ -3,7 +3,7 @@ icon = 'icons/obj/atmos.dmi' icon_state = "psiphon:0" - density = 1 + density = TRUE w_class = ITEMSIZE_NORMAL var/on = 0 diff --git a/code/game/machinery/atmoalter/pump_vr.dm b/code/game/machinery/atmoalter/pump_vr.dm index e056086baf..2c3b5c14d9 100644 --- a/code/game/machinery/atmoalter/pump_vr.dm +++ b/code/game/machinery/atmoalter/pump_vr.dm @@ -2,7 +2,7 @@ name = "Huge Air Pump" icon = 'icons/obj/atmos.dmi' icon_state = "siphon:0" - anchored = 1 + anchored = TRUE volume = 500000 use_power = USE_POWER_IDLE diff --git a/code/game/machinery/atmoalter/scrubber.dm b/code/game/machinery/atmoalter/scrubber.dm index f154e64d89..7ab58e2c88 100644 --- a/code/game/machinery/atmoalter/scrubber.dm +++ b/code/game/machinery/atmoalter/scrubber.dm @@ -4,7 +4,7 @@ icon = 'icons/obj/atmos.dmi' icon_state = "pscrubber:0" - density = 1 + density = TRUE w_class = ITEMSIZE_NORMAL var/on = 0 @@ -152,7 +152,7 @@ desc = "A larger variation of the portable scrubber, for industrial scrubbing of air. Must be turned on from a remote terminal." icon = 'icons/obj/atmos_vr.dmi' //VOREStation Edit - New Sprite icon_state = "scrubber:0" - anchored = 1 + anchored = TRUE volume = 500000 volume_rate = 7000 diff --git a/code/game/machinery/atmoalter/zvent.dm b/code/game/machinery/atmoalter/zvent.dm index 163e86a74d..d4f2ccfc02 100644 --- a/code/game/machinery/atmoalter/zvent.dm +++ b/code/game/machinery/atmoalter/zvent.dm @@ -3,8 +3,8 @@ icon = 'icons/obj/pipes.dmi' icon_state = "vent-db" - density = 0 - anchored=1 + density = FALSE + anchored=TRUE var/on = 0 var/volume_rate = 800 diff --git a/code/game/machinery/autolathe.dm b/code/game/machinery/autolathe.dm index 8fa5141839..b3d315cbad 100644 --- a/code/game/machinery/autolathe.dm +++ b/code/game/machinery/autolathe.dm @@ -2,8 +2,8 @@ name = "autolathe" desc = "It produces items using metal and glass." icon_state = "autolathe" - density = 1 - anchored = 1 + density = TRUE + anchored = TRUE use_power = USE_POWER_IDLE idle_power_usage = 10 active_power_usage = 2000 diff --git a/code/game/machinery/biogenerator.dm b/code/game/machinery/biogenerator.dm index 2790a5ec15..e5cf8da8e1 100644 --- a/code/game/machinery/biogenerator.dm +++ b/code/game/machinery/biogenerator.dm @@ -17,8 +17,8 @@ desc = "Converts plants into biomass, which can be used for fertilizer and sort-of-synthetic products." icon = 'icons/obj/biogenerator_vr.dmi' //VOREStation Edit icon_state = "biogen-stand" - density = 1 - anchored = 1 + density = TRUE + anchored = TRUE circuit = /obj/item/weapon/circuitboard/biogenerator use_power = USE_POWER_IDLE idle_power_usage = 40 diff --git a/code/game/machinery/bioprinter.dm b/code/game/machinery/bioprinter.dm index fe2c027eb1..41ea09e214 100644 --- a/code/game/machinery/bioprinter.dm +++ b/code/game/machinery/bioprinter.dm @@ -7,8 +7,8 @@ icon = 'icons/obj/surgery_vr.dmi' //VOREStation Edit icon_state = "bioprinter" - anchored = 1 - density = 1 + anchored = TRUE + density = TRUE use_power = USE_POWER_IDLE idle_power_usage = 40 active_power_usage = 300 diff --git a/code/game/machinery/bomb_tester_vr.dm b/code/game/machinery/bomb_tester_vr.dm index 215e1909fd..2273defdea 100644 --- a/code/game/machinery/bomb_tester_vr.dm +++ b/code/game/machinery/bomb_tester_vr.dm @@ -7,8 +7,8 @@ desc = "A device that can calculate the potential explosive yield of provided gases." icon = 'icons/obj/machines/bomb_tester_vr.dmi' icon_state = "generic" - anchored = 1 - density = 1 + anchored = TRUE + density = TRUE idle_power_usage = 50 active_power_usage = 1.5 KILOWATTS diff --git a/code/game/machinery/buttons.dm b/code/game/machinery/buttons.dm index 19716f5d74..e0fa69147b 100644 --- a/code/game/machinery/buttons.dm +++ b/code/game/machinery/buttons.dm @@ -6,7 +6,7 @@ desc = "A remote control switch for something." var/id = null var/active = 0 - anchored = 1.0 + anchored = TRUE use_power = USE_POWER_IDLE idle_power_usage = 2 active_power_usage = 4 diff --git a/code/game/machinery/camera/camera.dm b/code/game/machinery/camera/camera.dm index b3f8f21840..85f23cb1db 100644 --- a/code/game/machinery/camera/camera.dm +++ b/code/game/machinery/camera/camera.dm @@ -13,7 +13,7 @@ var/c_tag = null var/c_tag_order = 999 var/status = 1 - anchored = 1.0 + anchored = TRUE var/invuln = 0 var/bugged = 0 var/obj/item/weapon/camera_assembly/assembly = null diff --git a/code/game/machinery/camera/camera_assembly.dm b/code/game/machinery/camera/camera_assembly.dm index d8facf1726..0660bff759 100644 --- a/code/game/machinery/camera/camera_assembly.dm +++ b/code/game/machinery/camera/camera_assembly.dm @@ -4,7 +4,7 @@ icon = 'icons/obj/monitors_vr.dmi' //VOREStation Edit - New Icons icon_state = "cameracase" w_class = ITEMSIZE_SMALL - anchored = 0 + anchored = FALSE matter = list(MAT_STEEL = 700,MAT_GLASS = 300) @@ -32,7 +32,7 @@ if(W.is_wrench() && isturf(src.loc)) playsound(src, W.usesound, 50, 1) to_chat(user, "You wrench the assembly into place.") - anchored = 1 + anchored = TRUE state = 1 update_icon() auto_turn() @@ -43,14 +43,14 @@ if(istype(W, /obj/item/weapon/weldingtool)) if(weld(W, user)) to_chat(user, "You weld the assembly securely into place.") - anchored = 1 + anchored = TRUE state = 2 return else if(W.is_wrench()) playsound(src, W.usesound, 50, 1) to_chat(user, "You unattach the assembly from its place.") - anchored = 0 + anchored = FALSE update_icon() state = 0 return @@ -71,7 +71,7 @@ if(weld(W, user)) to_chat(user, "You unweld the assembly from its place.") state = 1 - anchored = 1 + anchored = TRUE return diff --git a/code/game/machinery/cell_charger.dm b/code/game/machinery/cell_charger.dm index 581284f9ac..1980079098 100644 --- a/code/game/machinery/cell_charger.dm +++ b/code/game/machinery/cell_charger.dm @@ -7,7 +7,7 @@ desc = "A much more powerful version of the standard recharger that is specially designed for charging power cells." icon = 'icons/obj/power.dmi' icon_state = "recharger" - anchored = 1 + anchored = TRUE use_power = USE_POWER_IDLE power_channel = EQUIP idle_power_usage = 5 diff --git a/code/game/machinery/cloning.dm b/code/game/machinery/cloning.dm index 53da61382e..49c917f312 100644 --- a/code/game/machinery/cloning.dm +++ b/code/game/machinery/cloning.dm @@ -29,8 +29,8 @@ /obj/machinery/clonepod name = "cloning pod" desc = "An electronically-lockable pod for growing organic tissue." - density = 1 - anchored = 1 + density = TRUE + anchored = TRUE circuit = /obj/item/weapon/circuitboard/clonepod icon = 'icons/obj/cloning.dmi' icon_state = "pod_0" @@ -255,11 +255,11 @@ to_chat(user, "Can not do that while [src] is in use.") else if(anchored) - anchored = 0 + anchored = FALSE connected.pods -= src connected = null else - anchored = 1 + anchored = TRUE playsound(src, W.usesound, 100, 1) if(anchored) user.visible_message("[user] secures [src] to the floor.", "You secure [src] to the floor.") diff --git a/code/game/machinery/computer/Operating.dm b/code/game/machinery/computer/Operating.dm index c965a54b15..4efec263f8 100644 --- a/code/game/machinery/computer/Operating.dm +++ b/code/game/machinery/computer/Operating.dm @@ -3,8 +3,8 @@ /obj/machinery/computer/operating name = "patient monitoring console" desc = "Used to monitor the vitals of a patient." - density = 1 - anchored = 1.0 + density = TRUE + anchored = TRUE icon_keyboard = "med_key" icon_screen = "crew" circuit = /obj/item/weapon/circuitboard/operating diff --git a/code/game/machinery/computer/ai_core.dm b/code/game/machinery/computer/ai_core.dm index 8b5cce2aee..fd6d65d9fd 100644 --- a/code/game/machinery/computer/ai_core.dm +++ b/code/game/machinery/computer/ai_core.dm @@ -1,6 +1,6 @@ /obj/structure/AIcore - density = 1 - anchored = 0 + density = TRUE + anchored = FALSE name = "\improper AI core" icon = 'icons/mob/AI.dmi' icon_state = "0" @@ -18,7 +18,7 @@ playsound(src, P.usesound, 50, 1) if(do_after(user, 20 * P.toolspeed)) to_chat(user, "You wrench the frame into place.") - anchored = 1 + anchored = TRUE state = 1 if(istype(P, /obj/item/weapon/weldingtool)) var/obj/item/weapon/weldingtool/WT = P @@ -36,7 +36,7 @@ playsound(src, P.usesound, 50, 1) if(do_after(user, 20 * P.toolspeed)) to_chat(user, "You unfasten the frame.") - anchored = 0 + anchored = FALSE state = 0 if(istype(P, /obj/item/weapon/circuitboard/aicore) && !circuit) playsound(src, 'sound/items/Deconstruct.ogg', 50, 1) @@ -187,7 +187,7 @@ GLOBAL_LIST_BOILERPLATE(all_deactivated_AI_cores, /obj/structure/AIcore/deactiva name = "inactive AI" icon = 'icons/mob/AI.dmi' icon_state = "ai-empty" - anchored = 1 + anchored = TRUE state = 20//So it doesn't interact based on the above. Not really necessary. /obj/structure/AIcore/deactivated/Destroy() @@ -240,7 +240,7 @@ GLOBAL_LIST_BOILERPLATE(all_deactivated_AI_cores, /obj/structure/AIcore/deactiva user.visible_message("\The [user] decides not to unbolt \the [src].") return user.visible_message("\The [user] finishes unfastening \the [src]!") - anchored = 0 + anchored = FALSE return else user.visible_message("\The [user] starts to bolt \the [src] to the plating...") @@ -249,7 +249,7 @@ GLOBAL_LIST_BOILERPLATE(all_deactivated_AI_cores, /obj/structure/AIcore/deactiva user.visible_message("\The [user] decides not to bolt \the [src].") return user.visible_message("\The [user] finishes fastening down \the [src]!") - anchored = 1 + anchored = TRUE return else return ..() diff --git a/code/game/machinery/computer/atmos_control.dm b/code/game/machinery/computer/atmos_control.dm index 73dc0ec4b4..32fbaf3082 100644 --- a/code/game/machinery/computer/atmos_control.dm +++ b/code/game/machinery/computer/atmos_control.dm @@ -8,8 +8,8 @@ icon_keyboard = "generic_key" icon_screen = "comm_logs" light_color = "#00b000" - density = 1 - anchored = 1.0 + density = TRUE + anchored = TRUE circuit = /obj/item/weapon/circuitboard/atmoscontrol req_access = list(access_ce) var/list/monitored_alarm_ids = null @@ -24,7 +24,7 @@ icon_screen = "pcu_atmo" icon_state = "pcu" icon_keyboard = "pcu_key" - density = 0 + density = FALSE /obj/machinery/computer/atmoscontrol/attack_ai(var/mob/user as mob) tgui_interact(user) diff --git a/code/game/machinery/computer/buildandrepair.dm b/code/game/machinery/computer/buildandrepair.dm index 9cf8fdd015..5f4ff28e05 100644 --- a/code/game/machinery/computer/buildandrepair.dm +++ b/code/game/machinery/computer/buildandrepair.dm @@ -1,8 +1,8 @@ //This file was auto-corrected by findeclaration.exe on 25.5.2012 20:42:31 /obj/structure/computerframe - density = 1 - anchored = 0 + density = TRUE + anchored = FALSE name = "computer frame" icon = 'icons/obj/stock_parts.dmi' icon_state = "0" diff --git a/code/game/machinery/computer/camera.dm b/code/game/machinery/computer/camera.dm index 5b39bc618f..24a84b4f14 100644 --- a/code/game/machinery/computer/camera.dm +++ b/code/game/machinery/computer/camera.dm @@ -65,7 +65,7 @@ icon_screen = null light_range_on = 0 network = list(NETWORK_THUNDER) - density = 0 + density = FALSE circuit = null GLOBAL_LIST_EMPTY(entertainment_screens) diff --git a/code/game/machinery/computer/computer.dm b/code/game/machinery/computer/computer.dm index 956c3fe2d7..ac06e34a86 100644 --- a/code/game/machinery/computer/computer.dm +++ b/code/game/machinery/computer/computer.dm @@ -2,8 +2,8 @@ name = "computer" icon = 'icons/obj/computer.dmi' icon_state = "computer" - density = 1 - anchored = 1.0 + density = TRUE + anchored = TRUE use_power = USE_POWER_IDLE idle_power_usage = 300 active_power_usage = 300 diff --git a/code/game/machinery/computer/guestpass.dm b/code/game/machinery/computer/guestpass.dm index 811b12f27c..850eb1b296 100644 --- a/code/game/machinery/computer/guestpass.dm +++ b/code/game/machinery/computer/guestpass.dm @@ -85,7 +85,7 @@ vis_flags = VIS_HIDE // They have an emissive that looks bad in openspace due to their wall-mounted nature icon_keyboard = null icon_screen = "pass" - density = 0 + density = FALSE circuit = /obj/item/weapon/circuitboard/guestpass var/obj/item/weapon/card/id/giver diff --git a/code/game/machinery/computer/medical.dm b/code/game/machinery/computer/medical.dm index 419e4d1ffe..a7d2da6ac5 100644 --- a/code/game/machinery/computer/medical.dm +++ b/code/game/machinery/computer/medical.dm @@ -501,7 +501,7 @@ icon_keyboard = "pcu_key" light_color = "#00b000" circuit = /obj/item/weapon/circuitboard/med_data/pcu - density = 0 + density = FALSE #undef FIELD #undef MED_FIELD diff --git a/code/game/machinery/computer/skills.dm b/code/game/machinery/computer/skills.dm index e8c69e000b..ab7d5aca4a 100644 --- a/code/game/machinery/computer/skills.dm +++ b/code/game/machinery/computer/skills.dm @@ -15,7 +15,7 @@ light_color = "#00b000" req_one_access = list(access_heads) circuit = /obj/item/weapon/circuitboard/skills/pcu - density = 0 + density = FALSE var/obj/item/weapon/card/id/scan = null var/authenticated = null var/rank = null diff --git a/code/game/machinery/constructable_frame.dm b/code/game/machinery/constructable_frame.dm index 3717da58c5..a2f310aaf1 100644 --- a/code/game/machinery/constructable_frame.dm +++ b/code/game/machinery/constructable_frame.dm @@ -5,8 +5,8 @@ name = "machine frame" icon = 'icons/obj/stock_parts.dmi' icon_state = "box_0" - density = 1 - anchored = 1 + density = TRUE + anchored = TRUE use_power = USE_POWER_OFF var/obj/item/weapon/circuitboard/circuit = null var/list/components = null diff --git a/code/game/machinery/cryo.dm b/code/game/machinery/cryo.dm index d822bcb739..35a060863e 100644 --- a/code/game/machinery/cryo.dm +++ b/code/game/machinery/cryo.dm @@ -5,8 +5,8 @@ desc = "Used to cool people down for medical reasons. Totally." icon = 'icons/obj/cryogenics.dmi' // map only icon_state = "pod_preview" - density = 1 - anchored = 1.0 + density = TRUE + anchored = TRUE layer = UNDER_JUNK_LAYER interact_offline = 1 diff --git a/code/game/machinery/cryopod.dm b/code/game/machinery/cryopod.dm index 8d5dd425e3..b7ba4a4339 100644 --- a/code/game/machinery/cryopod.dm +++ b/code/game/machinery/cryopod.dm @@ -14,7 +14,7 @@ icon = 'icons/obj/Cryogenic2_vr.dmi' //VOREStation Edit - New Icon icon_state = "cellconsole" circuit = /obj/item/weapon/circuitboard/cryopodcontrol - density = 0 + density = FALSE interact_offline = 1 var/mode = null @@ -183,7 +183,7 @@ desc = "A bewildering tangle of machinery and pipes." icon = 'icons/obj/Cryogenic2_vr.dmi' //VOREStation Edit - New Icon icon_state = "cryo_rear" - anchored = 1 + anchored = TRUE dir = WEST //Cryopods themselves. @@ -192,8 +192,8 @@ desc = "A man-sized pod for entering suspended animation." icon = 'icons/obj/Cryogenic2_vr.dmi' //VOREStation Edit - New Icon icon_state = "cryopod_0" //VOREStation Edit - New Icon - density = 1 - anchored = 1 + density = TRUE + anchored = TRUE dir = WEST var/base_icon_state = "cryopod_0" //VOREStation Edit - New Icon diff --git a/code/game/machinery/deployable.dm b/code/game/machinery/deployable.dm index 9b14dc68bb..a72d814c79 100644 --- a/code/game/machinery/deployable.dm +++ b/code/game/machinery/deployable.dm @@ -13,8 +13,8 @@ Deployable items name = "deployable barrier" desc = "A deployable barrier. Swipe your ID card to lock/unlock it." icon = 'icons/obj/objects.dmi' - anchored = 0.0 - density = 1.0 + anchored = FALSE + density = TRUE icon_state = "barrier0" var/health = 100.0 var/maxhealth = 100.0 diff --git a/code/game/machinery/deployable_vr.dm b/code/game/machinery/deployable_vr.dm index 25fdd4ed60..bbb835b763 100644 --- a/code/game/machinery/deployable_vr.dm +++ b/code/game/machinery/deployable_vr.dm @@ -5,7 +5,7 @@ icon_state = "cutout_basic" maxhealth = 15 //Weaker than normal barricade - anchored = 0 + anchored = FALSE var/fake_name = "unknown" var/fake_desc = "You have to be closer to examine this creature." @@ -36,7 +36,7 @@ return toppled = TRUE icon_state = "cutout_pushed_over" - density = 0 + density = FALSE name = initial(name) desc = initial(desc) visible_message("[src] topples over!") @@ -46,7 +46,7 @@ return toppled = FALSE icon_state = initial(icon_state) - density = 1 + density = TRUE name = fake_name desc = fake_desc visible_message("[src] is uprighted to their proper position.") diff --git a/code/game/machinery/door_control.dm b/code/game/machinery/door_control.dm index 674ff6e24d..6e5618d39e 100644 --- a/code/game/machinery/door_control.dm +++ b/code/game/machinery/door_control.dm @@ -13,7 +13,7 @@ 2=Network Access */ - anchored = 1.0 + anchored = TRUE use_power = USE_POWER_IDLE idle_power_usage = 2 active_power_usage = 4 diff --git a/code/game/machinery/doorbell_vr.dm b/code/game/machinery/doorbell_vr.dm index 1b6174a2ca..d90a46000f 100644 --- a/code/game/machinery/doorbell_vr.dm +++ b/code/game/machinery/doorbell_vr.dm @@ -7,7 +7,7 @@ use_power = USE_POWER_IDLE idle_power_usage = 10 active_power_usage = 200 - anchored = 1 + anchored = TRUE var/id_tag = null var/chime_sound = 'sound/machines/doorbell.ogg' diff --git a/code/game/machinery/doors/airlock_control.dm b/code/game/machinery/doors/airlock_control.dm index 83878767b7..3c91bd7c02 100644 --- a/code/game/machinery/doors/airlock_control.dm +++ b/code/game/machinery/doors/airlock_control.dm @@ -152,7 +152,7 @@ name = "airlock sensor" desc = "Sends atmospheric readings to a nearby controller." - anchored = 1 + anchored = TRUE power_channel = ENVIRON var/id_tag @@ -237,7 +237,7 @@ layer = ABOVE_WINDOW_LAYER name = "access button" - anchored = 1 + anchored = TRUE power_channel = ENVIRON var/master_tag diff --git a/code/game/machinery/doors/blast_door.dm b/code/game/machinery/doors/blast_door.dm index 4d9718686e..36befb944e 100644 --- a/code/game/machinery/doors/blast_door.dm +++ b/code/game/machinery/doors/blast_door.dm @@ -316,7 +316,7 @@ /obj/machinery/door/blast/regular/open icon_state = "pdoor0" - density = 0 + density = FALSE opacity = 0 // SUBTYPE: Shutters @@ -346,7 +346,7 @@ /obj/machinery/door/blast/gate/open icon_state = "tshutter0" - density = 0 + density = FALSE /obj/machinery/door/blast/gate/thin name = "thin gate" @@ -360,7 +360,7 @@ /obj/machinery/door/blast/gate/thin/open icon_state = "shutter2_1" - density = 0 + density = FALSE /obj/machinery/door/blast/gate/bars name = "prison bars" @@ -374,7 +374,7 @@ /obj/machinery/door/blast/gate/bars/open icon_state = "bars_1" - density = 0 + density = FALSE // SUBTYPE: Multi-tile // Pod doors ported from Paradise diff --git a/code/game/machinery/doors/brigdoors.dm b/code/game/machinery/doors/brigdoors.dm index a98c9abb04..c62c7ea94d 100644 --- a/code/game/machinery/doors/brigdoors.dm +++ b/code/game/machinery/doors/brigdoors.dm @@ -23,8 +23,8 @@ layer = ABOVE_WINDOW_LAYER desc = "A remote control for a door." req_access = list(access_brig) - anchored = 1.0 // can't pick it up - density = 0 // can walk through it. + anchored = TRUE // can't pick it up + density = FALSE // can walk through it. var/id = null // id of door it controls. var/activation_time = 0 var/timer_duration = 0 diff --git a/code/game/machinery/doors/door.dm b/code/game/machinery/doors/door.dm index 374d7cf617..d253a4dd68 100644 --- a/code/game/machinery/doors/door.dm +++ b/code/game/machinery/doors/door.dm @@ -6,9 +6,9 @@ desc = "It opens and closes." icon = 'icons/obj/doors/Doorint.dmi' icon_state = "door1" - anchored = 1 + anchored = TRUE opacity = 1 - density = 1 + density = TRUE can_atmos_pass = ATMOS_PASS_PROC layer = DOOR_OPEN_LAYER blocks_emissive = EMISSIVE_BLOCK_UNIQUE @@ -76,7 +76,7 @@ return /obj/machinery/door/Destroy() - density = 0 + density = FALSE update_nearby_tiles() . = ..() diff --git a/code/game/machinery/doors/firedoor.dm b/code/game/machinery/doors/firedoor.dm index 4304e68cef..40d092f59e 100644 --- a/code/game/machinery/doors/firedoor.dm +++ b/code/game/machinery/doors/firedoor.dm @@ -15,7 +15,7 @@ icon_state = "door_open" req_one_access = list(access_eva) //access_atmospherics, access_engine_equip) opacity = 0 - density = 0 + density = FALSE layer = DOOR_OPEN_LAYER - 0.01 open_layer = DOOR_OPEN_LAYER - 0.01 // Just below doors when open closed_layer = DOOR_CLOSED_LAYER + 0.01 // Just above doors when closed diff --git a/code/game/machinery/doors/firedoor_assembly.dm b/code/game/machinery/doors/firedoor_assembly.dm index ab1de73c60..829cce4e7c 100644 --- a/code/game/machinery/doors/firedoor_assembly.dm +++ b/code/game/machinery/doors/firedoor_assembly.dm @@ -3,9 +3,9 @@ desc = "It can save lives." icon = 'icons/obj/doors/DoorHazard.dmi' icon_state = "door_construction" - anchored = 0 + anchored = FALSE opacity = 0 - density = 1 + density = TRUE var/wired = 0 var/glass = FALSE diff --git a/code/game/machinery/doors/unpowered.dm b/code/game/machinery/doors/unpowered.dm index ef84d47f3d..515ed18017 100644 --- a/code/game/machinery/doors/unpowered.dm +++ b/code/game/machinery/doors/unpowered.dm @@ -22,4 +22,4 @@ name = "door" icon_state = "door1" opacity = 1 - density = 1 + density = TRUE diff --git a/code/game/machinery/doors/windowdoor.dm b/code/game/machinery/doors/windowdoor.dm index b95a67ea22..9d54018e7d 100644 --- a/code/game/machinery/doors/windowdoor.dm +++ b/code/game/machinery/doors/windowdoor.dm @@ -57,7 +57,7 @@ qdel(src) /obj/machinery/door/window/Destroy() - density = 0 + density = FALSE update_nearby_tiles() return ..() @@ -117,7 +117,7 @@ sleep(10) explosion_resistance = 0 - density = 0 + density = FALSE update_icon() update_nearby_tiles() diff --git a/code/game/machinery/doppler_array.dm b/code/game/machinery/doppler_array.dm index cab4f5c37f..7b8039cb6f 100644 --- a/code/game/machinery/doppler_array.dm +++ b/code/game/machinery/doppler_array.dm @@ -1,9 +1,9 @@ var/list/doppler_arrays = list() /obj/machinery/doppler_array - anchored = 1 + anchored = TRUE name = "tachyon-doppler array" - density = 1 + density = TRUE desc = "A highly precise directional sensor array which measures the release of quants from decaying tachyons. The doppler shifting of the mirror-image formed by these quants can reveal the size, location and temporal affects of energetic disturbances within a large radius ahead of the array." dir = NORTH diff --git a/code/game/machinery/embedded_controller/embedded_controller_base.dm b/code/game/machinery/embedded_controller/embedded_controller_base.dm index 196edfd224..4a05005ac5 100644 --- a/code/game/machinery/embedded_controller/embedded_controller_base.dm +++ b/code/game/machinery/embedded_controller/embedded_controller_base.dm @@ -1,6 +1,6 @@ /obj/machinery/embedded_controller name = "Embedded Controller" - anchored = 1 + anchored = TRUE use_power = USE_POWER_IDLE idle_power_usage = 10 var/datum/embedded_program/program //the currently executing program @@ -67,8 +67,8 @@ icon = 'icons/obj/airlock_machines.dmi' icon_state = "airlock_control_standby" power_channel = ENVIRON - density = 0 - unacidable = 1 + density = FALSE + unacidable = TRUE var/id_tag //var/radio_power_use = 50 //power used to xmit signals diff --git a/code/game/machinery/event/stage_vr.dm b/code/game/machinery/event/stage_vr.dm index 1190498a21..1ed1e6c419 100644 --- a/code/game/machinery/event/stage_vr.dm +++ b/code/game/machinery/event/stage_vr.dm @@ -3,8 +3,8 @@ desc = "It's a stage!" icon = 'icons/misc/event/stage.dmi' icon_state = "stage1" - anchored = 1.0 - density = 0 + anchored = TRUE + density = FALSE pixel_y = -224 pixel_x = -224 plane = -44 \ No newline at end of file diff --git a/code/game/machinery/exonet_node.dm b/code/game/machinery/exonet_node.dm index 8fe0e3b5f0..1eda308142 100644 --- a/code/game/machinery/exonet_node.dm +++ b/code/game/machinery/exonet_node.dm @@ -4,7 +4,7 @@ icon = 'icons/obj/stationobjs_vr.dmi' //VOREStation Edit icon_state = "exonet" //VOREStation Edit idle_power_usage = 2500 - density = 1 + density = TRUE var/on = 1 var/toggle = 1 diff --git a/code/game/machinery/fire_alarm.dm b/code/game/machinery/fire_alarm.dm index 4f976ab64a..879a8ae7a8 100644 --- a/code/game/machinery/fire_alarm.dm +++ b/code/game/machinery/fire_alarm.dm @@ -14,13 +14,13 @@ FIRE ALARM var/time = 10.0 var/timing = 0.0 var/lockdownbyai = 0 - anchored = 1.0 + anchored = TRUE use_power = USE_POWER_IDLE idle_power_usage = 2 active_power_usage = 6 power_channel = ENVIRON var/last_process = 0 - panel_open = 0 + panel_open = FALSE var/seclevel circuit = /obj/item/weapon/circuitboard/firealarm var/alarms_hidden = FALSE //If the alarms from this machine are visible on consoles @@ -199,7 +199,7 @@ Just a object used in constructing fire alarms var/time = 10.0 var/timing = 0.0 var/lockdownbyai = 0 - anchored = 1.0 + anchored = TRUE use_power = USE_POWER_IDLE idle_power_usage = 2 active_power_usage = 6 diff --git a/code/game/machinery/flasher.dm b/code/game/machinery/flasher.dm index d8b4a23994..848108285b 100644 --- a/code/game/machinery/flasher.dm +++ b/code/game/machinery/flasher.dm @@ -11,7 +11,7 @@ var/last_flash = 0 //Don't want it getting spammed like regular flashes var/strength = 10 //How weakened targets are when flashed. var/base_state = "mflash" - anchored = 1 + anchored = TRUE use_power = USE_POWER_IDLE idle_power_usage = 2 @@ -20,9 +20,9 @@ desc = "A portable flashing device. Wrench to activate and deactivate. Cannot detect slow movements." icon_state = "pflash1" strength = 8 - anchored = 0 + anchored = FALSE base_state = "pflash" - density = 1 + density = TRUE /obj/machinery/flasher/power_change() ..() diff --git a/code/game/machinery/floodlight.dm b/code/game/machinery/floodlight.dm index 694a715bcd..a5cc7d6750 100644 --- a/code/game/machinery/floodlight.dm +++ b/code/game/machinery/floodlight.dm @@ -3,7 +3,7 @@ desc = "Let there be light!" icon = 'icons/obj/machines/floodlight.dmi' icon_state = "flood00" - density = 1 + density = TRUE light_system = MOVABLE_LIGHT_DIRECTIONAL light_cone_y_offset = 8 var/on = 0 diff --git a/code/game/machinery/floor_light.dm b/code/game/machinery/floor_light.dm index 1bcb90a596..a870245be9 100644 --- a/code/game/machinery/floor_light.dm +++ b/code/game/machinery/floor_light.dm @@ -6,7 +6,7 @@ var/list/floor_light_cache = list() icon_state = "base" desc = "A backlit floor panel." layer = TURF_LAYER+0.001 - anchored = 0 + anchored = FALSE use_power = USE_POWER_ACTIVE idle_power_usage = 2 active_power_usage = 20 @@ -20,7 +20,7 @@ var/list/floor_light_cache = list() var/default_light_colour = LIGHT_COLOR_INCANDESCENT_BULB /obj/machinery/floor_light/prebuilt - anchored = 1 + anchored = TRUE /obj/machinery/floor_light/attackby(var/obj/item/W, var/mob/user) if(W.is_screwdriver()) diff --git a/code/game/machinery/floorlayer.dm b/code/game/machinery/floorlayer.dm index c77dff55ec..dfbf3c38df 100644 --- a/code/game/machinery/floorlayer.dm +++ b/code/game/machinery/floorlayer.dm @@ -2,7 +2,7 @@ name = "automatic floor layer" icon = 'icons/obj/stationobjs.dmi' icon_state = "pipe_d" - density = 1 + density = TRUE var/turf/old_turf var/on = 0 var/obj/item/stack/tile/T diff --git a/code/game/machinery/gear_dispenser.dm b/code/game/machinery/gear_dispenser.dm index 690379fdb6..94d53cb360 100644 --- a/code/game/machinery/gear_dispenser.dm +++ b/code/game/machinery/gear_dispenser.dm @@ -147,8 +147,8 @@ var/list/dispenser_presets = list() desc = "An industrial U-Tak-It Dispenser unit designed to fetch all kinds of equipment." icon = 'icons/obj/suitdispenser.dmi' icon_state = "geardispenser" - anchored = 1 - density = 1 + anchored = TRUE + density = TRUE var/list/dispenses = list(/datum/gear_disp/trash) // put your gear datums here! var/datum/gear_disp/one_setting var/global/list/gear_distributed_to = list() diff --git a/code/game/machinery/hologram.dm b/code/game/machinery/hologram.dm index 614010471f..41851575af 100644 --- a/code/game/machinery/hologram.dm +++ b/code/game/machinery/hologram.dm @@ -189,7 +189,7 @@ For the other part of the code, check silicon say.dm. Particularly robot talk.*/ /obj/machinery/hologram icon = 'icons/obj/stationobjs_vr.dmi' //VOREStation Edit - anchored = 1 + anchored = TRUE use_power = USE_POWER_IDLE idle_power_usage = 5 active_power_usage = 100 diff --git a/code/game/machinery/holoposter.dm b/code/game/machinery/holoposter.dm index 7a71d9fc64..2e1d609ccc 100644 --- a/code/game/machinery/holoposter.dm +++ b/code/game/machinery/holoposter.dm @@ -4,7 +4,7 @@ GLOBAL_LIST_EMPTY(holoposters) desc = "A wall-mounted holographic projector displaying advertisements by all manner of factions. How much do they pay to advertise here?" icon = 'icons/obj/holoposter_vr.dmi' icon_state = "off" - anchored = 1 + anchored = TRUE use_power = 1 idle_power_usage = 80 power_channel = ENVIRON diff --git a/code/game/machinery/holosign.dm b/code/game/machinery/holosign.dm index 7a3cd8c861..b21fb1120c 100644 --- a/code/game/machinery/holosign.dm +++ b/code/game/machinery/holosign.dm @@ -8,7 +8,7 @@ use_power = USE_POWER_IDLE idle_power_usage = 2 active_power_usage = 4 - anchored = 1 + anchored = TRUE var/lit = 0 var/id = null var/on_icon = "sign_on" diff --git a/code/game/machinery/igniter.dm b/code/game/machinery/igniter.dm index 70a2e3ce4c..060bd029fc 100755 --- a/code/game/machinery/igniter.dm +++ b/code/game/machinery/igniter.dm @@ -5,7 +5,7 @@ icon_state = "igniter1" var/id = null var/on = 1.0 - anchored = 1.0 + anchored = TRUE use_power = USE_POWER_IDLE idle_power_usage = 2 active_power_usage = 4 @@ -53,7 +53,7 @@ var/disable = 0 var/last_spark = 0 var/base_state = "migniter" - anchored = 1 + anchored = TRUE use_power = USE_POWER_IDLE idle_power_usage = 2 active_power_usage = 4 diff --git a/code/game/machinery/iv_drip.dm b/code/game/machinery/iv_drip.dm index 5a63fd03be..5a78697b2a 100644 --- a/code/game/machinery/iv_drip.dm +++ b/code/game/machinery/iv_drip.dm @@ -2,8 +2,8 @@ name = "\improper IV drip" desc = "Helpful for giving someone blood! Or taking it away. It giveth, it taketh." icon = 'icons/obj/iv_drip.dmi' - anchored = 0 - density = 0 + anchored = FALSE + density = FALSE /obj/machinery/iv_drip/var/mob/living/carbon/human/attached = null diff --git a/code/game/machinery/jukebox.dm b/code/game/machinery/jukebox.dm index 54047a1088..54a65642f0 100644 --- a/code/game/machinery/jukebox.dm +++ b/code/game/machinery/jukebox.dm @@ -14,8 +14,8 @@ icon = 'icons/obj/jukebox.dmi' icon_state = "jukebox2-nopower" var/state_base = "jukebox2" - anchored = 1 - density = 1 + anchored = TRUE + density = TRUE power_channel = EQUIP use_power = USE_POWER_IDLE idle_power_usage = 10 diff --git a/code/game/machinery/lightswitch.dm b/code/game/machinery/lightswitch.dm index 44a80c4445..e8a3544e43 100644 --- a/code/game/machinery/lightswitch.dm +++ b/code/game/machinery/lightswitch.dm @@ -7,7 +7,7 @@ icon = 'icons/obj/power_vr.dmi' // VOREStation Edit icon_state = "light1" layer = ABOVE_WINDOW_LAYER - anchored = 1.0 + anchored = TRUE use_power = USE_POWER_IDLE idle_power_usage = 10 power_channel = LIGHT diff --git a/code/game/machinery/machinery.dm b/code/game/machinery/machinery.dm index e9d8895979..2da7d5342a 100644 --- a/code/game/machinery/machinery.dm +++ b/code/game/machinery/machinery.dm @@ -105,7 +105,7 @@ Class Procs: var/power_init_complete = FALSE var/list/component_parts = null //list of all the parts used to build it, if made from certain kinds of frames. var/uid - var/panel_open = 0 + var/panel_open = FALSE var/global/gl_uid = 1 var/clicksound // sound played on succesful interface. Just put it in the list of vars at the start. var/clickvol = 40 // volume diff --git a/code/game/machinery/magnet.dm b/code/game/machinery/magnet.dm index d702a300b5..f713cea2d0 100644 --- a/code/game/machinery/magnet.dm +++ b/code/game/machinery/magnet.dm @@ -10,7 +10,7 @@ name = "Electromagnetic Generator" desc = "A device that uses station power to create points of magnetic energy." plane = PLATING_PLANE - anchored = 1 + anchored = TRUE use_power = USE_POWER_IDLE idle_power_usage = 50 @@ -188,8 +188,8 @@ name = "Magnetic Control Console" icon = 'icons/obj/airlock_machines.dmi' // uses an airlock machine icon, THINK GREEN HELP THE ENVIRONMENT - RECYCLING! icon_state = "airlock_control_standby" - density = 1 - anchored = 1.0 + density = TRUE + anchored = TRUE use_power = USE_POWER_IDLE idle_power_usage = 45 var/frequency = 1449 diff --git a/code/game/machinery/mass_driver.dm b/code/game/machinery/mass_driver.dm index 25805c694e..7e6721f109 100644 --- a/code/game/machinery/mass_driver.dm +++ b/code/game/machinery/mass_driver.dm @@ -5,7 +5,7 @@ desc = "Shoots things into space." icon = 'icons/obj/stationobjs.dmi' icon_state = "mass_driver" - anchored = 1.0 + anchored = TRUE use_power = USE_POWER_IDLE idle_power_usage = 2 active_power_usage = 50 diff --git a/code/game/machinery/navbeacon.dm b/code/game/machinery/navbeacon.dm index 6a92186ac5..90a623d0b9 100644 --- a/code/game/machinery/navbeacon.dm +++ b/code/game/machinery/navbeacon.dm @@ -9,7 +9,7 @@ var/global/list/navbeacons = list() // no I don't like putting this in, but it w name = "navigation beacon" desc = "A beacon used for bot navigation." plane = PLATING_PLANE - anchored = 1 + anchored = TRUE var/open = 0 // true if cover is open var/locked = 1 // true if controls are locked var/freq = null // DEPRECATED we don't use radios anymore! diff --git a/code/game/machinery/neonsign.dm b/code/game/machinery/neonsign.dm index 742a810d4a..6e146af007 100644 --- a/code/game/machinery/neonsign.dm +++ b/code/game/machinery/neonsign.dm @@ -9,7 +9,7 @@ use_power = USE_POWER_IDLE idle_power_usage = 2 active_power_usage = 4 - anchored = 1 + anchored = TRUE var/lit = 0 var/id = null var/on_icon = "sign_on" diff --git a/code/game/machinery/newscaster.dm b/code/game/machinery/newscaster.dm index 82cf00ce17..4a40ad8ed2 100644 --- a/code/game/machinery/newscaster.dm +++ b/code/game/machinery/newscaster.dm @@ -161,7 +161,7 @@ GLOBAL_LIST_BOILERPLATE(allCasters, /obj/machinery/newscaster) var/hitstaken = 0 //Death at 3 hits from an item with force>=15 var/datum/feed_channel/viewing_channel = null light_range = 0 - anchored = 1 + anchored = TRUE var/obj/machinery/exonet_node/node = null circuit = /obj/item/weapon/circuitboard/newscaster // TGUI diff --git a/code/game/machinery/nuclear_bomb.dm b/code/game/machinery/nuclear_bomb.dm index cb83cddd92..b9646235c0 100644 --- a/code/game/machinery/nuclear_bomb.dm +++ b/code/game/machinery/nuclear_bomb.dm @@ -5,7 +5,7 @@ var/bomb_set desc = "Uh oh. RUN!!!!" icon = 'icons/obj/stationobjs.dmi' icon_state = "nuclearbomb0" - density = 1 + density = TRUE var/deployable = 0.0 var/extended = 0.0 var/lighthack = 0 @@ -157,7 +157,7 @@ var/bomb_set if(do_after(user,80 * O.toolspeed)) if(!src || !user) return user.visible_message("[user] crowbars [src] off of the anchors. It can now be moved.", "You jam the crowbar under the nuclear device and lift it off its anchors. You can now move it!") - anchored = 0 + anchored = FALSE removal_stage = 5 return ..() @@ -190,7 +190,7 @@ var/bomb_set onclose(user, "nuclearbomb") else if(deployable) if(removal_stage < 5) - anchored = 1 + anchored = TRUE visible_message("With a steely snap, bolts slide out of [src] and anchor it to the flooring!") else visible_message("\The [src] makes a highly unpleasant crunching noise. It looks like the anchoring bolts have been cut.") @@ -336,7 +336,7 @@ var/bomb_set if(href_list["anchor"]) if(removal_stage == 5) - anchored = 0 + anchored = FALSE visible_message("\The [src] makes a highly unpleasant crunching noise. It looks like the anchoring bolts have been cut.") return diff --git a/code/game/machinery/painter_vr.dm b/code/game/machinery/painter_vr.dm index 00e5ebcd5f..e10311915d 100644 --- a/code/game/machinery/painter_vr.dm +++ b/code/game/machinery/painter_vr.dm @@ -10,8 +10,8 @@ desc = "A machine to give your apparel a fresh new color! Recommended to use with white items for best results." icon = 'icons/obj/vending_vr.dmi' icon_state = "colormate" - density = 1 - anchored = 1 + density = TRUE + anchored = TRUE var/list/processing = list() var/activecolor = "#FFFFFF" var/list/allowed_types = list( diff --git a/code/game/machinery/partslathe_vr.dm b/code/game/machinery/partslathe_vr.dm index 733486b5de..6f83f6d158 100644 --- a/code/game/machinery/partslathe_vr.dm +++ b/code/game/machinery/partslathe_vr.dm @@ -21,8 +21,8 @@ icon = 'icons/obj/partslathe_vr.dmi' icon_state = "partslathe-idle" circuit = /obj/item/weapon/circuitboard/partslathe - anchored = 1 - density = 1 + anchored = TRUE + density = TRUE use_power = USE_POWER_IDLE idle_power_usage = 30 active_power_usage = 5000 diff --git a/code/game/machinery/pda_multicaster.dm b/code/game/machinery/pda_multicaster.dm index a70f1ede37..ef7612bf87 100644 --- a/code/game/machinery/pda_multicaster.dm +++ b/code/game/machinery/pda_multicaster.dm @@ -3,8 +3,8 @@ desc = "This machine mirrors messages sent to it to specific departments." icon = 'icons/obj/stationobjs.dmi' icon_state = "pdamulti" - density = 1 - anchored = 1 + density = TRUE + anchored = TRUE circuit = /obj/item/weapon/circuitboard/telecomms/pda_multicaster use_power = USE_POWER_IDLE idle_power_usage = 750 diff --git a/code/game/machinery/pipe/pipe_dispenser.dm b/code/game/machinery/pipe/pipe_dispenser.dm index ff302617fe..0b4d054858 100644 --- a/code/game/machinery/pipe/pipe_dispenser.dm +++ b/code/game/machinery/pipe/pipe_dispenser.dm @@ -3,8 +3,8 @@ desc = "A large machine that can rapidly dispense pipes." icon = 'icons/obj/stationobjs.dmi' icon_state = "pipe_d" - density = 1 - anchored = 1 + density = TRUE + anchored = TRUE var/unwrenched = 0 var/wait = 0 var/p_layer = PIPING_LAYER_REGULAR @@ -149,8 +149,8 @@ desc = "A large machine that can rapidly dispense pipes. This one seems to dispsense disposal pipes." icon = 'icons/obj/stationobjs.dmi' icon_state = "pipe_d" - density = 1 - anchored = 1.0 + density = TRUE + anchored = TRUE disposals = TRUE //Allow you to drag-drop disposal pipes into it @@ -169,9 +169,9 @@ // adding a pipe dispensers that spawn unhooked from the ground /obj/machinery/pipedispenser/orderable - anchored = 0 + anchored = FALSE unwrenched = 1 /obj/machinery/pipedispenser/disposal/orderable - anchored = 0 + anchored = FALSE unwrenched = 1 diff --git a/code/game/machinery/pipe/pipelayer.dm b/code/game/machinery/pipe/pipelayer.dm index 9e0d3702eb..3debf68f53 100644 --- a/code/game/machinery/pipe/pipelayer.dm +++ b/code/game/machinery/pipe/pipelayer.dm @@ -2,7 +2,7 @@ name = "automatic pipe layer" icon = 'icons/obj/stationobjs.dmi' icon_state = "pipe_d" - density = 1 + density = TRUE circuit = /obj/item/weapon/circuitboard/pipelayer var/turf/old_turf // Last turf we were on. var/old_dir // Last direction we were facing. diff --git a/code/game/machinery/portable_turret.dm b/code/game/machinery/portable_turret.dm index 5bf026c234..0b1e575596 100644 --- a/code/game/machinery/portable_turret.dm +++ b/code/game/machinery/portable_turret.dm @@ -933,7 +933,7 @@ name = "turret frame" icon = 'icons/obj/turrets.dmi' icon_state = "turret_frame" - density=1 + density=TRUE var/target_type = /obj/machinery/porta_turret // The type we intend to build var/build_step = 0 //the current step in the building process var/finish_name="turret" //the name applied to the product turret diff --git a/code/game/machinery/reagents/pump.dm b/code/game/machinery/reagents/pump.dm index b73ce06a4a..c48e8d9834 100644 --- a/code/game/machinery/reagents/pump.dm +++ b/code/game/machinery/reagents/pump.dm @@ -8,8 +8,8 @@ conditions can cause different byproducts to be produced.
\ Magma or Lava can be pumped to produce mineralized fluid." - anchored = 0 - density = 1 + anchored = FALSE + density = TRUE icon = 'icons/obj/machines/reagent.dmi' icon_state = "pump" diff --git a/code/game/machinery/recharger.dm b/code/game/machinery/recharger.dm index 98155993ba..f52c14da46 100644 --- a/code/game/machinery/recharger.dm +++ b/code/game/machinery/recharger.dm @@ -4,7 +4,7 @@ desc = "A standard recharger for all devices that use power." icon = 'icons/obj/stationobjs_vr.dmi' //VOREStation Edit icon_state = "recharger0" - anchored = 1 + anchored = TRUE use_power = USE_POWER_IDLE idle_power_usage = 4 active_power_usage = 40000 //40 kW diff --git a/code/game/machinery/rechargestation.dm b/code/game/machinery/rechargestation.dm index cf2d4a978d..de35add336 100644 --- a/code/game/machinery/rechargestation.dm +++ b/code/game/machinery/rechargestation.dm @@ -3,8 +3,8 @@ desc = "A heavy duty rapid charging system, designed to quickly recharge cyborg power reserves." icon = 'icons/obj/objects.dmi' icon_state = "borgcharger0" - density = 1 - anchored = 1 + density = TRUE + anchored = TRUE circuit = /obj/item/weapon/circuitboard/recharge_station use_power = USE_POWER_IDLE idle_power_usage = 50 diff --git a/code/game/machinery/records_scanner.dm b/code/game/machinery/records_scanner.dm index c4e3ead84b..b80548e876 100644 --- a/code/game/machinery/records_scanner.dm +++ b/code/game/machinery/records_scanner.dm @@ -4,8 +4,8 @@ var/outputdir = 0 icon = 'icons/obj/stationobjs.dmi' icon_state = "scanner_idle" - density = 1 - anchored = 1 + density = TRUE + anchored = TRUE var/lastuser = null /obj/machinery/scanner/New() diff --git a/code/game/machinery/requests_console.dm b/code/game/machinery/requests_console.dm index 03a8ab1665..a8c4e21dbc 100644 --- a/code/game/machinery/requests_console.dm +++ b/code/game/machinery/requests_console.dm @@ -25,7 +25,7 @@ var/list/obj/machinery/requests_console/allConsoles = list() /obj/machinery/requests_console name = "requests console" desc = "A console intended to send requests to different departments on the station." - anchored = 1 + anchored = TRUE icon = 'icons/obj/terminals_vr.dmi' //VOREStation Edit icon_state = "req_comp_0" layer = ABOVE_WINDOW_LAYER diff --git a/code/game/machinery/robot_fabricator.dm b/code/game/machinery/robot_fabricator.dm index 43c281e42e..1f9c9c8f70 100644 --- a/code/game/machinery/robot_fabricator.dm +++ b/code/game/machinery/robot_fabricator.dm @@ -2,8 +2,8 @@ name = "robotic fabricator" icon = 'icons/obj/robotics.dmi' icon_state = "fab-idle" - density = 1 - anchored = 1 + density = TRUE + anchored = TRUE var/metal_amount = 0 var/operating = 0 var/obj/item/robot_parts/being_built = null diff --git a/code/game/machinery/seed_extractor.dm b/code/game/machinery/seed_extractor.dm index 0ae1785d50..4f29a3e347 100644 --- a/code/game/machinery/seed_extractor.dm +++ b/code/game/machinery/seed_extractor.dm @@ -3,8 +3,8 @@ desc = "Extracts and bags seeds from produce." icon = 'icons/obj/hydroponics_machines_vr.dmi' //VOREStation Edit icon_state = "sextractor" - density = 1 - anchored = 1 + density = TRUE + anchored = TRUE /obj/machinery/seed_extractor/attackby(var/obj/item/O as obj, var/mob/user as mob) diff --git a/code/game/machinery/spaceheater.dm b/code/game/machinery/spaceheater.dm index 1b5ae2e763..ac0615635a 100644 --- a/code/game/machinery/spaceheater.dm +++ b/code/game/machinery/spaceheater.dm @@ -4,8 +4,8 @@ #define SHEATER_COOL 3 /obj/machinery/space_heater - anchored = 0 - density = 1 + anchored = FALSE + density = TRUE icon = 'icons/obj/atmos.dmi' icon_state = "sheater0" name = "space heater" diff --git a/code/game/machinery/status_display.dm b/code/game/machinery/status_display.dm index c35085382b..bc7c4fcebe 100644 --- a/code/game/machinery/status_display.dm +++ b/code/game/machinery/status_display.dm @@ -15,8 +15,8 @@ plane = TURF_PLANE layer = ABOVE_WINDOW_LAYER name = "status display" - anchored = 1 - density = 0 + anchored = TRUE + density = FALSE use_power = USE_POWER_IDLE idle_power_usage = 10 circuit = /obj/item/weapon/circuitboard/status_display diff --git a/code/game/machinery/status_display_ai.dm b/code/game/machinery/status_display_ai.dm index 618d6043de..477c4d7937 100644 --- a/code/game/machinery/status_display_ai.dm +++ b/code/game/machinery/status_display_ai.dm @@ -63,8 +63,8 @@ var/list/ai_status_emotions = list( icon_state = "frame" layer = ABOVE_WINDOW_LAYER name = "AI display" - anchored = 1 - density = 0 + anchored = TRUE + density = FALSE circuit = /obj/item/weapon/circuitboard/ai_status_display var/mode = 0 // 0 = Blank diff --git a/code/game/machinery/suit_storage_unit.dm b/code/game/machinery/suit_storage_unit.dm index 7cad05c8cd..6b8c8747cc 100644 --- a/code/game/machinery/suit_storage_unit.dm +++ b/code/game/machinery/suit_storage_unit.dm @@ -7,8 +7,8 @@ desc = "An industrial U-Stor-It Storage unit designed to accomodate all kinds of space suits. Its on-board equipment also allows the user to decontaminate the contents through a UV-ray purging cycle. There's a warning label dangling from the control pad, reading \"STRICTLY NO BIOLOGICALS IN THE CONFINES OF THE UNIT\"." icon = 'icons/obj/suitstorage.dmi' icon_state = "suitstorage000000100" //order is: [has helmet][has suit][has human][is open][is locked][is UV cycling][is powered][is dirty/broken] [is superUVcycling] - anchored = 1 - density = 1 + anchored = TRUE + density = TRUE var/mob/living/carbon/human/OCCUPANT = null var/obj/item/clothing/suit/space/SUIT = null var/suit_type = null @@ -488,8 +488,8 @@ GLOBAL_LIST_EMPTY(suit_cycler_typecache) name = "suit cycler" desc = "An industrial machine for painting and refitting voidsuits." - anchored = 1 - density = 1 + anchored = TRUE + density = TRUE icon = 'icons/obj/suitstorage.dmi' icon_state = "suitstorage000000100" diff --git a/code/game/machinery/supplybeacon.dm b/code/game/machinery/supplybeacon.dm index c4d90818fc..8c1bc87f3f 100644 --- a/code/game/machinery/supplybeacon.dm +++ b/code/game/machinery/supplybeacon.dm @@ -26,8 +26,8 @@ icon = 'icons/obj/supplybeacon.dmi' icon_state = "beacon" - anchored = 0 - density = 1 + anchored = FALSE + density = TRUE layer = MOB_LAYER - 0.1 stat = 0 diff --git a/code/game/machinery/syndicatebeacon.dm b/code/game/machinery/syndicatebeacon.dm index 97ad09d2f8..07ac93b565 100644 --- a/code/game/machinery/syndicatebeacon.dm +++ b/code/game/machinery/syndicatebeacon.dm @@ -10,8 +10,8 @@ desc = "This looks suspicious..." icon = 'icons/obj/device.dmi' icon_state = "syndbeacon" - anchored = 1 - density = 1 + anchored = TRUE + density = TRUE var/temptext = "" var/selfdestructing = 0 var/charges = 1 @@ -77,8 +77,8 @@ icon = 'icons/obj/singularity.dmi' icon_state = "beacon" - anchored = 0 - density = 1 + anchored = FALSE + density = TRUE layer = MOB_LAYER - 0.1 //so people can't hide it and it's REALLY OBVIOUS stat = 0 @@ -125,7 +125,7 @@ return if(anchored) - anchored = 0 + anchored = FALSE to_chat(user, "You unscrew the beacon from the floor.") playsound(src, W.usesound, 50, 1) disconnect_from_network() @@ -134,7 +134,7 @@ if(!connect_to_network()) to_chat(user, "This device must be placed over an exposed cable.") return - anchored = 1 + anchored = TRUE to_chat(user, "You screw the beacon to the floor and attach the cable.") playsound(src, W.usesound, 50, 1) return diff --git a/code/game/machinery/telecomms/broadcaster.dm b/code/game/machinery/telecomms/broadcaster.dm index 4906c3b8c5..5a4932fd0a 100644 --- a/code/game/machinery/telecomms/broadcaster.dm +++ b/code/game/machinery/telecomms/broadcaster.dm @@ -15,8 +15,8 @@ var/message_delay = 0 // To make sure restarting the recentmessages list is kept //icon = 'icons/obj/stationobjs.dmi' //VOREStation Removal - use parent icon icon_state = "broadcaster" desc = "A dish-shaped machine used to broadcast processed subspace signals." - density = 1 - anchored = 1 + density = TRUE + anchored = TRUE use_power = USE_POWER_IDLE idle_power_usage = 25 machinetype = 5 @@ -135,10 +135,10 @@ var/message_delay = 0 // To make sure restarting the recentmessages list is kept icon = 'icons/obj/stationobjs.dmi' icon_state = "allinone" desc = "A compact machine used for portable subspace telecommuniations processing." - density = 1 + density = TRUE use_power = USE_POWER_IDLE idle_power_usage = 20 - anchored = 1 + anchored = TRUE machinetype = 6 produces_heat = 0 var/intercept = 0 // if nonzero, broadcasts all messages to syndicate channel diff --git a/code/game/machinery/telecomms/telecomunications.dm b/code/game/machinery/telecomms/telecomunications.dm index fb4c92ab7b..df8188d1a3 100644 --- a/code/game/machinery/telecomms/telecomunications.dm +++ b/code/game/machinery/telecomms/telecomunications.dm @@ -250,8 +250,8 @@ var/global/list/obj/machinery/telecomms/telecomms_list = list() //icon = 'icons/obj/stationobjs.dmi' //VOREStation Removal - use parent icon 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 = 1 - anchored = 1 + density = TRUE + anchored = TRUE use_power = USE_POWER_IDLE idle_power_usage = 600 machinetype = 1 @@ -338,8 +338,8 @@ var/global/list/obj/machinery/telecomms/telecomms_list = list() //icon = 'icons/obj/stationobjs.dmi' //VOREStation Removal - use parent icon icon_state = "hub" desc = "A mighty piece of hardware used to send/receive massive amounts of data." - density = 1 - anchored = 1 + density = TRUE + anchored = TRUE use_power = USE_POWER_IDLE idle_power_usage = 1600 machinetype = 7 @@ -375,8 +375,8 @@ var/global/list/obj/machinery/telecomms/telecomms_list = list() //icon = 'icons/obj/stationobjs.dmi' //VOREStation Removal - use parent icon icon_state = "relay" desc = "A mighty piece of hardware used to send massive amounts of data far away." - density = 1 - anchored = 1 + density = TRUE + anchored = TRUE use_power = USE_POWER_IDLE idle_power_usage = 600 machinetype = 8 @@ -435,8 +435,8 @@ var/global/list/obj/machinery/telecomms/telecomms_list = list() //icon = 'icons/obj/stationobjs.dmi' //VOREStation Removal - use parent icon icon_state = "bus" desc = "A mighty piece of hardware used to send massive amounts of data quickly." - density = 1 - anchored = 1 + density = TRUE + anchored = TRUE use_power = USE_POWER_IDLE idle_power_usage = 1000 machinetype = 2 @@ -491,8 +491,8 @@ var/global/list/obj/machinery/telecomms/telecomms_list = list() //icon = 'icons/obj/stationobjs.dmi' //VOREStation Removal - use parent icon icon_state = "processor" desc = "This machine is used to process large quantities of information." - density = 1 - anchored = 1 + density = TRUE + anchored = TRUE use_power = USE_POWER_IDLE idle_power_usage = 600 machinetype = 3 @@ -533,8 +533,8 @@ var/global/list/obj/machinery/telecomms/telecomms_list = list() //icon = 'icons/obj/stationobjs.dmi' //VOREStation Removal - use parent icon icon_state = "comm_server" desc = "A machine used to store data and network statistics." - density = 1 - anchored = 1 + density = TRUE + anchored = TRUE use_power = USE_POWER_IDLE idle_power_usage = 300 machinetype = 4 diff --git a/code/game/machinery/teleporter.dm b/code/game/machinery/teleporter.dm index 631e5b9779..505ff94947 100644 --- a/code/game/machinery/teleporter.dm +++ b/code/game/machinery/teleporter.dm @@ -122,8 +122,8 @@ /obj/machinery/teleport name = "teleport" icon = 'icons/obj/stationobjs.dmi' - density = 1 - anchored = 1.0 + density = TRUE + anchored = TRUE var/lockeddown = 0 ////// diff --git a/code/game/machinery/transformer.dm b/code/game/machinery/transformer.dm index 621feae713..43bc97c20a 100644 --- a/code/game/machinery/transformer.dm +++ b/code/game/machinery/transformer.dm @@ -4,8 +4,8 @@ icon = 'icons/obj/recycling.dmi' icon_state = "separator-AO1" layer = MOB_LAYER+1 // Overhead - anchored = 1 - density = 1 + anchored = TRUE + density = TRUE var/transform_dead = 0 var/transform_standing = 0 diff --git a/code/game/machinery/transportpod.dm b/code/game/machinery/transportpod.dm index 145950291c..a925a616fd 100644 --- a/code/game/machinery/transportpod.dm +++ b/code/game/machinery/transportpod.dm @@ -4,8 +4,8 @@ icon = 'icons/obj/structures.dmi' icon_state = "borg_pod_opened" - density = 1 //thicc - anchored = 1 + density = TRUE //thicc + anchored = TRUE use_power = USE_POWER_OFF var/in_transit = 0 diff --git a/code/game/machinery/virtual_reality/vr_console.dm b/code/game/machinery/virtual_reality/vr_console.dm index 0f10b19e7f..694d08fa13 100644 --- a/code/game/machinery/virtual_reality/vr_console.dm +++ b/code/game/machinery/virtual_reality/vr_console.dm @@ -6,8 +6,8 @@ var/base_state = "syndipod_" - density = 1 - anchored = 1 + density = TRUE + anchored = TRUE circuit = /obj/item/weapon/circuitboard/vr_sleeper var/mob/living/carbon/human/occupant = null var/mob/living/carbon/human/avatar = null diff --git a/code/game/machinery/washing_machine.dm b/code/game/machinery/washing_machine.dm index eff908c898..b57a7a3ce8 100644 --- a/code/game/machinery/washing_machine.dm +++ b/code/game/machinery/washing_machine.dm @@ -3,8 +3,8 @@ desc = "Not a hiding place. Unfit for pets." icon = 'icons/obj/machines/washing_machine_vr.dmi' //VOREStation Edit icon_state = "wm_1" //VOREStation Edit - density = 1 - anchored = 1.0 + density = TRUE + anchored = TRUE clicksound = "button" clickvol = 40 diff --git a/code/game/machinery/wishgranter.dm b/code/game/machinery/wishgranter.dm index 81c720bacd..cab7caba17 100644 --- a/code/game/machinery/wishgranter.dm +++ b/code/game/machinery/wishgranter.dm @@ -4,8 +4,8 @@ icon = 'icons/obj/device.dmi' icon_state = "syndbeacon" use_power = USE_POWER_OFF - anchored = 1 - density = 1 + anchored = TRUE + density = TRUE var/charges = 1 var/insisting = 0 diff --git a/code/game/mecha/combat/gorilla.dm b/code/game/mecha/combat/gorilla.dm index 24bf11b49b..09992b5774 100644 --- a/code/game/mecha/combat/gorilla.dm +++ b/code/game/mecha/combat/gorilla.dm @@ -186,4 +186,4 @@ icon_state = "pzrwreck" plane = MOB_PLANE pixel_x = -16 - anchored = 1 // It's fucking huge. You aren't moving it. + anchored = TRUE // It's fucking huge. You aren't moving it. diff --git a/code/game/mecha/mech_bay.dm b/code/game/mecha/mech_bay.dm index dce2c3c9db..26c5798949 100644 --- a/code/game/mecha/mech_bay.dm +++ b/code/game/mecha/mech_bay.dm @@ -3,8 +3,8 @@ desc = "A mech recharger, built into the floor." icon = 'icons/mecha/mech_bay.dmi' icon_state = "recharge_floor" - density = 0 - anchored = 1 + density = FALSE + anchored = TRUE layer = TURF_LAYER + 0.1 circuit = /obj/item/weapon/circuitboard/mech_recharger diff --git a/code/game/mecha/mech_fabricator.dm b/code/game/mecha/mech_fabricator.dm index 34e20c2bf0..cb7cf980f4 100644 --- a/code/game/mecha/mech_fabricator.dm +++ b/code/game/mecha/mech_fabricator.dm @@ -3,8 +3,8 @@ icon_state = "mechfab-idle" name = "Exosuit Fabricator" desc = "A machine used for construction of mechas." - density = 1 - anchored = 1 + density = TRUE + anchored = TRUE use_power = USE_POWER_IDLE idle_power_usage = 20 active_power_usage = 5000 diff --git a/code/game/mecha/mech_prosthetics.dm b/code/game/mecha/mech_prosthetics.dm index 12f75f1c96..5a2906dfae 100644 --- a/code/game/mecha/mech_prosthetics.dm +++ b/code/game/mecha/mech_prosthetics.dm @@ -3,8 +3,8 @@ icon_state = "prosfab" name = "Prosthetics Fabricator" desc = "A machine used for construction of prosthetics." - density = 1 - anchored = 1 + density = TRUE + anchored = TRUE use_power = USE_POWER_IDLE idle_power_usage = 20 active_power_usage = 5000 diff --git a/code/game/mecha/mech_sensor.dm b/code/game/mecha/mech_sensor.dm index 33147e0ab1..59a611fa81 100644 --- a/code/game/mecha/mech_sensor.dm +++ b/code/game/mecha/mech_sensor.dm @@ -3,8 +3,8 @@ icon_state = "airlock_sensor_off" name = "mechatronic sensor" desc = "Regulates mech movement." - anchored = 1 - density = 1 + anchored = TRUE + density = TRUE throwpass = 1 use_power = USE_POWER_IDLE layer = ON_WINDOW_LAYER diff --git a/code/game/mecha/mecha.dm b/code/game/mecha/mecha.dm index 617b6d747d..1a65438192 100644 --- a/code/game/mecha/mecha.dm +++ b/code/game/mecha/mecha.dm @@ -26,10 +26,10 @@ desc = "Exosuit" description_info = "Alt click to strafe." icon = 'icons/mecha/mecha.dmi' - density = 1 //Dense. To raise the heat. + density = TRUE //Dense. To raise the heat. opacity = 1 //Opaque. Menacing. - anchored = 1 //No pulling around. - unacidable = 1 //And no deleting hoomans inside + anchored = TRUE //No pulling around. + unacidable = TRUE //And no deleting hoomans inside layer = MOB_LAYER //Icon draw layer infra_luminosity = 15 //Byond implementation is bugged. var/initial_icon = null //Mech type for resetting icon. Only used for reskinning kits (see custom items) diff --git a/code/game/mecha/mecha_wreckage.dm b/code/game/mecha/mecha_wreckage.dm index 7ca1e753fb..5dbee5556b 100644 --- a/code/game/mecha/mecha_wreckage.dm +++ b/code/game/mecha/mecha_wreckage.dm @@ -7,8 +7,8 @@ name = "Exosuit wreckage" desc = "Remains of some unfortunate mecha. Completely unrepairable." icon = 'icons/mecha/mecha.dmi' - density = 1 - anchored = 0 + density = TRUE + anchored = FALSE opacity = 0 var/list/welder_salvage = list(/obj/item/stack/material/plasteel,/obj/item/stack/material/steel,/obj/item/stack/rods) var/list/wirecutters_salvage = list(/obj/item/stack/cable_coil) diff --git a/code/game/mecha/micro/micro.dm b/code/game/mecha/micro/micro.dm index 5c2c2ed6ff..abc39eb5a2 100644 --- a/code/game/mecha/micro/micro.dm +++ b/code/game/mecha/micro/micro.dm @@ -10,7 +10,7 @@ /obj/mecha/micro icon = 'icons/mecha/micro.dmi' force = 10 //still a robot - anchored = 0 //light enough to push and pull, but you still can't just walk past them. Like people on non-help. + anchored = FALSE //light enough to push and pull, but you still can't just walk past them. Like people on non-help. opacity = 0 //small enough to see around, like people. step_energy_drain = 2 // They're light and small. A compact is gonna get better MPG than a truck. var/melee_cooldown = 10 diff --git a/code/game/objects/buckling.dm b/code/game/objects/buckling.dm index 8f6779cd84..b0f4f4c2c1 100644 --- a/code/game/objects/buckling.dm +++ b/code/game/objects/buckling.dm @@ -1,7 +1,7 @@ /atom/movable - var/can_buckle = 0 + var/can_buckle = FALSE var/buckle_movable = 0 var/buckle_dir = 0 var/buckle_lying = -1 //bed-like behavior, forces mob.lying = buckle_lying if != -1 diff --git a/code/game/objects/effects/alien/aliens.dm b/code/game/objects/effects/alien/aliens.dm index 4e79712598..0cc5868762 100644 --- a/code/game/objects/effects/alien/aliens.dm +++ b/code/game/objects/effects/alien/aliens.dm @@ -22,9 +22,9 @@ desc = "Looks like some kind of slimy growth." icon_state = "resin" - density = 1 + density = TRUE opacity = 1 - anchored = 1 + anchored = TRUE can_atmos_pass = ATMOS_PASS_NO var/health = 200 //var/mob/living/affecting = null @@ -53,7 +53,7 @@ /obj/effect/alien/resin/proc/healthcheck() if(health <=0) - density = 0 + density = FALSE qdel(src) return @@ -162,8 +162,8 @@ name = "growth" desc = "Weird organic growth." icon_state = "weeds" - anchored = 1 - density = 0 + anchored = TRUE + density = FALSE plane = TURF_PLANE layer = ABOVE_TURF_LAYER @@ -373,9 +373,9 @@ desc = "Burbling corrossive stuff. I wouldn't want to touch it." icon_state = "acid" - density = 0 + density = FALSE opacity = 0 - anchored = 1 + anchored = TRUE var/atom/target var/ticks = 0 diff --git a/code/game/objects/effects/bump_teleporter.dm b/code/game/objects/effects/bump_teleporter.dm index 9379234ca6..0286622705 100644 --- a/code/game/objects/effects/bump_teleporter.dm +++ b/code/game/objects/effects/bump_teleporter.dm @@ -7,8 +7,8 @@ var/list/obj/effect/bump_teleporter/BUMP_TELEPORTERS = list() var/id = null //id of this bump_teleporter. var/id_target = null //id of bump_teleporter which this moves you to. invisibility = 101 //nope, can't see this - anchored = 1 - density = 1 + anchored = TRUE + density = TRUE opacity = 0 /obj/effect/bump_teleporter/New() diff --git a/code/game/objects/effects/chem/foam.dm b/code/game/objects/effects/chem/foam.dm index 993cbc6edc..5dad8accc4 100644 --- a/code/game/objects/effects/chem/foam.dm +++ b/code/game/objects/effects/chem/foam.dm @@ -6,8 +6,8 @@ name = "foam" icon_state = "foam" opacity = 0 - anchored = 1 - density = 0 + anchored = TRUE + density = FALSE layer = OBJ_LAYER + 0.9 mouse_opacity = 0 animate_movement = 0 @@ -134,9 +134,9 @@ /obj/structure/foamedmetal icon = 'icons/effects/effects.dmi' icon_state = "metalfoam" - density = 1 + density = TRUE opacity = 1 // changed in New() - anchored = 1 + anchored = TRUE name = "foamed metal" desc = "A lightweight foamed metal wall." can_atmos_pass = ATMOS_PASS_NO @@ -147,7 +147,7 @@ update_nearby_tiles(1) /obj/structure/foamedmetal/Destroy() - density = 0 + density = FALSE update_nearby_tiles(1) return ..() diff --git a/code/game/objects/effects/decals/Cleanable/fuel.dm b/code/game/objects/effects/decals/Cleanable/fuel.dm index deb8ec8a0c..2ea550d66d 100644 --- a/code/game/objects/effects/decals/Cleanable/fuel.dm +++ b/code/game/objects/effects/decals/Cleanable/fuel.dm @@ -4,7 +4,7 @@ icon_state = "fuel" plane = DIRTY_PLANE layer = DIRTY_LAYER - anchored = 1 + anchored = TRUE var/amount = 1 generic_filth = TRUE persistent = FALSE @@ -51,7 +51,7 @@ /obj/effect/decal/cleanable/liquid_fuel/flamethrower_fuel icon_state = "mustard" - anchored = 0 + anchored = FALSE /obj/effect/decal/cleanable/liquid_fuel/flamethrower_fuel/New(newLoc, amt = 1, d = 0) set_dir(d) //Setting this direction means you won't get torched by your own flamethrower. diff --git a/code/game/objects/effects/decals/Cleanable/humans.dm b/code/game/objects/effects/decals/Cleanable/humans.dm index 7692dd334e..b32777c65a 100644 --- a/code/game/objects/effects/decals/Cleanable/humans.dm +++ b/code/game/objects/effects/decals/Cleanable/humans.dm @@ -8,8 +8,8 @@ var/global/list/image/splatter_cache=list() desc = "It's thick and gooey. Perhaps it's the chef's cooking?" var/drydesc = "It's dry and crusty. Someone is not doing their job." gender = PLURAL - density = 0 - anchored = 1 + density = FALSE + anchored = TRUE plane = BLOOD_PLANE layer = BLOOD_DECAL_LAYER icon = 'icons/effects/blood.dmi' @@ -173,8 +173,8 @@ var/global/list/image/splatter_cache=list() name = "gibs" desc = "They look bloody and gruesome." gender = PLURAL - density = 0 - anchored = 1 + density = FALSE + anchored = TRUE icon = 'icons/effects/blood.dmi' icon_state = "gibbl5" random_icon_states = list("gib1", "gib2", "gib3", "gib5", "gib6") @@ -229,8 +229,8 @@ var/global/list/image/splatter_cache=list() name = "mucus" desc = "Disgusting mucus." gender = PLURAL - density = 0 - anchored = 1 + density = FALSE + anchored = TRUE icon = 'icons/effects/blood.dmi' icon_state = "mucus" random_icon_states = list("mucus") diff --git a/code/game/objects/effects/decals/Cleanable/misc.dm b/code/game/objects/effects/decals/Cleanable/misc.dm index 5f980bfb3c..84f228c6ab 100644 --- a/code/game/objects/effects/decals/Cleanable/misc.dm +++ b/code/game/objects/effects/decals/Cleanable/misc.dm @@ -2,8 +2,8 @@ name = "clutter" desc = "Someone should clean that up." gender = PLURAL - density = 0 - anchored = 1 + density = FALSE + anchored = TRUE icon = 'icons/obj/objects.dmi' icon_state = "shards" @@ -13,7 +13,7 @@ gender = PLURAL icon = 'icons/obj/objects.dmi' icon_state = "ash" - anchored = 1 + anchored = TRUE /obj/effect/decal/cleanable/ash/attack_hand(mob/user as mob) to_chat(user, "[src] sifts through your fingers.") @@ -32,8 +32,8 @@ name = "dirt" desc = "Someone should clean that up." gender = PLURAL - density = 0 - anchored = 1 + density = FALSE + anchored = TRUE icon = 'icons/effects/effects.dmi' icon_state = "dirt" mouse_opacity = 0 @@ -42,8 +42,8 @@ name = "flour" desc = "It's still good. Four second rule!" gender = PLURAL - density = 0 - anchored = 1 + density = FALSE + anchored = TRUE icon = 'icons/effects/effects.dmi' icon_state = "flour" @@ -51,8 +51,8 @@ name = "glowing goo" desc = "Jeez. I hope that's not for lunch." gender = PLURAL - density = 0 - anchored = 1 + density = FALSE + anchored = TRUE light_range = 1 icon = 'icons/effects/effects.dmi' icon_state = "greenglow" @@ -60,8 +60,8 @@ /obj/effect/decal/cleanable/cobweb name = "cobweb" desc = "Somebody should remove that." - density = 0 - anchored = 1 + density = FALSE + anchored = TRUE plane = OBJ_PLANE icon = 'icons/effects/effects.dmi' icon_state = "cobweb1" @@ -69,8 +69,8 @@ /obj/effect/decal/cleanable/molten_item name = "gooey grey mass" desc = "It looks like a melted... something." - density = 0 - anchored = 1 + density = FALSE + anchored = TRUE plane = OBJ_PLANE icon = 'icons/obj/chemical.dmi' icon_state = "molten" @@ -78,8 +78,8 @@ /obj/effect/decal/cleanable/cobweb2 name = "cobweb" desc = "Somebody should remove that." - density = 0 - anchored = 1 + density = FALSE + anchored = TRUE plane = OBJ_PLANE icon = 'icons/effects/effects.dmi' icon_state = "cobweb2" @@ -89,8 +89,8 @@ name = "vomit" desc = "Gosh, how unpleasant." gender = PLURAL - density = 0 - anchored = 1 + density = FALSE + anchored = TRUE icon = 'icons/effects/blood.dmi' icon_state = "vomit_1" random_icon_states = list("vomit_1", "vomit_2", "vomit_3", "vomit_4") @@ -99,32 +99,32 @@ /obj/effect/decal/cleanable/tomato_smudge name = "tomato smudge" desc = "It's red." - density = 0 - anchored = 1 + density = FALSE + anchored = TRUE icon = 'icons/effects/tomatodecal.dmi' random_icon_states = list("tomato_floor1", "tomato_floor2", "tomato_floor3") /obj/effect/decal/cleanable/egg_smudge name = "smashed egg" desc = "Seems like this one won't hatch." - density = 0 - anchored = 1 + density = FALSE + anchored = TRUE icon = 'icons/effects/tomatodecal.dmi' random_icon_states = list("smashed_egg1", "smashed_egg2", "smashed_egg3") /obj/effect/decal/cleanable/pie_smudge //honk name = "smashed pie" desc = "It's pie cream from a cream pie." - density = 0 - anchored = 1 + density = FALSE + anchored = TRUE icon = 'icons/effects/tomatodecal.dmi' random_icon_states = list("smashed_pie") /obj/effect/decal/cleanable/fruit_smudge name = "smudge" desc = "Some kind of fruit smear." - density = 0 - anchored = 1 + density = FALSE + anchored = TRUE icon = 'icons/effects/blood.dmi' icon_state = "mfloor1" random_icon_states = list("mfloor1", "mfloor2", "mfloor3", "mfloor4", "mfloor5", "mfloor6", "mfloor7") diff --git a/code/game/objects/effects/decals/contraband.dm b/code/game/objects/effects/decals/contraband.dm index 62c8d89470..2915213d8a 100644 --- a/code/game/objects/effects/decals/contraband.dm +++ b/code/game/objects/effects/decals/contraband.dm @@ -129,7 +129,7 @@ name = "poster" desc = "A large piece of space-resistant printed paper. " icon = 'icons/obj/contraband_vr.dmi' //VOREStation Edit - anchored = 1 + anchored = TRUE var/serial_number //Will hold the value of src.loc if nobody initialises it var/poster_type //So mappers can specify a desired poster var/ruined = 0 diff --git a/code/game/objects/effects/decals/crayon.dm b/code/game/objects/effects/decals/crayon.dm index 8f92ea0089..f983a480ff 100644 --- a/code/game/objects/effects/decals/crayon.dm +++ b/code/game/objects/effects/decals/crayon.dm @@ -4,7 +4,7 @@ icon = 'icons/obj/rune.dmi' plane = DIRTY_PLANE layer = DIRTY_LAYER - anchored = 1 + anchored = TRUE /obj/effect/decal/cleanable/crayon/New(location,main = "#FFFFFF",shade = "#000000",var/type = "rune") ..() diff --git a/code/game/objects/effects/decals/misc.dm b/code/game/objects/effects/decals/misc.dm index f3a75ce3c2..3e5c46e134 100644 --- a/code/game/objects/effects/decals/misc.dm +++ b/code/game/objects/effects/decals/misc.dm @@ -4,11 +4,11 @@ icon = 'icons/mob/screen1.dmi' icon_state = "arrow" plane = ABOVE_PLANE - anchored = 1 + anchored = TRUE mouse_opacity = 0 // Used for spray that you spray at walls, tables, hydrovats etc /obj/effect/decal/spraystill - density = 0 - anchored = 1 + density = FALSE + anchored = TRUE plane = ABOVE_PLANE \ No newline at end of file diff --git a/code/game/objects/effects/decals/posters/posters.dm b/code/game/objects/effects/decals/posters/posters.dm index 5a4abf4d3f..9f3496b4ff 100644 --- a/code/game/objects/effects/decals/posters/posters.dm +++ b/code/game/objects/effects/decals/posters/posters.dm @@ -117,7 +117,7 @@ desc = "A large piece of space-resistant printed paper. " icon = 'icons/obj/contraband_vr.dmi' //VOREStation Edit icon_state = "poster" //VOREStation Edit - anchored = 1 + anchored = TRUE var/decl/poster/poster_decl = null var/target_poster_decl_path = /decl/poster var/roll_type = /obj/item/poster diff --git a/code/game/objects/effects/decals/remains.dm b/code/game/objects/effects/decals/remains.dm index 7452586543..95adae5e4b 100644 --- a/code/game/objects/effects/decals/remains.dm +++ b/code/game/objects/effects/decals/remains.dm @@ -3,7 +3,7 @@ gender = PLURAL icon = 'icons/effects/blood.dmi' icon_state = "remains" - anchored = 0 + anchored = FALSE /obj/effect/decal/remains/human desc = "They look like human remains. They have a strange aura about them." diff --git a/code/game/objects/effects/effect_system.dm b/code/game/objects/effects/effect_system.dm index 3665c77e91..8543c55a2b 100644 --- a/code/game/objects/effects/effect_system.dm +++ b/code/game/objects/effects/effect_system.dm @@ -11,7 +11,7 @@ would spawn and follow the beaker, even if it is carried or thrown. name = "effect" icon = 'icons/effects/effects.dmi' mouse_opacity = 0 - unacidable = 1//So effect are not targeted by alien acid. + unacidable = TRUE//So effect are not targeted by alien acid. pass_flags = PASSTABLE | PASSGRILLE blocks_emissive = EMISSIVE_BLOCK_GENERIC light_on = TRUE @@ -60,7 +60,7 @@ steam.start() -- spawns the effect name = "steam" icon = 'icons/effects/effects.dmi' icon_state = "extinguish" - density = 0 + density = FALSE /datum/effect/effect/system/steam_spread/set_up(n = 3, c = 0, turf/loc) if(n > 10) @@ -98,7 +98,7 @@ steam.start() -- spawns the effect name = "sparks" icon_state = "sparks" var/amount = 6.0 - anchored = 1.0 + anchored = TRUE mouse_opacity = 0 /obj/effect/effect/sparks/Initialize() @@ -168,7 +168,7 @@ steam.start() -- spawns the effect name = "smoke" icon_state = "smoke" opacity = 1 - anchored = 0.0 + anchored = FALSE mouse_opacity = 0 var/amount = 6.0 var/time_to_live = 100 @@ -422,7 +422,7 @@ steam.start() -- spawns the effect /obj/effect/effect/ion_trails name = "ion trails" icon_state = "ion_trails" - anchored = 1.0 + anchored = TRUE /datum/effect/effect/system/ion_trail_follow var/turf/oldposition diff --git a/code/game/objects/effects/explosion_particles.dm b/code/game/objects/effects/explosion_particles.dm index 12a1e92020..449506197a 100644 --- a/code/game/objects/effects/explosion_particles.dm +++ b/code/game/objects/effects/explosion_particles.dm @@ -3,7 +3,7 @@ icon = 'icons/effects/effects.dmi' icon_state = "explosion_particle" opacity = 1 - anchored = 1 + anchored = TRUE mouse_opacity = 0 /obj/effect/expl_particles/New() @@ -37,7 +37,7 @@ icon = 'icons/effects/96x96.dmi' icon_state = "explosion" opacity = 1 - anchored = 1 + anchored = TRUE mouse_opacity = 0 pixel_x = -32 pixel_y = -32 diff --git a/code/game/objects/effects/item_pickup_ghost.dm b/code/game/objects/effects/item_pickup_ghost.dm index 0944e2753e..f23b8c8d8e 100644 --- a/code/game/objects/effects/item_pickup_ghost.dm +++ b/code/game/objects/effects/item_pickup_ghost.dm @@ -1,5 +1,5 @@ /obj/effect/temporary_effect/item_pickup_ghost - anchored = 1 + anchored = TRUE plane = MOB_PLANE layer = ABOVE_MOB_LAYER mouse_opacity = 0//just in case something dumb happens diff --git a/code/game/objects/effects/landmarks.dm b/code/game/objects/effects/landmarks.dm index 4ec55e6571..3a60ef5480 100644 --- a/code/game/objects/effects/landmarks.dm +++ b/code/game/objects/effects/landmarks.dm @@ -2,9 +2,9 @@ name = "landmark" icon = 'icons/mob/screen1.dmi' icon_state = "x2" - anchored = 1.0 - unacidable = 1 - simulated = 0 + anchored = TRUE + unacidable = TRUE + simulated = FALSE invisibility = 100 var/delete_me = 0 @@ -24,7 +24,7 @@ return if("JoinLate") // Bit difference, since we need the spawn point to move. latejoin += src - simulated = 1 + simulated = TRUE // delete_me = 1 return if("JoinLateGateway") @@ -105,7 +105,7 @@ name = "start" icon = 'icons/mob/screen1.dmi' icon_state = "x" - anchored = 1.0 + anchored = TRUE /obj/effect/landmark/start/New() ..() @@ -128,7 +128,7 @@ name = "virtual_reality" icon = 'icons/mob/screen1.dmi' icon_state = "x" - anchored = 1.0 + anchored = TRUE /obj/effect/landmark/virtual_reality/New() ..() diff --git a/code/game/objects/effects/manifest.dm b/code/game/objects/effects/manifest.dm index ec45c7a089..98d378faf5 100644 --- a/code/game/objects/effects/manifest.dm +++ b/code/game/objects/effects/manifest.dm @@ -2,7 +2,7 @@ name = "manifest" icon = 'icons/mob/screen1.dmi' icon_state = "x" - unacidable = 1//Just to be sure. + unacidable = TRUE//Just to be sure. /obj/effect/manifest/New() diff --git a/code/game/objects/effects/mines.dm b/code/game/objects/effects/mines.dm index c49a4e0666..749797c433 100644 --- a/code/game/objects/effects/mines.dm +++ b/code/game/objects/effects/mines.dm @@ -1,14 +1,14 @@ /obj/effect/mine name = "land mine" //The name and description are deliberately NOT modified, so you can't game the mines you find. desc = "A small explosive land mine." - density = 0 - anchored = 1 + density = FALSE + anchored = TRUE icon = 'icons/obj/weapons.dmi' icon_state = "uglymine" var/triggered = 0 var/smoke_strength = 3 var/obj/item/weapon/mine/mineitemtype = /obj/item/weapon/mine - var/panel_open = 0 + var/panel_open = FALSE var/datum/wires/mines/wires = null var/camo_net = FALSE // Will the mine 'cloak' on deployment? diff --git a/code/game/objects/effects/misc.dm b/code/game/objects/effects/misc.dm index 725d26c1f5..cd517098dc 100644 --- a/code/game/objects/effects/misc.dm +++ b/code/game/objects/effects/misc.dm @@ -4,8 +4,8 @@ desc = "It's a ... present?" icon = 'icons/obj/items.dmi' icon_state = "strangepresent" - density = 1 - anchored = 0 + density = TRUE + anchored = FALSE /obj/effect/temporary_effect name = "self deleting effect" diff --git a/code/game/objects/effects/overlays.dm b/code/game/objects/effects/overlays.dm index 9fc898f8c8..c07f783e9e 100644 --- a/code/game/objects/effects/overlays.dm +++ b/code/game/objects/effects/overlays.dm @@ -1,6 +1,6 @@ /obj/effect/overlay name = "overlay" - unacidable = 1 + unacidable = TRUE var/i_attached//Added for possible image attachments to objects. For hallucinations and the like. /obj/effect/overlay/beam//Not actually a projectile, just an effect. @@ -18,19 +18,19 @@ name = "Palm tree" icon = 'icons/misc/beach2.dmi' icon_state = "palm1" - density = 1 + density = TRUE plane = MOB_PLANE layer = ABOVE_MOB_LAYER - anchored = 1 + anchored = TRUE /obj/effect/overlay/palmtree_l name = "Palm tree" icon = 'icons/misc/beach2.dmi' icon_state = "palm2" - density = 1 + density = TRUE plane = MOB_PLANE layer = ABOVE_MOB_LAYER - anchored = 1 + anchored = TRUE /obj/effect/overlay/coconut name = "Coconuts" @@ -47,8 +47,8 @@ name = "wallrot" desc = "Ick..." icon = 'icons/effects/wallrot.dmi' - anchored = 1 - density = 1 + anchored = TRUE + density = TRUE plane = MOB_PLANE layer = ABOVE_MOB_LAYER mouse_opacity = 0 @@ -62,7 +62,7 @@ name = "snow" icon = 'icons/turf/overlays.dmi' icon_state = "snow" - anchored = 1 + anchored = TRUE plane = TURF_PLANE // Todo: Add a version that gradually reaccumulates over time by means of alpha transparency. -Spades diff --git a/code/game/objects/effects/portals.dm b/code/game/objects/effects/portals.dm index c549a7e3d1..ae27e75695 100644 --- a/code/game/objects/effects/portals.dm +++ b/code/game/objects/effects/portals.dm @@ -5,12 +5,12 @@ GLOBAL_LIST_BOILERPLATE(all_portals, /obj/effect/portal) desc = "Looks unstable. Best to test it with the clown." icon = 'icons/obj/stationobjs.dmi' icon_state = "portal" - density = 1 - unacidable = 1//Can't destroy energy portals. + density = TRUE + unacidable = TRUE//Can't destroy energy portals. var/failchance = 5 var/obj/item/target = null var/creator = null - anchored = 1.0 + anchored = TRUE /obj/effect/portal/Bumped(mob/M as mob|obj) if(istype(M,/mob) && !(istype(M,/mob/living))) diff --git a/code/game/objects/effects/spiders.dm b/code/game/objects/effects/spiders.dm index 6e3f224625..8eb720ea08 100644 --- a/code/game/objects/effects/spiders.dm +++ b/code/game/objects/effects/spiders.dm @@ -3,8 +3,8 @@ name = "web" desc = "it's stringy and sticky" icon = 'icons/effects/effects.dmi' - anchored = 1 - density = 0 + anchored = TRUE + density = FALSE var/health = 15 //similar to weeds, but only barfed out by nurses manually @@ -137,7 +137,7 @@ name = "spiderling" desc = "It never stays still for long." icon_state = "spiderling" - anchored = 0 + anchored = FALSE layer = HIDING_LAYER health = 3 var/last_itch = 0 diff --git a/code/game/objects/effects/step_triggers.dm b/code/game/objects/effects/step_triggers.dm index 17d9a17123..a9d1331428 100644 --- a/code/game/objects/effects/step_triggers.dm +++ b/code/game/objects/effects/step_triggers.dm @@ -5,7 +5,7 @@ var/stopper = 1 // stops throwers invisibility = 99 // nope cant see this shit plane = ABOVE_PLANE - anchored = 1 + anchored = TRUE icon = 'icons/mob/screen1.dmi' //VS Edit icon_state = "centermarker" //VS Edit diff --git a/code/game/objects/effects/zone_divider.dm b/code/game/objects/effects/zone_divider.dm index acab441d52..fa2ea82531 100644 --- a/code/game/objects/effects/zone_divider.dm +++ b/code/game/objects/effects/zone_divider.dm @@ -4,8 +4,8 @@ icon = 'icons/mob/screen1.dmi' icon_state = "x3" invisibility = 101 //nope, can't see this - anchored = 1 - density = 0 + anchored = TRUE + density = FALSE opacity = 0 can_atmos_pass = ATMOS_PASS_PROC diff --git a/code/game/objects/items.dm b/code/game/objects/items.dm index 19e261bf1e..8480b901a0 100644 --- a/code/game/objects/items.dm +++ b/code/game/objects/items.dm @@ -49,7 +49,7 @@ var/permeability_coefficient = 1 // for chemicals/diseases var/siemens_coefficient = 1 // for electrical admittance/conductance (electrocution checks and shit) var/slowdown = 0 // How much clothing is slowing you down. Negative values speeds you up - var/canremove = 1 //Mostly for Ninja code at this point but basically will not allow the item to be removed if set to 0. /N + var/canremove = TRUE //Mostly for Ninja code at this point but basically will not allow the item to be removed if set to 0. /N var/list/armor = list("melee" = 0, "bullet" = 0, "laser" = 0,"energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0) var/list/armorsoak = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0) var/list/allowed = null //suit storage stuff. diff --git a/code/game/objects/items/bodybag.dm b/code/game/objects/items/bodybag.dm index ab8c82f66f..b27ebc27c5 100644 --- a/code/game/objects/items/bodybag.dm +++ b/code/game/objects/items/bodybag.dm @@ -27,7 +27,7 @@ open_sound = 'sound/items/zip.ogg' close_sound = 'sound/items/zip.ogg' var/item_path = /obj/item/bodybag - density = 0 + density = FALSE storage_capacity = (MOB_MEDIUM * 2) - 1 var/contains_body = 0 @@ -79,7 +79,7 @@ /obj/structure/closet/body_bag/close() if(..()) - density = 0 + density = FALSE return 1 return 0 diff --git a/code/game/objects/items/devices/chameleonproj.dm b/code/game/objects/items/devices/chameleonproj.dm index b8dc28b2e9..9a9e7ea0ae 100644 --- a/code/game/objects/items/devices/chameleonproj.dm +++ b/code/game/objects/items/devices/chameleonproj.dm @@ -86,8 +86,8 @@ /obj/effect/dummy/chameleon name = "" desc = "" - density = 0 - anchored = 1 + density = FALSE + anchored = TRUE var/can_move = 1 var/obj/item/device/chameleon/master = null diff --git a/code/game/objects/items/devices/geiger.dm b/code/game/objects/items/devices/geiger.dm index 99a5bc5fdd..2b7a31eb2c 100644 --- a/code/game/objects/items/devices/geiger.dm +++ b/code/game/objects/items/devices/geiger.dm @@ -94,7 +94,7 @@ icon = 'icons/obj/device.dmi' icon_state = "geiger_wall" item_state = "geiger_wall" - anchored = 1 + anchored = TRUE scanning = 1 radiation_count = 0 plane = TURF_PLANE diff --git a/code/game/objects/items/devices/powersink.dm b/code/game/objects/items/devices/powersink.dm index 809418b023..cc902d3b6d 100644 --- a/code/game/objects/items/devices/powersink.dm +++ b/code/game/objects/items/devices/powersink.dm @@ -38,7 +38,7 @@ to_chat(user, "No exposed cable here to attach to.") return else - anchored = 1 + anchored = TRUE mode = 1 src.visible_message("[user] attaches [src] to the cable!") playsound(src, I.usesound, 50, 1) @@ -50,7 +50,7 @@ if (mode == 2) STOP_PROCESSING(SSobj, src) // Now the power sink actually stops draining the station's power if you unhook it. --NeoFite STOP_PROCESSING_POWER_OBJECT(src) - anchored = 0 + anchored = FALSE mode = 0 src.visible_message("[user] detaches [src] from the cable!") set_light(0) diff --git a/code/game/objects/items/devices/radio/intercom.dm b/code/game/objects/items/devices/radio/intercom.dm index 62d8cf63ab..b62033865a 100644 --- a/code/game/objects/items/devices/radio/intercom.dm +++ b/code/game/objects/items/devices/radio/intercom.dm @@ -5,7 +5,7 @@ icon = 'icons/obj/radio_vr.dmi' //VOREStation Edit - New Icon icon_state = "intercom" layer = ABOVE_WINDOW_LAYER - anchored = 1 + anchored = TRUE w_class = ITEMSIZE_LARGE canhear_range = 7 //VOREStation Edit flags = NOBLOODY diff --git a/code/game/objects/items/devices/translocator_vr.dm b/code/game/objects/items/devices/translocator_vr.dm index 8586c7dbf9..cb4ebbaf0f 100644 --- a/code/game/objects/items/devices/translocator_vr.dm +++ b/code/game/objects/items/devices/translocator_vr.dm @@ -397,7 +397,7 @@ not carry this around."}, "OOC Warning", list("Take It","Leave It")) icon = 'icons/obj/radio_vr.dmi' icon_state = "floor_beacon" w_class = ITEMSIZE_HUGE - anchored = 1 + anchored = TRUE GLOBAL_LIST_BOILERPLATE(premade_tele_beacons, /obj/item/device/perfect_tele_beacon/stationary) @@ -462,7 +462,7 @@ GLOBAL_LIST_BOILERPLATE(premade_tele_beacons, /obj/item/device/perfect_tele_beac icon_state = "frontiertrans" beacons_left = 1 //Just one battery_lock = 1 - unacidable = 1 + unacidable = TRUE failure_chance = 0 //Percent var/phase_power = 75 diff --git a/code/game/objects/items/poi_items.dm b/code/game/objects/items/poi_items.dm index 4300eeed71..2c05f0cfca 100644 --- a/code/game/objects/items/poi_items.dm +++ b/code/game/objects/items/poi_items.dm @@ -64,7 +64,7 @@ icon = 'icons/obj/closets/poireactor.dmi' closet_appearance = null catalogue_data = list(/datum/category_item/catalogue/information/objects/oldreactor) - climbable = 0 + climbable = FALSE starts_with = list( /obj/item/weapon/fuel_assembly/deuterium = 6) @@ -110,5 +110,5 @@ icon = 'icons/obj/atmos.dmi' icon_state = "yellow-1" catalogue_data = list(/datum/category_item/catalogue/information/objects/growthcanister) - anchored = 0 - density = 1 \ No newline at end of file + anchored = FALSE + density = TRUE \ No newline at end of file diff --git a/code/game/objects/items/shooting_range.dm b/code/game/objects/items/shooting_range.dm index 9d7414a56e..bf132c7cf9 100644 --- a/code/game/objects/items/shooting_range.dm +++ b/code/game/objects/items/shooting_range.dm @@ -4,7 +4,7 @@ desc = "A shooting target." icon = 'icons/obj/objects.dmi' icon_state = "target_h" - density = 0 + density = FALSE var/hp = 1800 var/icon/virtualIcon var/list/bulletholes = list() @@ -51,16 +51,8 @@ if(stake) if(stake.pinned_target) -<<<<<<< HEAD - stake.density = 1 - density = 0 -||||||| parent of 035a67b3d1... Merge pull request #11110 from MarinaGryphon/codequality/bool-fixes-2 - stake.density = 1 - density = FALSE -======= stake.density = TRUE density = FALSE ->>>>>>> 035a67b3d1... Merge pull request #11110 from MarinaGryphon/codequality/bool-fixes-2 layer = OBJ_LAYER loc = user.loc diff --git a/code/game/objects/items/toys/toys.dm b/code/game/objects/items/toys/toys.dm index 0af6443e64..4195f421e0 100644 --- a/code/game/objects/items/toys/toys.dm +++ b/code/game/objects/items/toys/toys.dm @@ -263,8 +263,8 @@ desc = "" icon = 'icons/obj/toy.dmi' icon_state = "null" - anchored = 1 - density = 0 + anchored = TRUE + density = FALSE /* * Toy swords @@ -827,8 +827,8 @@ desc = "A very generic plushie. It seems to not want to exist." icon = 'icons/obj/toy.dmi' icon_state = "ianplushie" - anchored = 0 - density = 1 + anchored = FALSE + density = TRUE var/phrase = "I don't want to exist anymore!" var/searching = FALSE var/opened = FALSE // has this been slit open? this will allow you to store an object in a plushie. @@ -1537,8 +1537,8 @@ desc = "A generic balloon. How boring." icon = 'icons/obj/toy.dmi' icon_state = "ghostballoon" - anchored = 0 - density = 0 + anchored = FALSE + density = FALSE /obj/structure/balloon/attack_hand(mob/user) user.setClickCooldown(DEFAULT_ATTACK_COOLDOWN) diff --git a/code/game/objects/items/uav.dm b/code/game/objects/items/uav.dm index cd23ffc624..b1ff2723a8 100644 --- a/code/game/objects/items/uav.dm +++ b/code/game/objects/items/uav.dm @@ -12,7 +12,7 @@ var/obj/item/weapon/cell/cell var/cell_type = null //Can put a starting cell here - density = 1 //Is dense, but not anchored, so you can swap with it + density = TRUE //Is dense, but not anchored, so you can swap with it slowdown = 1.5 //Heevvee. health = 100 diff --git a/code/game/objects/items/weapons/RSF.dm b/code/game/objects/items/weapons/RSF.dm index a12ba0106a..7c0b36ccc1 100644 --- a/code/game/objects/items/weapons/RSF.dm +++ b/code/game/objects/items/weapons/RSF.dm @@ -11,8 +11,8 @@ RSF icon = 'icons/obj/tools_vr.dmi' //VOREStation Edit icon_state = "rsf" //VOREStation Edit opacity = 0 - density = 0 - anchored = 0.0 + density = FALSE + anchored = FALSE matter = list(DEFAULT_WALL_MATERIAL = 25000) var/stored_matter = 30 var/mode = 1 diff --git a/code/game/objects/items/weapons/augment_items.dm b/code/game/objects/items/weapons/augment_items.dm index c0df9c9688..bfef21ae13 100644 --- a/code/game/objects/items/weapons/augment_items.dm +++ b/code/game/objects/items/weapons/augment_items.dm @@ -18,7 +18,7 @@ w_class = ITEMSIZE_SMALL force = 15 armor_penetration = 25 - sharp = 1 + sharp = TRUE attack_verb = list("attacked", "slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut") defend_chance = 10 projectile_parry_chance = 5 @@ -31,7 +31,7 @@ w_class = ITEMSIZE_HUGE force = 30 armor_penetration = 15 - edge = 1 + edge = TRUE pry = 1 defend_chance = 40 projectile_parry_chance = 20 \ No newline at end of file diff --git a/code/game/objects/items/weapons/circuitboards/circuitboard.dm b/code/game/objects/items/weapons/circuitboards/circuitboard.dm index 8b913eaf45..c1989902a2 100644 --- a/code/game/objects/items/weapons/circuitboards/circuitboard.dm +++ b/code/game/objects/items/weapons/circuitboards/circuitboard.dm @@ -9,8 +9,8 @@ icon = 'icons/obj/module.dmi' icon_state = "id_mod" origin_tech = list(TECH_DATA = 2) - density = 0 - anchored = 0 + density = FALSE + anchored = FALSE w_class = ITEMSIZE_SMALL force = 5.0 throwforce = 5.0 diff --git a/code/game/objects/items/weapons/grenades/chem_grenade.dm b/code/game/objects/items/weapons/grenades/chem_grenade.dm index 2162941ac3..744cc130e2 100644 --- a/code/game/objects/items/weapons/grenades/chem_grenade.dm +++ b/code/game/objects/items/weapons/grenades/chem_grenade.dm @@ -6,7 +6,7 @@ w_class = ITEMSIZE_SMALL force = 2.0 det_time = null - unacidable = 1 + unacidable = TRUE var/stage = 0 var/state = 0 diff --git a/code/game/objects/items/weapons/implants/implantchair.dm b/code/game/objects/items/weapons/implants/implantchair.dm index 8538980b9c..34110d5924 100644 --- a/code/game/objects/items/weapons/implants/implantchair.dm +++ b/code/game/objects/items/weapons/implants/implantchair.dm @@ -5,9 +5,9 @@ desc = "Used to implant occupants with loyalty implants." icon = 'icons/obj/machines/implantchair.dmi' icon_state = "implantchair" - density = 1 + density = TRUE opacity = 0 - anchored = 1 + anchored = TRUE var/ready = 1 var/malfunction = 0 diff --git a/code/game/objects/items/weapons/material/chainsaw.dm b/code/game/objects/items/weapons/material/chainsaw.dm index d30f4eaa13..e6d71aebb6 100644 --- a/code/game/objects/items/weapons/material/chainsaw.dm +++ b/code/game/objects/items/weapons/material/chainsaw.dm @@ -41,8 +41,8 @@ attack_verb = list("shredded", "ripped", "torn") playsound(src, 'sound/weapons/chainsaw_startup.ogg',40,1) force = active_force - edge = 1 - sharp = 1 + edge = TRUE + sharp = TRUE on = 1 update_icon() else @@ -54,8 +54,8 @@ attack_verb = list("bluntly hit", "beat", "knocked") playsound(src, 'sound/weapons/chainsaw_turnoff.ogg',40,1) force = inactive_force - edge = 0 - sharp = 0 + edge = FALSE + sharp = FALSE on = 0 update_icon() diff --git a/code/game/objects/items/weapons/material/knives.dm b/code/game/objects/items/weapons/material/knives.dm index 44ffb44e39..9a939bc290 100644 --- a/code/game/objects/items/weapons/material/knives.dm +++ b/code/game/objects/items/weapons/material/knives.dm @@ -14,8 +14,8 @@ /obj/item/weapon/material/butterfly/update_force() if(active) - edge = 1 - sharp = 1 + edge = TRUE + sharp = TRUE ..() //Updates force. throwforce = max(3,force-3) hitsound = 'sound/weapons/bladeslice.ogg' @@ -24,8 +24,8 @@ attack_verb = list("attacked", "slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut") else force = 3 - edge = 0 - sharp = 0 + edge = FALSE + sharp = FALSE hitsound = initial(hitsound) icon_state = initial(icon_state) w_class = initial(w_class) @@ -63,8 +63,8 @@ icon = 'icons/obj/kitchen.dmi' icon_state = "knife" desc = "A general purpose Chef's Knife made by SpaceCook Incorporated. Guaranteed to stay sharp for years to come." - sharp = 1 - edge = 1 + sharp = TRUE + edge = TRUE force_divisor = 0.15 // 9 when wielded with hardness 60 (steel) matter = list(MAT_STEEL = 12000) origin_tech = list(TECH_MATERIAL = 1) diff --git a/code/game/objects/items/weapons/material/material_weapons.dm b/code/game/objects/items/weapons/material/material_weapons.dm index 544706fb61..f300cb068e 100644 --- a/code/game/objects/items/weapons/material/material_weapons.dm +++ b/code/game/objects/items/weapons/material/material_weapons.dm @@ -8,8 +8,8 @@ throw_speed = 3 throw_range = 7 w_class = ITEMSIZE_NORMAL - sharp = 0 - edge = 0 + sharp = FALSE + edge = FALSE item_icons = list( slot_l_hand_str = 'icons/mob/items/lefthand_material.dmi', slot_r_hand_str = 'icons/mob/items/righthand_material.dmi', @@ -122,8 +122,8 @@ playsound(src, "shatter", 70, 1) dulled = 1 if(is_sharp() || has_edge()) - sharp = 0 - edge = 0 + sharp = FALSE + edge = FALSE /obj/item/weapon/material/proc/repair(var/repair_amount, var/repair_time, mob/living/user) if(!fragile) diff --git a/code/game/objects/items/weapons/material/misc.dm b/code/game/objects/items/weapons/material/misc.dm index 301fff7600..d16627d8d9 100644 --- a/code/game/objects/items/weapons/material/misc.dm +++ b/code/game/objects/items/weapons/material/misc.dm @@ -1,7 +1,7 @@ /obj/item/weapon/material/harpoon name = "harpoon" - sharp = 1 - edge = 0 + sharp = TRUE + edge = FALSE desc = "Tharr she blows!" icon_state = "harpoon" item_state = "harpoon" @@ -16,8 +16,8 @@ force_divisor = 0.2 // 12 with hardness 60 (steel) thrown_force_divisor = 0.75 // 15 with weight 20 (steel) w_class = ITEMSIZE_SMALL - sharp = 1 - edge = 1 + sharp = TRUE + edge = TRUE origin_tech = list(TECH_MATERIAL = 2, TECH_COMBAT = 1) attack_verb = list("chopped", "torn", "cut") applies_material_colour = 0 diff --git a/code/game/objects/items/weapons/material/shards.dm b/code/game/objects/items/weapons/material/shards.dm index cbf03b4535..45a83ca1da 100644 --- a/code/game/objects/items/weapons/material/shards.dm +++ b/code/game/objects/items/weapons/material/shards.dm @@ -6,8 +6,8 @@ desc = "Made of nothing. How does this even exist?" // set based on material, if this desc is visible it's a bug (shards default to being made of glass) icon_state = "large" randpixel = 8 - sharp = 1 - edge = 1 + sharp = TRUE + edge = TRUE w_class = ITEMSIZE_SMALL force_divisor = 0.25 // 7.5 with hardness 30 (glass) thrown_force_divisor = 0.5 diff --git a/code/game/objects/items/weapons/material/swords.dm b/code/game/objects/items/weapons/material/swords.dm index 4454b0b066..b2d26f823e 100644 --- a/code/game/objects/items/weapons/material/swords.dm +++ b/code/game/objects/items/weapons/material/swords.dm @@ -5,8 +5,8 @@ slot_flags = SLOT_BELT force_divisor = 0.7 // 42 when wielded with hardnes 60 (steel) thrown_force_divisor = 0.5 // 10 when thrown with weight 20 (steel) - sharp = 1 - edge = 1 + sharp = TRUE + edge = TRUE attack_verb = list("attacked", "slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut") hitsound = 'sound/weapons/bladeslice.ogg' drop_sound = 'sound/items/drop/sword.ogg' diff --git a/code/game/objects/items/weapons/material/thrown.dm b/code/game/objects/items/weapons/material/thrown.dm index 0e632de06b..dcfaad5801 100644 --- a/code/game/objects/items/weapons/material/thrown.dm +++ b/code/game/objects/items/weapons/material/thrown.dm @@ -6,8 +6,8 @@ thrown_force_divisor = 0.75 // 15 with weight 20 (steel) throw_speed = 10 throw_range = 15 - sharp = 1 - edge = 1 + sharp = TRUE + edge = TRUE /obj/item/weapon/material/star/New() ..() diff --git a/code/game/objects/items/weapons/material/twohanded.dm b/code/game/objects/items/weapons/material/twohanded.dm index 00f2d406a0..180b95b802 100644 --- a/code/game/objects/items/weapons/material/twohanded.dm +++ b/code/game/objects/items/weapons/material/twohanded.dm @@ -90,9 +90,9 @@ unwielded_force_divisor = 0.25 force_divisor = 0.7 // 10/42 with hardness 60 (steel) and 0.25 unwielded divisor dulled_divisor = 0.75 //Still metal on a stick - sharp = 1 - edge = 1 - w_class = ITEMSIZE_HUGE //CHOMP Edit + sharp = TRUE + edge = TRUE + w_class = ITEMSIZE_LARGE slot_flags = SLOT_BACK force_wielded = 30 attack_verb = list("attacked", "chopped", "cleaved", "torn", "cut") @@ -153,8 +153,8 @@ unwielded_force_divisor = 0.375 thrown_force_divisor = 1.5 // 22.5 when thrown with weight 15 (glass) throw_speed = 3 - edge = 0 - sharp = 1 + edge = FALSE + sharp = TRUE hitsound = 'sound/weapons/bladeslice.ogg' mob_throw_hit_sound = 'sound/weapons/pierce.ogg' attack_verb = list("attacked", "poked", "jabbed", "torn", "gored") @@ -176,8 +176,8 @@ thrown_force_divisor = 1 default_material = "MAT_STEEL" fragile = 0 - sharp = 1 - edge = 0 + sharp = TRUE + edge = FALSE /obj/item/weapon/material/twohanded/riding_crop name = "riding crop" diff --git a/code/game/objects/items/weapons/melee/energy.dm b/code/game/objects/items/weapons/melee/energy.dm index 45d01fa99d..a3d56da488 100644 --- a/code/game/objects/items/weapons/melee/energy.dm +++ b/code/game/objects/items/weapons/melee/energy.dm @@ -4,8 +4,8 @@ var/active_throwforce var/active_w_class var/active_embed_chance = 0 //In the off chance one of these is supposed to embed, you can just tweak this var - sharp = 0 - edge = 0 + sharp = FALSE + edge = FALSE armor_penetration = 50 flags = NOCONDUCT | NOBLOODY var/lrange = 2 @@ -54,8 +54,8 @@ embed_chance = active_embed_chance force = active_force throwforce = active_throwforce - sharp = 1 - edge = 1 + sharp = TRUE + edge = TRUE w_class = active_w_class playsound(src, 'sound/weapons/saberon.ogg', 50, 1) update_icon() @@ -224,8 +224,8 @@ w_class = ITEMSIZE_NORMAL origin_tech = list(TECH_MAGNET = 3, TECH_COMBAT = 4) attack_verb = list("attacked", "chopped", "cleaved", "torn", "cut") - sharp = 1 - edge = 1 + sharp = TRUE + edge = TRUE can_cleave = TRUE /obj/item/weapon/melee/energy/axe/activate(mob/living/user) @@ -276,8 +276,8 @@ w_class = ITEMSIZE_SMALL flags = NOBLOODY origin_tech = list(TECH_MAGNET = 3, TECH_ILLEGAL = 4) - sharp = 1 - edge = 1 + sharp = TRUE + edge = TRUE colorable = TRUE drop_sound = 'sound/items/drop/sword.ogg' pickup_sound = 'sound/items/pickup/sword.ogg' @@ -358,8 +358,8 @@ active_force = 5 active_throwforce = 3 active_embed_chance = 0 - sharp = 1 - edge = 1 + sharp = TRUE + edge = TRUE armor_penetration = 0 flags = NOBLOODY lrange = 2 @@ -427,9 +427,9 @@ item_state = "blade" force = 40 //Normal attacks deal very high damage - about the same as wielded fire axe armor_penetration = 100 - sharp = 1 - edge = 1 - anchored = 1 // Never spawned outside of inventory, should be fine. + sharp = TRUE + edge = TRUE + anchored = TRUE // Never spawned outside of inventory, should be fine. throwforce = 1 //Throwing or dropping the item deletes it. throw_speed = 1 throw_range = 1 @@ -514,8 +514,8 @@ desc = "Concentrated energy forming a sharp tip at the end of a long rod." icon_state = "espear" armor_penetration = 75 - sharp = 1 - edge = 1 + sharp = TRUE + edge = TRUE force = 5 throwforce = 10 throw_speed = 7 diff --git a/code/game/objects/items/weapons/melee/misc.dm b/code/game/objects/items/weapons/melee/misc.dm index 781ea5a463..54413bb6e0 100644 --- a/code/game/objects/items/weapons/melee/misc.dm +++ b/code/game/objects/items/weapons/melee/misc.dm @@ -59,8 +59,8 @@ force = 30 throwforce = 10 w_class = ITEMSIZE_NORMAL - sharp = 1 - edge = 1 + sharp = TRUE + edge = TRUE attack_verb = list("attacked", "slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut") hitsound = 'sound/weapons/bladeslice.ogg' can_speak = 1 diff --git a/code/game/objects/items/weapons/melee/misc_vr.dm b/code/game/objects/items/weapons/melee/misc_vr.dm index fd228ba9c4..b14a36e1f4 100644 --- a/code/game/objects/items/weapons/melee/misc_vr.dm +++ b/code/game/objects/items/weapons/melee/misc_vr.dm @@ -10,7 +10,7 @@ force = 15 throwforce = 10 w_class = ITEMSIZE_NORMAL - sharp = 1 - edge = 0 + sharp = TRUE + edge = FALSE attack_verb = list("stabbed", "lunged at", "dextrously struck", "sliced", "lacerated", "impaled", "diced", "charioted") hitsound = 'sound/weapons/bladeslice.ogg' \ No newline at end of file diff --git a/code/game/objects/items/weapons/mop_deploy.dm b/code/game/objects/items/weapons/mop_deploy.dm index 2e2ea6aebc..95de86abee 100644 --- a/code/game/objects/items/weapons/mop_deploy.dm +++ b/code/game/objects/items/weapons/mop_deploy.dm @@ -4,7 +4,7 @@ icon = 'icons/obj/janitor.dmi' icon_state = "mop" force = 3 - anchored = 1 // Never spawned outside of inventory, should be fine. + anchored = TRUE // Never spawned outside of inventory, should be fine. throwforce = 1 //Throwing or dropping the item deletes it. throw_speed = 1 throw_range = 1 diff --git a/code/game/objects/items/weapons/paint.dm b/code/game/objects/items/weapons/paint.dm index 91c173d530..80ec8d7f7c 100644 --- a/code/game/objects/items/weapons/paint.dm +++ b/code/game/objects/items/weapons/paint.dm @@ -14,7 +14,7 @@ var/global/list/cached_icons = list() amount_per_transfer_from_this = 10 possible_transfer_amounts = list(10,20,30,60) volume = 60 - unacidable = 0 + unacidable = FALSE flags = OPENCONTAINER var/paint_type = "red" diff --git a/code/game/objects/items/weapons/policetape.dm b/code/game/objects/items/weapons/policetape.dm index f9b0c11a17..cb00c93fd0 100644 --- a/code/game/objects/items/weapons/policetape.dm +++ b/code/game/objects/items/weapons/policetape.dm @@ -32,7 +32,7 @@ var/list/tape_roll_applications = list() /obj/item/tape name = "tape" icon = 'icons/policetape.dmi' - anchored = 1 + anchored = TRUE layer = WINDOW_LAYER var/lifted = 0 var/crumpled = 0 diff --git a/code/game/objects/items/weapons/storage/bags.dm b/code/game/objects/items/weapons/storage/bags.dm index 5e648e967c..f5ee30319b 100644 --- a/code/game/objects/items/weapons/storage/bags.dm +++ b/code/game/objects/items/weapons/storage/bags.dm @@ -21,7 +21,7 @@ allow_quick_gather = 1 allow_quick_empty = 1 display_contents_with_number = 0 // UNStABLE AS FuCK, turn on when it stops crashing clients - use_to_pickup = 1 + use_to_pickup = TRUE slot_flags = SLOT_BELT drop_sound = 'sound/items/drop/backpack.ogg' pickup_sound = 'sound/items/pickup/backpack.ogg' diff --git a/code/game/objects/items/weapons/storage/boxes.dm b/code/game/objects/items/weapons/storage/boxes.dm index 2d905dcecc..2ecced653a 100644 --- a/code/game/objects/items/weapons/storage/boxes.dm +++ b/code/game/objects/items/weapons/storage/boxes.dm @@ -497,7 +497,7 @@ storage_slots = 24 can_hold = list(/obj/item/weapon/light/tube, /obj/item/weapon/light/bulb) max_storage_space = ITEMSIZE_COST_SMALL * 24 //holds 24 items of w_class 2 - use_to_pickup = 1 // for picking up broken bulbs, not that most people will try + use_to_pickup = TRUE // for picking up broken bulbs, not that most people will try /obj/item/weapon/storage/box/lights/bulbs starts_with = list(/obj/item/weapon/light/bulb = 24) @@ -525,7 +525,7 @@ max_w_class = ITEMSIZE_NORMAL can_hold = list(/obj/item/organ) max_storage_space = ITEMSIZE_COST_NORMAL * 5 // Formally 21. Odd numbers are bad. - use_to_pickup = 1 // for picking up broken bulbs, not that most people will try + use_to_pickup = TRUE // for picking up broken bulbs, not that most people will try /obj/item/weapon/storage/box/freezer/red icon_state = "portafreezer_red" diff --git a/code/game/objects/items/weapons/storage/firstaid.dm b/code/game/objects/items/weapons/storage/firstaid.dm index 2bc47b43f5..84c1637a3e 100644 --- a/code/game/objects/items/weapons/storage/firstaid.dm +++ b/code/game/objects/items/weapons/storage/firstaid.dm @@ -182,7 +182,7 @@ can_hold = list(/obj/item/weapon/reagent_containers/pill,/obj/item/weapon/dice,/obj/item/weapon/paper) allow_quick_gather = 1 allow_quick_empty = 1 - use_to_pickup = 1 + use_to_pickup = TRUE use_sound = 'sound/items/storage/pillbottle.ogg' max_storage_space = ITEMSIZE_COST_TINY * 14 max_w_class = ITEMSIZE_TINY diff --git a/code/game/objects/items/weapons/storage/laundry_basket.dm b/code/game/objects/items/weapons/storage/laundry_basket.dm index e8e2cc59e4..db6b304f31 100644 --- a/code/game/objects/items/weapons/storage/laundry_basket.dm +++ b/code/game/objects/items/weapons/storage/laundry_basket.dm @@ -14,7 +14,7 @@ max_w_class = ITEMSIZE_LARGE max_storage_space = ITEMSIZE_COST_NORMAL * 8 storage_slots = 20 - use_to_pickup = 1 + use_to_pickup = TRUE allow_quick_empty = 1 allow_quick_gather = 1 collection_mode = 1 @@ -79,7 +79,7 @@ icon = 'icons/obj/weapons.dmi' icon_state = "offhand" name = "second hand" - use_to_pickup = 0 + use_to_pickup = FALSE /obj/item/weapon/storage/laundry_basket/offhand/dropped(mob/user as mob) user.drop_from_inventory(linked) diff --git a/code/game/objects/items/weapons/storage/secure.dm b/code/game/objects/items/weapons/storage/secure.dm index 957a3c73f6..36093fa2cf 100644 --- a/code/game/objects/items/weapons/storage/secure.dm +++ b/code/game/objects/items/weapons/storage/secure.dm @@ -186,8 +186,8 @@ force = 8.0 w_class = ITEMSIZE_NO_CONTAINER max_w_class = ITEMSIZE_LARGE // This was 8 previously... - anchored = 1.0 - density = 0 + anchored = TRUE + density = FALSE cant_hold = list(/obj/item/weapon/storage/secure/briefcase) starts_with = list( /obj/item/weapon/paper, diff --git a/code/game/objects/items/weapons/stunbaton.dm b/code/game/objects/items/weapons/stunbaton.dm index 360cefe280..7b9521c41f 100644 --- a/code/game/objects/items/weapons/stunbaton.dm +++ b/code/game/objects/items/weapons/stunbaton.dm @@ -6,8 +6,8 @@ item_state = "baton" slot_flags = SLOT_BELT force = 15 - sharp = 0 - edge = 0 + sharp = FALSE + edge = FALSE throwforce = 7 flags = NOCONDUCT w_class = ITEMSIZE_NORMAL diff --git a/code/game/objects/items/weapons/surgery_tools.dm b/code/game/objects/items/weapons/surgery_tools.dm index 89e150330a..61a7448334 100644 --- a/code/game/objects/items/weapons/surgery_tools.dm +++ b/code/game/objects/items/weapons/surgery_tools.dm @@ -98,8 +98,8 @@ desc = "Cut, cut, and once more cut." icon_state = "scalpel" force = 10.0 - sharp = 1 - edge = 1 + sharp = TRUE + edge = TRUE w_class = ITEMSIZE_TINY slot_flags = SLOT_EARS throwforce = 5.0 @@ -172,8 +172,8 @@ origin_tech = list(TECH_MATERIAL = 1, TECH_BIO = 1) matter = list(MAT_STEEL = 20000,MAT_GLASS = 10000) attack_verb = list("attacked", "slashed", "sawed", "cut") - sharp = 1 - edge = 1 + sharp = TRUE + edge = TRUE /obj/item/weapon/surgical/circular_saw/manager name = "energetic bone diverter" diff --git a/code/game/objects/items/weapons/tools/screwdriver.dm b/code/game/objects/items/weapons/tools/screwdriver.dm index d1be9f9ae6..7b673c0b7e 100644 --- a/code/game/objects/items/weapons/tools/screwdriver.dm +++ b/code/game/objects/items/weapons/tools/screwdriver.dm @@ -19,7 +19,7 @@ pickup_sound = 'sound/items/pickup/screwdriver.ogg' matter = list(MAT_STEEL = 75) attack_verb = list("stabbed") - sharp = 1 + sharp = TRUE toolspeed = 1 tool_qualities = list(TOOL_SCREWDRIVER) var/random_color = TRUE diff --git a/code/game/objects/items/weapons/tools/wirecutters.dm b/code/game/objects/items/weapons/tools/wirecutters.dm index ea9a0c47d5..a8f64d4f10 100644 --- a/code/game/objects/items/weapons/tools/wirecutters.dm +++ b/code/game/objects/items/weapons/tools/wirecutters.dm @@ -19,8 +19,8 @@ usesound = 'sound/items/wirecutter.ogg' drop_sound = 'sound/items/drop/wirecutter.ogg' pickup_sound = 'sound/items/pickup/wirecutter.ogg' - sharp = 1 - edge = 1 + sharp = TRUE + edge = TRUE toolspeed = 1 tool_qualities = list(TOOL_WIRECUTTER) var/random_color = TRUE diff --git a/code/game/objects/items/weapons/traps.dm b/code/game/objects/items/weapons/traps.dm index d3f9ce5ed2..0cf9db2b57 100644 --- a/code/game/objects/items/weapons/traps.dm +++ b/code/game/objects/items/weapons/traps.dm @@ -50,7 +50,7 @@ deployed = 1 user.drop_from_inventory(src) update_icon() - anchored = 1 + anchored = TRUE /obj/item/weapon/beartrap/attack_hand(mob/user as mob) if(has_buckled_mobs() && can_use(user)) @@ -63,7 +63,7 @@ user.visible_message("[victim] has been freed from \the [src] by [user].") for(var/A in buckled_mobs) unbuckle_mob(A) - anchored = 0 + anchored = FALSE else if(deployed && can_use(user)) user.visible_message( "[user] starts to disarm \the [src].", @@ -78,7 +78,7 @@ "You have disarmed \the [src]!" ) deployed = 0 - anchored = 0 + anchored = FALSE update_icon() else ..() @@ -116,7 +116,7 @@ //trap the victim in place set_dir(L.dir) - can_buckle = 1 + can_buckle = TRUE buckle_mob(L) L.Stun(stun_length) to_chat(L, "The steel jaws of \the [src] bite into you, trapping you in place!") @@ -137,7 +137,7 @@ ) attack_mob(L) if(!has_buckled_mobs()) - anchored = 0 + anchored = FALSE deployed = 0 update_icon() ..() @@ -210,7 +210,7 @@ "[user] has collected \the [src].", "You have collected \the [src]!" ) - anchored = 0 + anchored = FALSE update_icon() else ..() @@ -235,7 +235,7 @@ playsound(src, 'sound/items/Wirecutter.ogg',40, 1) user.drop_from_inventory(src) forceMove(get_turf(src)) - anchored = 1 + anchored = TRUE update_icon() /obj/item/weapon/material/barbedwire/attackby(obj/item/W as obj, mob/user as mob) diff --git a/code/game/objects/items/weapons/weaponry.dm b/code/game/objects/items/weapons/weaponry.dm index be45bfa822..28e38a0d70 100644 --- a/code/game/objects/items/weapons/weaponry.dm +++ b/code/game/objects/items/weapons/weaponry.dm @@ -94,12 +94,12 @@ icon = 'icons/effects/effects.dmi' icon_state = "energynet" - density = 1 + density = TRUE opacity = 0 mouse_opacity = 1 - anchored = 0 + anchored = FALSE - can_buckle = 1 + can_buckle = TRUE buckle_lying = 0 buckle_dir = SOUTH diff --git a/code/game/objects/mob_spawner_vr.dm b/code/game/objects/mob_spawner_vr.dm index 1b17bda2e2..3693bf85e2 100644 --- a/code/game/objects/mob_spawner_vr.dm +++ b/code/game/objects/mob_spawner_vr.dm @@ -3,7 +3,7 @@ desc = "This shouldn't be seen, yell at a dev." icon = 'icons/effects/effects.dmi' icon_state = "rift" - anchored = 1 + anchored = TRUE var/last_spawn = 0 var/spawn_delay = 10 MINUTES @@ -153,7 +153,7 @@ It also makes it so a ghost wont know where all the goodies/mobs are. mob_faction = "wild animal" total_spawns = -1 destructible = 0 - anchored = 1 + anchored = TRUE invisibility = 101 spawn_types = list( /mob/living/simple_mob/animal/passive/gaslamp = 20, @@ -171,7 +171,7 @@ It also makes it so a ghost wont know where all the goodies/mobs are. total_spawns = -1 destructible = 1 health = 50 - anchored = 1 + anchored = TRUE icon = 'icons/mob/actions.dmi' icon_state = "alien_egg" spawn_types = list( @@ -190,7 +190,7 @@ It also makes it so a ghost wont know where all the goodies/mobs are. total_spawns = 1 destructible = 1 health = 50 - anchored = 1 + anchored = TRUE icon = 'icons/mob/actions.dmi' icon_state = "alien_egg" spawn_types = list( diff --git a/code/game/objects/objs.dm b/code/game/objects/objs.dm index 9f16a6b9c9..ac7fe2b209 100644 --- a/code/game/objects/objs.dm +++ b/code/game/objects/objs.dm @@ -5,12 +5,12 @@ //Used to store information about the contents of the object. var/list/matter var/w_class // Size of the object. - var/unacidable = 0 //universal "unacidabliness" var, here so you can use it in any obj. + var/unacidable = FALSE //universal "unacidabliness" var, here so you can use it in any obj. animate_movement = 2 var/throwforce = 1 var/catchable = 1 // can it be caught on throws/flying? - var/sharp = 0 // whether this object cuts - var/edge = 0 // whether this object is more likely to dismember + var/sharp = FALSE // whether this object cuts + var/edge = FALSE // whether this object is more likely to dismember var/pry = 0 //Used in attackby() to open doors var/in_use = 0 // If we have a user using us, this will be set on. We will check if the user has stopped using us, and thus stop updating and LAGGING EVERYTHING! var/damtype = "brute" diff --git a/code/game/objects/structures/barricades.dm b/code/game/objects/structures/barricades.dm index c60c48375e..098b126d00 100644 --- a/code/game/objects/structures/barricades.dm +++ b/code/game/objects/structures/barricades.dm @@ -4,8 +4,8 @@ desc = "This space is blocked off by a barricade." icon = 'icons/obj/structures.dmi' icon_state = "barricade" - anchored = 1.0 - density = 1.0 + anchored = TRUE + density = TRUE var/health = 100 var/maxhealth = 100 var/datum/material/material diff --git a/code/game/objects/structures/barsign.dm b/code/game/objects/structures/barsign.dm index f064f983b7..e692170fc8 100644 --- a/code/game/objects/structures/barsign.dm +++ b/code/game/objects/structures/barsign.dm @@ -4,7 +4,7 @@ plane = ABOVE_PLANE icon_state = "empty" appearance_flags = 0 - anchored = 1 + anchored = TRUE var/cult = 0 /obj/structure/sign/double/barsign/proc/get_valid_states(initial=1) diff --git a/code/game/objects/structures/bedsheet_bin.dm b/code/game/objects/structures/bedsheet_bin.dm index c7bab19f0f..50869c4497 100644 --- a/code/game/objects/structures/bedsheet_bin.dm +++ b/code/game/objects/structures/bedsheet_bin.dm @@ -164,7 +164,7 @@ LINEN BINS desc = "A linen bin. It looks rather cosy." icon = 'icons/obj/structures.dmi' icon_state = "linenbin-full" - anchored = 1 + anchored = TRUE var/amount = 20 var/list/sheets = list() var/obj/item/hidden = null diff --git a/code/game/objects/structures/catwalk.dm b/code/game/objects/structures/catwalk.dm index e77abbaa6f..abd0665898 100644 --- a/code/game/objects/structures/catwalk.dm +++ b/code/game/objects/structures/catwalk.dm @@ -5,8 +5,8 @@ icon_state = "catwalk" plane = DECAL_PLANE layer = DECAL_LAYER - density = 0 - anchored = 1.0 + density = FALSE + anchored = TRUE var/hatch_open = FALSE var/plating_color = null var/obj/item/stack/tile/plated_tile = null @@ -137,8 +137,8 @@ name = "plated catwalk spawner" icon = 'icons/turf/catwalks.dmi' icon_state = "catwalk_plated" - density = 1 - anchored = 1.0 + density = TRUE + anchored = TRUE var/activated = FALSE plane = DECAL_PLANE layer = DECAL_LAYER diff --git a/code/game/objects/structures/crates_lockers/__closets.dm b/code/game/objects/structures/crates_lockers/__closets.dm index f111d19196..fb27ea6977 100644 --- a/code/game/objects/structures/crates_lockers/__closets.dm +++ b/code/game/objects/structures/crates_lockers/__closets.dm @@ -4,7 +4,7 @@ desc = "It's a basic storage unit." icon = 'icons/obj/closets/bases/closet.dmi' icon_state = "base" - density = 1 + density = TRUE w_class = ITEMSIZE_HUGE layer = UNDER_JUNK_LAYER blocks_emissive = EMISSIVE_BLOCK_GENERIC diff --git a/code/game/objects/structures/crates_lockers/closets/coffin.dm b/code/game/objects/structures/crates_lockers/closets/coffin.dm index 14e1c276b2..3865641552 100644 --- a/code/game/objects/structures/crates_lockers/closets/coffin.dm +++ b/code/game/objects/structures/crates_lockers/closets/coffin.dm @@ -16,7 +16,7 @@ icon_state = "closed_unlocked" seal_tool = null breakout_sound = 'sound/weapons/thudswoosh.ogg' - anchored = 1 + anchored = TRUE max_closets = 1 opened = 1 closet_appearance = null // Special icon for us diff --git a/code/game/objects/structures/crates_lockers/closets/egg_vr.dm b/code/game/objects/structures/crates_lockers/closets/egg_vr.dm index dabc8fd88b..19d3f8b452 100644 --- a/code/game/objects/structures/crates_lockers/closets/egg_vr.dm +++ b/code/game/objects/structures/crates_lockers/closets/egg_vr.dm @@ -3,7 +3,7 @@ desc = "It's an egg; it's smooth to the touch." //This is the default egg. icon = 'icons/obj/egg_vr.dmi' icon_state = "egg" - density = 0 //Just in case there's a lot of eggs, so it doesn't block hallways/areas. + density = FALSE //Just in case there's a lot of eggs, so it doesn't block hallways/areas. var/icon_closed = "egg" var/icon_opened = "egg_open" var/icon_locked = "egg" diff --git a/code/game/objects/structures/crates_lockers/closets/gimmick.dm b/code/game/objects/structures/crates_lockers/closets/gimmick.dm index 0c91f7aecf..6ba78a90a0 100644 --- a/code/game/objects/structures/crates_lockers/closets/gimmick.dm +++ b/code/game/objects/structures/crates_lockers/closets/gimmick.dm @@ -12,7 +12,7 @@ name = "administrative supply closet" desc = "It's a storage unit for things that have no right being here." closet_appearance = /decl/closet_appearance/tactical - anchored = 0 + anchored = FALSE /obj/structure/closet/gimmick/russian name = "russian surplus closet" @@ -44,7 +44,7 @@ name = "\improper Thunderdome closet" desc = "Everything you need!" closet_appearance = /decl/closet_appearance/thunderdomered - anchored = 1 + anchored = TRUE /obj/structure/closet/thunderdome/tdred name = "red-team Thunderdome closet" diff --git a/code/game/objects/structures/crates_lockers/closets/misc_vr.dm b/code/game/objects/structures/crates_lockers/closets/misc_vr.dm index 4e86c416d0..15249c0b81 100644 --- a/code/game/objects/structures/crates_lockers/closets/misc_vr.dm +++ b/code/game/objects/structures/crates_lockers/closets/misc_vr.dm @@ -220,8 +220,8 @@ desc = "It's wall-mounted storage unit for an AutoLok suit." icon = 'icons/obj/closets/bases/wall_double.dmi' closet_appearance = /decl/closet_appearance/wall_double/autolok - anchored = 1 - density = 0 + anchored = TRUE + density = FALSE wall_mounted = 1 store_mobs = 0 @@ -236,8 +236,8 @@ desc = "It's wall-mounted storage unit for an emergency suit." icon = 'icons/obj/closets/bases/wall.dmi' closet_appearance = /decl/closet_appearance/wall/emergency - anchored = 1 - density = 0 + anchored = TRUE + density = FALSE wall_mounted = 1 store_mobs = 0 diff --git a/code/game/objects/structures/crates_lockers/closets/secure/medical.dm b/code/game/objects/structures/crates_lockers/closets/secure/medical.dm index a1412ba7a9..b6021a86c9 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/medical.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/medical.dm @@ -225,8 +225,8 @@ desc = "It's a secure wall-mounted storage unit for first aid supplies." plane = TURF_PLANE layer = ABOVE_TURF_LAYER - anchored = 1 - density = 0 + anchored = TRUE + density = FALSE wall_mounted = 1 store_mobs = 0 req_access = list(access_medical_equip) diff --git a/code/game/objects/structures/crates_lockers/closets/secure/secure_closets.dm b/code/game/objects/structures/crates_lockers/closets/secure/secure_closets.dm index 9fae830b44..85b9367b7d 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/secure_closets.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/secure_closets.dm @@ -3,7 +3,7 @@ desc = "It's an immobile card-locked storage unit." icon = 'icons/obj/closet.dmi' icon_state = "secure1" - density = 1 + density = TRUE opened = 0 var/locked = 1 var/broken = 0 diff --git a/code/game/objects/structures/crates_lockers/closets/secure/security.dm b/code/game/objects/structures/crates_lockers/closets/secure/security.dm index 7d75d736cc..bb7b05c7b3 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/security.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/security.dm @@ -271,7 +271,7 @@ GLOBAL_LIST_BOILERPLATE(all_brig_closets, /obj/structure/closet/secure_closet/br name = "brig locker" req_access = list(access_brig) closet_appearance = /decl/closet_appearance/secure_closet/brig - anchored = 1 + anchored = TRUE var/id = null starts_with = list( @@ -281,7 +281,7 @@ GLOBAL_LIST_BOILERPLATE(all_brig_closets, /obj/structure/closet/secure_closet/br /obj/structure/closet/secure_closet/posters name = "morale storage" req_access = list(access_security) - anchored = 1 + anchored = TRUE starts_with = list( /obj/item/poster/nanotrasen, @@ -308,7 +308,7 @@ GLOBAL_LIST_BOILERPLATE(all_brig_closets, /obj/structure/closet/secure_closet/br name = "wall locker" req_access = list(access_security) closet_appearance = /decl/closet_appearance/wall - density = 1 + density = TRUE //too small to put a man in large = 0 diff --git a/code/game/objects/structures/crates_lockers/closets/statue.dm b/code/game/objects/structures/crates_lockers/closets/statue.dm index c5483dac9d..9b66918be0 100644 --- a/code/game/objects/structures/crates_lockers/closets/statue.dm +++ b/code/game/objects/structures/crates_lockers/closets/statue.dm @@ -3,8 +3,8 @@ desc = "An incredibly lifelike marble carving" icon = 'icons/obj/statue.dmi' icon_state = "human_male" - density = 1 - anchored = 1 + density = TRUE + anchored = TRUE health = 0 //destroying the statue kills the mob within blocks_emissive = EMISSIVE_BLOCK_UNIQUE var/intialTox = 0 //these are here to keep the mob from taking damage from things that logically wouldn't affect a rock diff --git a/code/game/objects/structures/crates_lockers/closets/utility_closets.dm b/code/game/objects/structures/crates_lockers/closets/utility_closets.dm index 8ccf80bf18..07c5276a6f 100644 --- a/code/game/objects/structures/crates_lockers/closets/utility_closets.dm +++ b/code/game/objects/structures/crates_lockers/closets/utility_closets.dm @@ -187,8 +187,8 @@ closet_appearance = /decl/closet_appearance/wall/hydrant plane = TURF_PLANE layer = ABOVE_TURF_LAYER - anchored = 1 - density = 0 + anchored = TRUE + density = FALSE wall_mounted = 1 store_mobs = 0 @@ -207,7 +207,7 @@ name = "first-aid closet" desc = "It's wall-mounted storage unit for first aid supplies." closet_appearance = /decl/closet_appearance/wall/medical - anchored = 1 - density = 0 + anchored = TRUE + density = FALSE wall_mounted = 1 store_mobs = 0 diff --git a/code/game/objects/structures/crates_lockers/closets/walllocker.dm b/code/game/objects/structures/crates_lockers/closets/walllocker.dm index 60ec9ab4fb..f140e7380f 100644 --- a/code/game/objects/structures/crates_lockers/closets/walllocker.dm +++ b/code/game/objects/structures/crates_lockers/closets/walllocker.dm @@ -6,8 +6,8 @@ name = "Wall Locker" icon = 'icons/obj/closets/bases/wall.dmi' closet_appearance = /decl/closet_appearance/wall - density = 0 - anchored = 1 + density = FALSE + anchored = TRUE store_mobs = 0 wall_mounted = 1 @@ -85,8 +85,8 @@ name = "Wall Cabinet" icon = 'icons/obj/closets/bases/wall_double.dmi' closet_appearance = /decl/closet_appearance/wall_double - density = 0 - anchored = 1 + density = FALSE + anchored = TRUE store_mobs = 0 wall_mounted = 1 plane = TURF_PLANE @@ -113,8 +113,8 @@ name = "Kitchen Cabinet" icon = 'icons/obj/closets/bases/wall_double.dmi' closet_appearance = /decl/closet_appearance/wall_double/kitchen - density = 0 - anchored = 1 + density = FALSE + anchored = TRUE /obj/structure/closet/walllocker_double/kitchen/north pixel_y = 32 @@ -157,8 +157,8 @@ name = "fire-safety closet" desc = "It's a storage cabinet packed with fire-fighting supplies." closet_appearance = /decl/closet_appearance/wall_double/fire_safety - anchored = 1 - density = 0 + anchored = TRUE + density = FALSE starts_with = list( /obj/item/clothing/suit/fire/firefighter, diff --git a/code/game/objects/structures/crates_lockers/crates.dm b/code/game/objects/structures/crates_lockers/crates.dm index 76ca759c59..eec6a8d892 100644 --- a/code/game/objects/structures/crates_lockers/crates.dm +++ b/code/game/objects/structures/crates_lockers/crates.dm @@ -5,7 +5,7 @@ desc = "A rectangular steel crate." icon = 'icons/obj/closets/bases/crate.dmi' closet_appearance = /decl/closet_appearance/crate - climbable = 1 + climbable = TRUE dir = 4 //Spawn facing 'forward' by default. var/points_per_crate = 5 var/rigged = 0 diff --git a/code/game/objects/structures/crates_lockers/largecrate.dm b/code/game/objects/structures/crates_lockers/largecrate.dm index 7c8f95ea43..1ceded17fd 100644 --- a/code/game/objects/structures/crates_lockers/largecrate.dm +++ b/code/game/objects/structures/crates_lockers/largecrate.dm @@ -3,7 +3,7 @@ desc = "A hefty wooden crate." icon = 'icons/obj/storage.dmi' icon_state = "densecrate" - density = 1 + density = TRUE var/list/starts_with /obj/structure/largecrate/Initialize() diff --git a/code/game/objects/structures/crates_lockers/vehiclecage.dm b/code/game/objects/structures/crates_lockers/vehiclecage.dm index 31862846ff..c3a04e9267 100644 --- a/code/game/objects/structures/crates_lockers/vehiclecage.dm +++ b/code/game/objects/structures/crates_lockers/vehiclecage.dm @@ -3,7 +3,7 @@ desc = "A large metal lattice that seems to exist solely to annoy consumers." icon = 'icons/obj/storage.dmi' icon_state = "vehicle_cage" - density = 1 + density = TRUE var/obj/vehicle/my_vehicle var/my_vehicle_type var/paint_color = "#666666" diff --git a/code/game/objects/structures/curtains.dm b/code/game/objects/structures/curtains.dm index 13530d731a..b8c5d95cbf 100644 --- a/code/game/objects/structures/curtains.dm +++ b/code/game/objects/structures/curtains.dm @@ -6,7 +6,7 @@ plane = MOB_PLANE layer = ABOVE_MOB_LAYER opacity = 1 - density = 0 + density = FALSE /obj/structure/curtain/open icon_state = "open" diff --git a/code/game/objects/structures/dancepole_vr.dm b/code/game/objects/structures/dancepole_vr.dm index 0c9397142d..3a548f1133 100644 --- a/code/game/objects/structures/dancepole_vr.dm +++ b/code/game/objects/structures/dancepole_vr.dm @@ -4,8 +4,8 @@ desc = "Engineered for your entertainment" icon = 'icons/obj/objects_vr.dmi' icon_state = "dancepole" - density = 0 - anchored = 1 + density = FALSE + anchored = TRUE /obj/structure/dancepole/attackby(var/obj/item/O as obj, var/mob/user as mob) if(O.is_screwdriver()) diff --git a/code/game/objects/structures/displaycase.dm b/code/game/objects/structures/displaycase.dm index 38f1731e82..fc1ae0ef59 100644 --- a/code/game/objects/structures/displaycase.dm +++ b/code/game/objects/structures/displaycase.dm @@ -3,9 +3,9 @@ icon = 'icons/obj/stationobjs.dmi' icon_state = "glassbox1" desc = "A display case for prized possessions. It taunts you to kick it." - density = 1 - anchored = 1 - unacidable = 1//Dissolving the case would also delete the gun. + density = TRUE + anchored = TRUE + unacidable = TRUE//Dissolving the case would also delete the gun. var/health = 30 var/occupied = 1 var/destroyed = 0 diff --git a/code/game/objects/structures/dogbed.dm b/code/game/objects/structures/dogbed.dm index bf9a65f8eb..b8ad1095fd 100644 --- a/code/game/objects/structures/dogbed.dm +++ b/code/game/objects/structures/dogbed.dm @@ -3,6 +3,6 @@ desc = "A bed made especially for dogs, or other similarly sized pets." icon = 'icons/obj/furniture.dmi' icon_state = "dogbed" - can_buckle = 1 + can_buckle = TRUE buckle_dir = SOUTH buckle_lying = 1 \ No newline at end of file diff --git a/code/game/objects/structures/door_assembly.dm b/code/game/objects/structures/door_assembly.dm index 2b57235299..108e824616 100644 --- a/code/game/objects/structures/door_assembly.dm +++ b/code/game/objects/structures/door_assembly.dm @@ -2,8 +2,8 @@ name = "airlock assembly" icon = 'icons/obj/doors/door_assembly.dmi' icon_state = "door_as_0" - anchored = 0 - density = 1 + anchored = FALSE + density = TRUE w_class = ITEMSIZE_HUGE var/state = 0 var/base_icon_state = "" diff --git a/code/game/objects/structures/extinguisher.dm b/code/game/objects/structures/extinguisher.dm index a5717bdf6e..fdfae03727 100644 --- a/code/game/objects/structures/extinguisher.dm +++ b/code/game/objects/structures/extinguisher.dm @@ -4,8 +4,8 @@ icon = 'icons/obj/closet.dmi' icon_state = "extinguisher_closed" layer = ABOVE_WINDOW_LAYER - anchored = 1 - density = 0 + anchored = TRUE + density = FALSE var/obj/item/weapon/extinguisher/has_extinguisher var/opened = 0 diff --git a/code/game/objects/structures/fireaxe.dm b/code/game/objects/structures/fireaxe.dm index f584fd8838..29159503ab 100644 --- a/code/game/objects/structures/fireaxe.dm +++ b/code/game/objects/structures/fireaxe.dm @@ -6,8 +6,8 @@ icon = 'icons/obj/closet.dmi' //Not bothering to move icons out for now. But its dumb still. icon_state = "fireaxe1000" layer = ABOVE_WINDOW_LAYER - anchored = 1 - density = 0 + anchored = TRUE + density = FALSE var/open = 0 var/hitstaken = 0 var/locked = 1 diff --git a/code/game/objects/structures/fitness.dm b/code/game/objects/structures/fitness.dm index f41fbfa8cf..f84c9508e7 100644 --- a/code/game/objects/structures/fitness.dm +++ b/code/game/objects/structures/fitness.dm @@ -1,13 +1,13 @@ /obj/structure/fitness icon = 'icons/obj/stationobjs.dmi' - anchored = 1 + anchored = TRUE var/being_used = 0 /obj/structure/fitness/punchingbag name = "punching bag" desc = "A punching bag." icon_state = "punchingbag" - density = 1 + density = TRUE var/list/hit_message = list("hit", "punch", "kick", "robust") /obj/structure/fitness/punchingbag/attack_hand(var/mob/living/carbon/human/user) diff --git a/code/game/objects/structures/fitness_vr.dm b/code/game/objects/structures/fitness_vr.dm index 99978fe27c..960becca41 100644 --- a/code/game/objects/structures/fitness_vr.dm +++ b/code/game/objects/structures/fitness_vr.dm @@ -3,11 +3,11 @@ desc = "Firm yet springy, perhaps this could be useful!" icon = 'icons/obj/fitness_vr.dmi' icon_state = "ropes" - density = 1 + density = TRUE throwpass = 1 - climbable = 1 + climbable = TRUE layer = WINDOW_LAYER - anchored = 1 + anchored = TRUE flags = ON_BORDER /obj/structure/fitness/boxing_ropes/CanPass(atom/movable/mover, turf/target) //sets it so that players can enter turf from all directions except the main direction. if(istype(mover) && mover.checkpass(PASSTABLE)) @@ -60,12 +60,12 @@ desc = "Firm yet springy, perhaps this could be useful!" icon = 'icons/obj/fitness_vr.dmi' icon_state = "ropes" - density = 1 + density = TRUE throwpass = 1 - climbable = 1 + climbable = TRUE plane = MOB_PLANE layer = ABOVE_MOB_LAYER - anchored = 1 + anchored = TRUE flags = ON_BORDER /obj/structure/fitness/boxing_ropes_bottom/CanPass(atom/movable/mover, turf/target) if(istype(mover) && mover.checkpass(PASSTABLE)) @@ -120,11 +120,11 @@ desc = "A sturdy post that looks like it could support even the most heaviest of heavy weights!" icon = 'icons/obj/fitness_vr.dmi' icon_state = "turnbuckle" - density = 1 + density = TRUE throwpass = 1 - climbable = 1 + climbable = TRUE layer = WINDOW_LAYER - anchored = 1 + anchored = TRUE flags = ON_BORDER /obj/structure/fitness/boxing_turnbuckle/CanPass(atom/movable/mover, turf/target) if(istype(mover) && mover.checkpass(PASSTABLE)) diff --git a/code/game/objects/structures/flora/flora_vr.dm b/code/game/objects/structures/flora/flora_vr.dm index b7f722324c..58ea426d97 100644 --- a/code/game/objects/structures/flora/flora_vr.dm +++ b/code/game/objects/structures/flora/flora_vr.dm @@ -79,14 +79,14 @@ icon = 'icons/obj/flora/amayastuff.dmi' desc = "Small stones sit beside this large boulder. Moss grows on the top of each of them." icon_state = "bigboulder1" - density = 1 + density = TRUE /obj/structure/flora/bboulder2 name = "jagged large boulder" icon = 'icons/obj/flora/amayastuff.dmi' desc = "This boulder has had plates broken off it. Moss grows in the cracks and across the top." icon_state = "bigboulder2" - density = 1 + density = TRUE /obj/structure/flora/rocks1 name = "rocks" diff --git a/code/game/objects/structures/flora/grass.dm b/code/game/objects/structures/flora/grass.dm index 92717f4beb..0ed4e9c19c 100644 --- a/code/game/objects/structures/flora/grass.dm +++ b/code/game/objects/structures/flora/grass.dm @@ -2,7 +2,7 @@ /obj/structure/flora/grass name = "grass" icon = 'icons/obj/flora/snowflora.dmi' - anchored = 1 + anchored = TRUE /obj/structure/flora/grass/brown icon_state = "snowgrass1bb" diff --git a/code/game/objects/structures/flora/trees.dm b/code/game/objects/structures/flora/trees.dm index 9a885a68f7..0a0811b7c4 100644 --- a/code/game/objects/structures/flora/trees.dm +++ b/code/game/objects/structures/flora/trees.dm @@ -1,8 +1,8 @@ //trees /obj/structure/flora/tree name = "tree" - anchored = 1 - density = 1 + anchored = TRUE + density = TRUE pixel_x = -16 plane = MOB_PLANE // You know what, let's play it safe. layer = ABOVE_MOB_LAYER diff --git a/code/game/objects/structures/girders.dm b/code/game/objects/structures/girders.dm index 39d30dabfb..9b006ee27f 100644 --- a/code/game/objects/structures/girders.dm +++ b/code/game/objects/structures/girders.dm @@ -1,7 +1,7 @@ /obj/structure/girder icon_state = "girder" - anchored = 1 - density = 1 + anchored = TRUE + density = TRUE plane = PLATING_PLANE w_class = ITEMSIZE_HUGE var/state = 0 @@ -68,7 +68,7 @@ /obj/structure/girder/displaced icon_state = "displaced" - anchored = 0 + anchored = FALSE health = 50 cover = 25 @@ -79,7 +79,7 @@ /obj/structure/girder/proc/displace() name = "displaced [girder_material.display_name] [initial(name)]" icon_state = "displaced" - anchored = 0 + anchored = FALSE health = (displaced_health - round(current_damage / 4)) cover = 25 @@ -134,7 +134,7 @@ /obj/structure/girder/proc/reset_girder() name = "[girder_material.display_name] [initial(name)]" - anchored = 1 + anchored = TRUE cover = initial(cover) health = min(max_health - current_damage,max_health) state = 0 diff --git a/code/game/objects/structures/gravemarker.dm b/code/game/objects/structures/gravemarker.dm index ff02bb4ae2..af5c170899 100644 --- a/code/game/objects/structures/gravemarker.dm +++ b/code/game/objects/structures/gravemarker.dm @@ -3,10 +3,10 @@ desc = "An object used in marking graves." icon_state = "gravemarker" - density = 1 - anchored = 1 + density = TRUE + anchored = TRUE throwpass = 1 - climbable = 1 + climbable = TRUE layer = ABOVE_JUNK_LAYER diff --git a/code/game/objects/structures/grille.dm b/code/game/objects/structures/grille.dm index 18a07462fc..ea1a9346c1 100644 --- a/code/game/objects/structures/grille.dm +++ b/code/game/objects/structures/grille.dm @@ -3,8 +3,8 @@ desc = "A flimsy lattice of metal rods, with screws to secure it to the floor." icon = 'icons/obj/structures_vr.dmi' // VOREStation Edit - New icons icon_state = "grille" - density = 1 - anchored = 1 + density = TRUE + anchored = TRUE pressure_resistance = 5*ONE_ATMOSPHERE layer = TABLE_LAYER explosion_resistance = 1 @@ -167,7 +167,7 @@ /obj/structure/grille/proc/healthcheck() if(health <= 0) if(!destroyed) - density = 0 + density = FALSE destroyed = 1 update_icon() new /obj/item/stack/rods(get_turf(src)) @@ -223,7 +223,7 @@ /obj/structure/grille/broken destroyed = 1 icon_state = "grille-b" - density = 0 + density = FALSE /obj/structure/grille/broken/New() ..() diff --git a/code/game/objects/structures/handrail.dm b/code/game/objects/structures/handrail.dm index 8519cb4e30..6a48e94654 100644 --- a/code/game/objects/structures/handrail.dm +++ b/code/game/objects/structures/handrail.dm @@ -3,6 +3,6 @@ icon = 'icons/obj/handrail.dmi' icon_state = "handrail" desc = "A safety railing with buckles to secure yourself to when floor isn't stable enough." - density = 0 - anchored = 1 - can_buckle = 1 + density = FALSE + anchored = TRUE + can_buckle = TRUE diff --git a/code/game/objects/structures/inflatable.dm b/code/game/objects/structures/inflatable.dm index 8a6377d0fe..92dc20cec6 100644 --- a/code/game/objects/structures/inflatable.dm +++ b/code/game/objects/structures/inflatable.dm @@ -23,8 +23,8 @@ /obj/structure/inflatable name = "inflatable wall" desc = "An inflated membrane. Do not puncture." - density = 1 - anchored = 1 + density = TRUE + anchored = TRUE opacity = 0 can_atmos_pass = ATMOS_PASS_DENSITY @@ -154,8 +154,8 @@ /obj/structure/inflatable/door //Based on mineral door code name = "inflatable door" - density = 1 - anchored = 1 + density = TRUE + anchored = TRUE opacity = 0 icon = 'icons/obj/inflatable.dmi' @@ -204,7 +204,7 @@ isSwitchingStates = 1 flick("door_opening",src) sleep(10) - density = 0 + density = FALSE opacity = 0 state = 1 update_icon() @@ -214,7 +214,7 @@ isSwitchingStates = 1 flick("door_closing",src) sleep(10) - density = 1 + density = TRUE opacity = 0 state = 0 update_icon() diff --git a/code/game/objects/structures/janicart.dm b/code/game/objects/structures/janicart.dm index fba31409f5..87f568f703 100644 --- a/code/game/objects/structures/janicart.dm +++ b/code/game/objects/structures/janicart.dm @@ -6,8 +6,8 @@ GLOBAL_LIST_BOILERPLATE(all_janitorial_carts, /obj/structure/janitorialcart) description_info = "You can use alt-click while holding a mop to stow the mop. Alt-click holding a reagent container will empty the contents into the bucket without trying to put the container in any attached trash bag." icon = 'icons/obj/janitor.dmi' icon_state = "cart" - anchored = 0 - density = 1 + anchored = FALSE + density = TRUE flags = OPENCONTAINER climbable = TRUE //copypaste sorry @@ -374,8 +374,8 @@ GLOBAL_LIST_BOILERPLATE(all_janitorial_carts, /obj/structure/janitorialcart) name = "janicart" icon = 'icons/obj/vehicles.dmi' icon_state = "pussywagon" - anchored = 1 - density = 1 + anchored = TRUE + density = TRUE flags = OPENCONTAINER //copypaste sorry var/amount_per_transfer_from_this = 5 //shit I dunno, adding this so syringes stop runtime erroring. --NeoFite diff --git a/code/game/objects/structures/kitchen_foodcart_vr.dm b/code/game/objects/structures/kitchen_foodcart_vr.dm index 04c3f1de5f..4fb56b038b 100644 --- a/code/game/objects/structures/kitchen_foodcart_vr.dm +++ b/code/game/objects/structures/kitchen_foodcart_vr.dm @@ -3,9 +3,9 @@ icon = 'icons/obj/kitchen_vr.dmi' icon_state = "foodcart-0" desc = "The ultimate in food transport! When opened you notice two compartments with odd blue glows to them. One feels very warm, while the other is very cold." - anchored = 0 + anchored = FALSE opacity = 0 - density = 1 + density = TRUE /obj/structure/foodcart/Initialize() . = ..() diff --git a/code/game/objects/structures/kitchen_spike.dm b/code/game/objects/structures/kitchen_spike.dm index 53323bb4b9..48e9e113e8 100644 --- a/code/game/objects/structures/kitchen_spike.dm +++ b/code/game/objects/structures/kitchen_spike.dm @@ -5,8 +5,8 @@ icon = 'icons/obj/kitchen.dmi' icon_state = "spike" desc = "A spike for collecting meat from animals." - density = 1 - anchored = 1 + density = TRUE + anchored = TRUE var/meat = 0 var/occupied var/meat_type diff --git a/code/game/objects/structures/lattice.dm b/code/game/objects/structures/lattice.dm index 8c1879ec80..30999cd3d6 100644 --- a/code/game/objects/structures/lattice.dm +++ b/code/game/objects/structures/lattice.dm @@ -3,8 +3,8 @@ desc = "A lightweight support lattice." icon = 'icons/obj/structures.dmi' icon_state = "latticefull" - density = 0 - anchored = 1.0 + density = FALSE + anchored = TRUE w_class = ITEMSIZE_NORMAL plane = PLATING_PLANE diff --git a/code/game/objects/structures/ledges.dm b/code/game/objects/structures/ledges.dm index cf7c88fc48..b90e406cb2 100644 --- a/code/game/objects/structures/ledges.dm +++ b/code/game/objects/structures/ledges.dm @@ -2,10 +2,10 @@ name = "rock ledge" desc = "An easily scaleable rocky ledge." icon = 'icons/obj/ledges.dmi' - density = 1 + density = TRUE throwpass = 1 - climbable = 1 - anchored = 1 + climbable = TRUE + anchored = TRUE var/solidledge = 1 flags = ON_BORDER layer = STAIRS_LAYER @@ -17,23 +17,23 @@ name = "rock ledge" desc = "An easily scaleable rocky ledge." icon = 'icons/obj/ledges.dmi' - density = 1 + density = TRUE throwpass = 1 - climbable = 1 - anchored = 1 + climbable = TRUE + anchored = TRUE layer = STAIRS_LAYER /obj/structure/ledge/ledge_nub desc = "Part of a rocky ledge." icon_state = "ledge-nub" - density = 0 + density = FALSE solidledge = 0 /obj/structure/ledge/ledge_stairs name = "rock stairs" desc = "A colorful set of rocky stairs" icon_state = "ledge-stairs" - density = 0 + density = FALSE solidledge = 0 /obj/structure/ledge/CanPass(atom/movable/mover, turf/target) diff --git a/code/game/objects/structures/map_blocker_vr.dm b/code/game/objects/structures/map_blocker_vr.dm index 52be6c4035..bd56b08d6e 100644 --- a/code/game/objects/structures/map_blocker_vr.dm +++ b/code/game/objects/structures/map_blocker_vr.dm @@ -4,10 +4,10 @@ desc = "You can't go there!" icon = 'icons/turf/wall_masks.dmi' icon_state = "rdebug" - anchored = 1.0 + anchored = TRUE opacity = 0 - density = 1 - unacidable = 1 + density = TRUE + unacidable = TRUE /obj/effect/blocker/Initialize() // For non-gateway maps. . = ..() diff --git a/code/game/objects/structures/mirror.dm b/code/game/objects/structures/mirror.dm index d41b8057a7..4fc64a5c52 100644 --- a/code/game/objects/structures/mirror.dm +++ b/code/game/objects/structures/mirror.dm @@ -5,8 +5,8 @@ icon = 'icons/obj/watercloset.dmi' icon_state = "mirror" layer = ABOVE_WINDOW_LAYER - density = 0 - anchored = 1 + density = FALSE + anchored = TRUE var/shattered = 0 var/glass = 1 var/datum/tgui_module/appearance_changer/mirror/M diff --git a/code/game/objects/structures/mop_bucket.dm b/code/game/objects/structures/mop_bucket.dm index 5d5e4fb630..064281c9a9 100644 --- a/code/game/objects/structures/mop_bucket.dm +++ b/code/game/objects/structures/mop_bucket.dm @@ -3,8 +3,8 @@ desc = "Fill it with water, but don't forget a mop!" icon = 'icons/obj/janitor.dmi' icon_state = "mopbucket" - density = 1 - climbable = 1 + density = TRUE + climbable = TRUE w_class = ITEMSIZE_NORMAL pressure_resistance = 5 flags = OPENCONTAINER diff --git a/code/game/objects/structures/morgue.dm b/code/game/objects/structures/morgue.dm index af06a443a6..f9f2287302 100644 --- a/code/game/objects/structures/morgue.dm +++ b/code/game/objects/structures/morgue.dm @@ -16,10 +16,10 @@ icon = 'icons/obj/stationobjs.dmi' icon_state = "morgue1" dir = EAST - density = 1 + density = TRUE var/obj/structure/m_tray/connected = null var/list/occupants = list() - anchored = 1.0 + anchored = TRUE /obj/structure/morgue/Destroy() if(connected) @@ -147,10 +147,10 @@ desc = "Apply corpse before closing." icon = 'icons/obj/stationobjs.dmi' icon_state = "morguet" - density = 1 + density = TRUE plane = TURF_PLANE var/obj/structure/morgue/connected = null - anchored = 1 + anchored = TRUE throwpass = 1 /obj/structure/m_tray/Destroy() diff --git a/code/game/objects/structures/plasticflaps.dm b/code/game/objects/structures/plasticflaps.dm index d655581c92..8b54df0c6c 100644 --- a/code/game/objects/structures/plasticflaps.dm +++ b/code/game/objects/structures/plasticflaps.dm @@ -3,8 +3,8 @@ desc = "Completely impassable - or are they?" icon = 'icons/obj/stationobjs.dmi' //Change this. icon_state = "plasticflaps" - density = 0 - anchored = 1 + density = FALSE + anchored = TRUE layer = MOB_LAYER plane = MOB_PLANE explosion_resistance = 5 diff --git a/code/game/objects/structures/props/swarm.dm b/code/game/objects/structures/props/swarm.dm index 51f59072f4..0498674a6f 100644 --- a/code/game/objects/structures/props/swarm.dm +++ b/code/game/objects/structures/props/swarm.dm @@ -39,7 +39,7 @@ STOP_PROCESSING(SSobj, src) playsound(src,shatter_sound, 75, 1) isbroken = 1 - density = 0 + density = FALSE icon_state = "[initial(icon_state)]-broken" set_light(0) @@ -55,7 +55,7 @@ user.do_attack_animation(src) playsound(src,shatter_sound, 75, 1) isbroken = 1 - density = 0 + density = FALSE icon_state = "[initial(icon_state)]-broken" set_light(0) else @@ -119,7 +119,7 @@ STOP_PROCESSING(SSobj, src) playsound(src,shatter_sound, 75, 1) isbroken = 1 - density = 0 + density = FALSE icon_state = "[initial(icon_state)]-broken" set_light(0) @@ -135,7 +135,7 @@ user.do_attack_animation(src) playsound(src,shatter_sound, 75, 1) isbroken = 1 - density = 0 + density = FALSE icon_state = "[initial(icon_state)]-broken" set_light(0) else diff --git a/code/game/objects/structures/railing.dm b/code/game/objects/structures/railing.dm index 876e58c4e3..a4a8e83887 100644 --- a/code/game/objects/structures/railing.dm +++ b/code/game/objects/structures/railing.dm @@ -3,11 +3,11 @@ name = "railing" desc = "A standard steel railing, painted orange. Play stupid games, win stupid prizes." icon = 'icons/obj/railing.dmi' - density = 1 + density = TRUE throwpass = 1 - climbable = 1 + climbable = TRUE layer = WINDOW_LAYER - anchored = 1 + anchored = TRUE flags = ON_BORDER icon_state = "railing0" var/broken = FALSE @@ -26,7 +26,7 @@ ..() // TODO - "constructed" is not passed to us. We need to find a way to do this safely. if (constructed) // player-constructed railings - anchored = 0 + anchored = FALSE if(climbable) verbs += /obj/structure/proc/climb_on diff --git a/code/game/objects/structures/safe.dm b/code/game/objects/structures/safe.dm index 22af69d08b..50071efe4e 100644 --- a/code/game/objects/structures/safe.dm +++ b/code/game/objects/structures/safe.dm @@ -10,8 +10,8 @@ FLOOR SAFES desc = "A huge chunk of metal with a dial embedded in it. Fine print on the dial reads \"Scarborough Arms - 2 tumbler safe, guaranteed thermite resistant, explosion resistant, and assistant resistant.\"" icon = 'icons/obj/structures.dmi' icon_state = "safe" - anchored = 1 - density = 1 + anchored = TRUE + density = TRUE var/open = 0 //is the safe open? var/tumbler_1_pos //the tumbler position- from 0 to 72 var/tumbler_1_open //the tumbler position to open at- 0 to 72 @@ -170,7 +170,7 @@ FLOOR SAFES /obj/structure/safe/floor name = "floor safe" icon_state = "floorsafe" - density = 0 + density = FALSE level = 1 //underfloor plane = PLATING_PLANE layer = ABOVE_UTILITY diff --git a/code/game/objects/structures/salvageable.dm b/code/game/objects/structures/salvageable.dm index faf6c788aa..0a35848d8d 100644 --- a/code/game/objects/structures/salvageable.dm +++ b/code/game/objects/structures/salvageable.dm @@ -2,8 +2,8 @@ name = "broken macninery" desc = "Broken beyond repair, but looks like you can still salvage something from this if you had a prying implement." icon = 'icons/obj/salvageable.dmi' - density = 1 - anchored = 1 + density = TRUE + anchored = TRUE var/salvageable_parts = list() /obj/structure/salvageable/proc/dismantle() diff --git a/code/game/objects/structures/signs.dm b/code/game/objects/structures/signs.dm index 0ea4d1db25..4afb514fe7 100644 --- a/code/game/objects/structures/signs.dm +++ b/code/game/objects/structures/signs.dm @@ -1,8 +1,8 @@ /obj/structure/sign icon = 'icons/obj/decals.dmi' - anchored = 1 + anchored = TRUE opacity = 0 - density = 0 + density = FALSE plane = OBJ_PLANE //VOREStation Edit layer = ABOVE_JUNK_LAYER //VOREStation Edit w_class = ITEMSIZE_NORMAL diff --git a/code/game/objects/structures/simple_doors.dm b/code/game/objects/structures/simple_doors.dm index c0385b3132..e7799fcf8f 100644 --- a/code/game/objects/structures/simple_doors.dm +++ b/code/game/objects/structures/simple_doors.dm @@ -1,7 +1,7 @@ /obj/structure/simple_door name = "door" - density = 1 - anchored = 1 + density = TRUE + anchored = TRUE can_atmos_pass = ATMOS_PASS_DENSITY icon = 'icons/obj/doors/material_doors.dmi' @@ -102,7 +102,7 @@ playsound(src, material.dooropen_noise, 100, 1) flick("[material.door_icon_base]opening",src) sleep(10) - density = 0 + density = FALSE set_opacity(0) state = 1 update_icon() @@ -114,7 +114,7 @@ playsound(src, material.dooropen_noise, 100, 1) flick("[material.door_icon_base]closing",src) sleep(10) - density = 1 + density = TRUE set_opacity(1) state = 0 update_icon() diff --git a/code/game/objects/structures/snowman.dm b/code/game/objects/structures/snowman.dm index f3041e0287..7299f1e62e 100644 --- a/code/game/objects/structures/snowman.dm +++ b/code/game/objects/structures/snowman.dm @@ -3,7 +3,7 @@ icon = 'icons/obj/snowman.dmi' icon_state = "snowman" desc = "A happy little snowman smiles back at you!" - anchored = 1 + anchored = TRUE /obj/structure/snowman/attack_hand(mob/user as mob) if(user.a_intent == I_HURT) diff --git a/code/game/objects/structures/stasis_cage.dm b/code/game/objects/structures/stasis_cage.dm index f4791f37f2..b9cae77fa3 100644 --- a/code/game/objects/structures/stasis_cage.dm +++ b/code/game/objects/structures/stasis_cage.dm @@ -3,7 +3,7 @@ desc = "A high-tech animal cage, designed to keep contained fauna docile and safe." icon = 'icons/obj/storage_vr.dmi' //VOREStation Edit icon_state = "critteropen" - density = 1 + density = TRUE var/mob/living/simple_mob/contained diff --git a/code/game/objects/structures/stool_bed_chair_nest/alien_nests.dm b/code/game/objects/structures/stool_bed_chair_nest/alien_nests.dm index ebba811fb9..697e8cffbc 100644 --- a/code/game/objects/structures/stool_bed_chair_nest/alien_nests.dm +++ b/code/game/objects/structures/stool_bed_chair_nest/alien_nests.dm @@ -80,6 +80,6 @@ /obj/structure/bed/nest/proc/healthcheck() if(health <=0) - density = 0 + density = FALSE qdel(src) return diff --git a/code/game/objects/structures/stool_bed_chair_nest/bed.dm b/code/game/objects/structures/stool_bed_chair_nest/bed.dm index bf9f6ecf2f..87fc1ba5c6 100644 --- a/code/game/objects/structures/stool_bed_chair_nest/bed.dm +++ b/code/game/objects/structures/stool_bed_chair_nest/bed.dm @@ -13,8 +13,8 @@ icon = 'icons/obj/furniture.dmi' icon_state = "bed" pressure_resistance = 15 - anchored = 1 - can_buckle = 1 + anchored = TRUE + can_buckle = TRUE buckle_dir = SOUTH buckle_lying = 1 var/datum/material/material @@ -201,7 +201,7 @@ desc = "A portable bed-on-wheels made for transporting medical patients." icon = 'icons/obj/rollerbed.dmi' icon_state = "rollerbed" - anchored = 0 + anchored = FALSE surgery_odds = 50 //VOREStation Edit var/bedtype = /obj/structure/bed/roller var/rollertype = /obj/item/roller @@ -301,12 +301,12 @@ if(M.buckled == src) M.pixel_y = 6 M.old_y = 6 - density = 1 + density = TRUE icon_state = "[initial(icon_state)]_up" else M.pixel_y = 0 M.old_y = 0 - density = 0 + density = FALSE icon_state = "[initial(icon_state)]" update_icon() return ..() diff --git a/code/game/objects/structures/stool_bed_chair_nest/chairs.dm b/code/game/objects/structures/stool_bed_chair_nest/chairs.dm index 0bdc32340f..164554652b 100644 --- a/code/game/objects/structures/stool_bed_chair_nest/chairs.dm +++ b/code/game/objects/structures/stool_bed_chair_nest/chairs.dm @@ -134,7 +134,7 @@ ..(newloc,"steel","orange") /obj/structure/bed/chair/office - anchored = 0 + anchored = FALSE buckle_movable = 1 /obj/structure/bed/chair/office/update_icon() diff --git a/code/game/objects/structures/stool_bed_chair_nest/stools_vr.dm b/code/game/objects/structures/stool_bed_chair_nest/stools_vr.dm index e513e72f2a..c1f5506139 100644 --- a/code/game/objects/structures/stool_bed_chair_nest/stools_vr.dm +++ b/code/game/objects/structures/stool_bed_chair_nest/stools_vr.dm @@ -9,7 +9,7 @@ throwforce = 10 w_class = ITEMSIZE_HUGE base_icon = "bar_stool_base" - anchored = 1 + anchored = TRUE /obj/item/weapon/stool/baystool/padded icon_state = "bar_stool_padded_preview" //set for the map diff --git a/code/game/objects/structures/stool_bed_chair_nest/wheelchair.dm b/code/game/objects/structures/stool_bed_chair_nest/wheelchair.dm index 3641d57fda..461cc122bf 100644 --- a/code/game/objects/structures/stool_bed_chair_nest/wheelchair.dm +++ b/code/game/objects/structures/stool_bed_chair_nest/wheelchair.dm @@ -3,7 +3,7 @@ desc = "You sit in this. Either by will or force." icon = 'icons/obj/wheelchair.dmi' icon_state = "wheelchair" - anchored = 0 + anchored = FALSE buckle_movable = 1 var/folded_type = /obj/item/wheelchair diff --git a/code/game/objects/structures/tank_dispenser.dm b/code/game/objects/structures/tank_dispenser.dm index 9a2b18e8c6..3a1bf84386 100644 --- a/code/game/objects/structures/tank_dispenser.dm +++ b/code/game/objects/structures/tank_dispenser.dm @@ -5,8 +5,8 @@ desc = "A simple yet bulky storage device for gas tanks. Has room for up to ten oxygen tanks, and ten phoron tanks." icon = 'icons/obj/objects.dmi' icon_state = "dispenser" - density = 1 - anchored = 1.0 + density = TRUE + anchored = TRUE w_class = ITEMSIZE_HUGE var/oxygentanks = TANK_DISPENSER_CAPACITY var/phorontanks = TANK_DISPENSER_CAPACITY @@ -76,10 +76,10 @@ else if(I.is_wrench()) if(anchored) to_chat(user, "You lean down and unwrench [src].") - anchored = 0 + anchored = FALSE else to_chat(user, "You wrench [src] into place.") - anchored = 1 + anchored = TRUE return else if(user.a_intent != I_HURT) to_chat(user, "[I] does not fit into [src].") diff --git a/code/game/objects/structures/target_stake.dm b/code/game/objects/structures/target_stake.dm index 920fc269d5..0e29fed20b 100644 --- a/code/game/objects/structures/target_stake.dm +++ b/code/game/objects/structures/target_stake.dm @@ -4,7 +4,7 @@ desc = "A thin platform with negatively-magnetized wheels." icon = 'icons/obj/objects.dmi' icon_state = "target_stake" - density = 1 + density = TRUE w_class = ITEMSIZE_HUGE var/obj/item/target/pinned_target // the current pinned target @@ -16,7 +16,7 @@ else // Sanity check: if the pinned target can't be found in immediate view pinned_target = null - density = 1 + density = TRUE /obj/structure/target_stake/attackby(obj/item/W as obj, mob/user as mob) // Putting objects on the stake. Most importantly, targets @@ -24,16 +24,8 @@ return // get rid of that pinned target first! if(istype(W, /obj/item/target)) -<<<<<<< HEAD - density = 0 - W.density = 1 -||||||| parent of 035a67b3d1... Merge pull request #11110 from MarinaGryphon/codequality/bool-fixes-2 - density = FALSE - W.density = 1 -======= density = FALSE W.density = TRUE ->>>>>>> 035a67b3d1... Merge pull request #11110 from MarinaGryphon/codequality/bool-fixes-2 user.remove_from_mob(W) W.loc = loc W.layer = ABOVE_JUNK_LAYER @@ -44,16 +36,8 @@ /obj/structure/target_stake/attack_hand(mob/user as mob) // taking pinned targets off! if(pinned_target) -<<<<<<< HEAD - density = 1 - pinned_target.density = 0 -||||||| parent of 035a67b3d1... Merge pull request #11110 from MarinaGryphon/codequality/bool-fixes-2 - density = TRUE - pinned_target.density = 0 -======= density = TRUE pinned_target.density = FALSE ->>>>>>> 035a67b3d1... Merge pull request #11110 from MarinaGryphon/codequality/bool-fixes-2 pinned_target.layer = OBJ_LAYER pinned_target.loc = user.loc diff --git a/code/game/objects/structures/transit_tubes.dm b/code/game/objects/structures/transit_tubes.dm index 6053d26ea2..402d560923 100644 --- a/code/game/objects/structures/transit_tubes.dm +++ b/code/game/objects/structures/transit_tubes.dm @@ -6,9 +6,9 @@ /obj/structure/transit_tube icon = 'icons/obj/pipes/transit_tube.dmi' icon_state = "E-W" - density = 1 + density = TRUE layer = ABOVE_JUNK_LAYER - anchored = 1.0 + anchored = TRUE var/list/tube_dirs = null var/exit_delay = 2 var/enter_delay = 1 @@ -40,8 +40,8 @@ icon = 'icons/obj/pipes/transit_tube_pod.dmi' icon_state = "pod" animate_movement = FORWARD_STEPS - anchored = 1.0 - density = 1 + anchored = TRUE + density = TRUE var/moving = 0 var/datum/gas_mixture/air_contents = new() @@ -334,7 +334,7 @@ current_tube.pod_stopped(src, dir) break - density = 1 + density = TRUE // If the pod is no longer in a tube, move in a line until stopped or slowed to a halt. // /turf/inertial_drift appears to only work on mobs, and re-implementing some of the @@ -427,7 +427,7 @@ tube_dirs = parse_dirs(icon_state) if(copytext(icon_state, 1, 3) == "D-" || findtextEx(icon_state, "Pass")) - density = 0 + density = FALSE diff --git a/code/game/objects/structures/trash_pile_vr.dm b/code/game/objects/structures/trash_pile_vr.dm index ca0d10d1bc..459f907195 100644 --- a/code/game/objects/structures/trash_pile_vr.dm +++ b/code/game/objects/structures/trash_pile_vr.dm @@ -3,8 +3,8 @@ desc = "A heap of garbage, but maybe there's something interesting inside?" icon = 'icons/obj/trash_piles.dmi' icon_state = "randompile" - density = 1 - anchored = 1.0 + density = TRUE + anchored = TRUE var/list/searchedby = list()// Characters that have searched this trashpile, with values of searched time. var/mob/living/hider // A simple animal that might be hiding in the pile diff --git a/code/game/objects/structures/under_wardrobe.dm b/code/game/objects/structures/under_wardrobe.dm index 7bf83c73c9..3113d6a71e 100644 --- a/code/game/objects/structures/under_wardrobe.dm +++ b/code/game/objects/structures/under_wardrobe.dm @@ -3,7 +3,7 @@ desc = "Holds item of clothing you shouldn't be showing off in the hallways." icon = 'icons/obj/closet.dmi' icon_state = "cabinet_closed" - density = 1 + density = TRUE /obj/structure/undies_wardrobe/attack_hand(var/mob/user) if(!human_who_can_use_underwear(user)) diff --git a/code/game/objects/structures/watercloset.dm b/code/game/objects/structures/watercloset.dm index 4309478e5d..72474fea33 100644 --- a/code/game/objects/structures/watercloset.dm +++ b/code/game/objects/structures/watercloset.dm @@ -5,8 +5,8 @@ desc = "The HT-451, a torque rotation-based, waste disposal unit for small matter. This one seems remarkably clean." icon = 'icons/obj/watercloset.dmi' icon_state = "toilet" - density = 0 - anchored = 1 + density = FALSE + anchored = TRUE var/open = 0 //if the lid is up var/cistern = 0 //if the cistern bit is open var/w_items = 0 //the combined w_class of all the items in the cistern @@ -130,8 +130,8 @@ desc = "The HU-452, an experimental urinal." icon = 'icons/obj/watercloset.dmi' icon_state = "urinal" - density = 0 - anchored = 1 + density = FALSE + anchored = TRUE /obj/structure/urinal/attackby(obj/item/I as obj, mob/user as mob) if(istype(I, /obj/item/weapon/grab)) @@ -154,8 +154,8 @@ desc = "The HS-451. Installed in the 2550s by the Hygiene Division." icon = 'icons/obj/watercloset.dmi' icon_state = "shower" - density = 0 - anchored = 1 + density = FALSE + anchored = TRUE use_power = USE_POWER_OFF var/on = 0 var/obj/effect/mist/mymist = null @@ -182,7 +182,7 @@ icon_state = "mist" plane = MOB_PLANE layer = ABOVE_MOB_LAYER - anchored = 1 + anchored = TRUE mouse_opacity = 0 /obj/machinery/shower/attack_hand(mob/M as mob) @@ -311,7 +311,7 @@ icon = 'icons/obj/watercloset.dmi' icon_state = "sink" desc = "A sink used for washing one's hands and face." - anchored = 1 + anchored = TRUE var/busy = 0 //Something's being washed at the moment /obj/structure/sink/MouseDrop_T(var/obj/item/thing, var/mob/user) diff --git a/code/game/objects/structures/windoor_assembly.dm b/code/game/objects/structures/windoor_assembly.dm index cfae30e563..0677c6a09d 100644 --- a/code/game/objects/structures/windoor_assembly.dm +++ b/code/game/objects/structures/windoor_assembly.dm @@ -13,8 +13,8 @@ name = "windoor assembly" icon = 'icons/obj/doors/windoor.dmi' icon_state = "l_windoor_assembly01" - anchored = 0 - density = 0 + anchored = FALSE + density = FALSE dir = NORTH w_class = ITEMSIZE_NORMAL @@ -36,7 +36,7 @@ ..() if(constructed) state = "01" - anchored = 0 + anchored = FALSE switch(start_dir) if(NORTH, SOUTH, EAST, WEST) set_dir(start_dir) @@ -47,7 +47,7 @@ update_nearby_tiles(need_rebuild=1) /obj/structure/windoor_assembly/Destroy() - density = 0 + density = FALSE update_nearby_tiles() ..() @@ -200,7 +200,7 @@ if(!src) return - density = 1 //Shouldn't matter but just incase + density = TRUE //Shouldn't matter but just incase to_chat(user,"You finish the windoor!") if(secure) diff --git a/code/game/objects/structures/window.dm b/code/game/objects/structures/window.dm index 6083a38a79..12922d655a 100644 --- a/code/game/objects/structures/window.dm +++ b/code/game/objects/structures/window.dm @@ -2,13 +2,13 @@ name = "window" desc = "A window." icon = 'icons/obj/structures_vr.dmi' // VOREStation Edit - New icons - density = 1 + density = TRUE can_atmos_pass = ATMOS_PASS_PROC w_class = ITEMSIZE_NORMAL layer = WINDOW_LAYER pressure_resistance = 4*ONE_ATMOSPHERE - anchored = 1.0 + anchored = TRUE flags = ON_BORDER var/maxhealth = 14.0 var/maximal_heat = T0C + 100 // Maximal heat before this window begins taking damage from fire @@ -167,7 +167,7 @@ tforce = I.throwforce if(reinf) tforce *= 0.25 if(health - tforce <= 7 && !reinf) - anchored = 0 + anchored = FALSE update_verbs() update_nearby_icons() step(src, get_dir(AM, src)) @@ -325,7 +325,7 @@ user.do_attack_animation(src) hit(W.force) if(health <= 7) - anchored = 0 + anchored = FALSE update_nearby_icons() step(src, get_dir(user, src)) else @@ -392,7 +392,7 @@ //player-constructed windows if (constructed) - anchored = 0 + anchored = FALSE state = 0 update_verbs() @@ -405,7 +405,7 @@ /obj/structure/window/Destroy() - density = 0 + density = FALSE update_nearby_tiles() var/turf/location = loc . = ..() diff --git a/code/game/objects/structures/window_spawner.dm b/code/game/objects/structures/window_spawner.dm index dfeecb7be7..53298bbbdf 100644 --- a/code/game/objects/structures/window_spawner.dm +++ b/code/game/objects/structures/window_spawner.dm @@ -7,8 +7,8 @@ name = "window grille spawner" icon = 'icons/obj/structures.dmi' icon_state = "wingrille" - density = 1 - anchored = 1.0 + density = TRUE + anchored = TRUE pressure_resistance = 4*ONE_ATMOSPHERE can_atmos_pass = ATMOS_PASS_NO var/win_path = /obj/structure/window/basic diff --git a/code/game/shuttle_engines.dm b/code/game/shuttle_engines.dm index 579b6f6aea..9217d132bb 100644 --- a/code/game/shuttle_engines.dm +++ b/code/game/shuttle_engines.dm @@ -6,9 +6,9 @@ name = "shuttle window" icon = 'icons/obj/podwindows.dmi' icon_state = "0_0" //The states are a bitflag for connecting window directions, then connecting shuttle wall directions - density = 1 + density = TRUE opacity = 0 - anchored = 1 + anchored = TRUE can_atmos_pass = ATMOS_PASS_NO var/window_flags = 0 // Bitflags to indicate connected windows @@ -48,8 +48,8 @@ /obj/structure/shuttle/engine name = "engine" - density = 1 - anchored = 1.0 + density = TRUE + anchored = TRUE /obj/structure/shuttle/engine/heater name = "heater" diff --git a/code/game/turfs/simulated/wall_attacks.dm b/code/game/turfs/simulated/wall_attacks.dm index c3d1f1aa31..72edce4503 100644 --- a/code/game/turfs/simulated/wall_attacks.dm +++ b/code/game/turfs/simulated/wall_attacks.dm @@ -9,7 +9,7 @@ if(density) can_open = WALL_OPENING //flick("[material.icon_base]fwall_opening", src) - density = 0 + density = FALSE blocks_air = ZONE_BLOCKED update_icon() update_air() @@ -21,7 +21,7 @@ else can_open = WALL_OPENING //flick("[material.icon_base]fwall_closing", src) - density = 1 + density = TRUE blocks_air = AIR_BLOCKED update_icon() update_air() diff --git a/code/game/turfs/simulated/wall_types.dm b/code/game/turfs/simulated/wall_types.dm index 0383d12b4e..c64537d52f 100644 --- a/code/game/turfs/simulated/wall_types.dm +++ b/code/game/turfs/simulated/wall_types.dm @@ -122,7 +122,7 @@ name = "autojoin wall" icon_state = "light" opacity = 1 - density = 1 + density = TRUE blocks_air = 1 var/base_state = "light" //The base iconstate to base sprites on diff --git a/code/game/turfs/simulated/wall_types_vr.dm b/code/game/turfs/simulated/wall_types_vr.dm index 3961e7d22a..b4bb8a5c04 100644 --- a/code/game/turfs/simulated/wall_types_vr.dm +++ b/code/game/turfs/simulated/wall_types_vr.dm @@ -20,7 +20,7 @@ icon = 'icons/turf/stomach_vr.dmi' icon_state = "flesh" opacity = 1 - density = 1 + density = TRUE blocks_air = 1 /turf/simulated/flesh/colour @@ -29,7 +29,7 @@ icon = 'icons/turf/stomach_vr.dmi' icon_state = "colorable-wall" opacity = 1 - density = 1 + density = TRUE blocks_air = 1 /turf/simulated/flesh/attackby() @@ -67,7 +67,7 @@ var/list/flesh_overlay_cache = list() icon = 'icons/goonstation/turf/meatland.dmi' icon_state = "bloodwall_2" opacity = 1 - density = 1 + density = TRUE blocks_air = 1 /turf/simulated/goreeyes @@ -76,7 +76,7 @@ var/list/flesh_overlay_cache = list() icon = 'icons/goonstation/turf/meatland.dmi' icon_state = "bloodwall_4" opacity = 1 - density = 1 + density = TRUE blocks_air = 1 /turf/simulated/shuttle/wall/flock diff --git a/code/game/turfs/simulated/walls.dm b/code/game/turfs/simulated/walls.dm index 55cb4b748d..be1605e0a9 100644 --- a/code/game/turfs/simulated/walls.dm +++ b/code/game/turfs/simulated/walls.dm @@ -4,7 +4,7 @@ icon = 'icons/turf/wall_masks.dmi' icon_state = "generic" opacity = 1 - density = 1 + density = TRUE blocks_air = 1 thermal_conductivity = WALL_HEAT_TRANSFER_COEFFICIENT heat_capacity = 312500 //a little over 5 cm thick , 312500 for 1 m by 2.5 m by 0.25 m plasteel wall diff --git a/code/game/turfs/space/space.dm b/code/game/turfs/space/space.dm index 33bd3eaa2a..aa8d775b9b 100644 --- a/code/game/turfs/space/space.dm +++ b/code/game/turfs/space/space.dm @@ -9,7 +9,7 @@ thermal_conductivity = OPEN_HEAT_TRANSFER_COEFFICIENT can_build_into_floor = TRUE var/keep_sprite = FALSE - var/edge = 0 //If we're an edge + var/edge = FALSE //If we're an edge var/forced_dirs = 0 //Force this one to pretend it's an overedge turf /turf/space/Initialize() diff --git a/code/game/turfs/unsimulated/planetary.dm b/code/game/turfs/unsimulated/planetary.dm index 9fe487410f..8e08b8d26d 100644 --- a/code/game/turfs/unsimulated/planetary.dm +++ b/code/game/turfs/unsimulated/planetary.dm @@ -6,7 +6,7 @@ icon = 'icons/turf/walls.dmi' icon_state = "riveted" opacity = 1 - density = 1 + density = TRUE alpha = 0 blocks_air = 0 diff --git a/code/game/turfs/unsimulated/shuttle.dm b/code/game/turfs/unsimulated/shuttle.dm index cb70c6c36d..ced6d2804b 100644 --- a/code/game/turfs/unsimulated/shuttle.dm +++ b/code/game/turfs/unsimulated/shuttle.dm @@ -8,7 +8,7 @@ name = "wall" icon_state = "light" opacity = 1 - density = 1 + density = TRUE blocks_air = 1 /turf/unsimulated/shuttle/wall/dark diff --git a/code/game/turfs/unsimulated/walls.dm b/code/game/turfs/unsimulated/walls.dm index 6f13cdb54b..878a12404a 100644 --- a/code/game/turfs/unsimulated/walls.dm +++ b/code/game/turfs/unsimulated/walls.dm @@ -3,7 +3,7 @@ icon = 'icons/turf/walls.dmi' icon_state = "riveted" opacity = 1 - density = 1 + density = TRUE blocks_air = TRUE /turf/unsimulated/wall/fakeglass diff --git a/code/game/vehicles/vehicle.dm b/code/game/vehicles/vehicle.dm index 1250c7d961..b7361ea7f7 100644 --- a/code/game/vehicles/vehicle.dm +++ b/code/game/vehicles/vehicle.dm @@ -3,9 +3,9 @@ /obj/vehicle name = "Vehicle" icon = 'icons/vehicles/vehicles.dmi' - density = 1 - anchored = 1 - unacidable = 1 //To avoid the pilot-deleting shit that came with mechas + density = TRUE + anchored = TRUE + unacidable = TRUE //To avoid the pilot-deleting shit that came with mechas layer = MOB_LAYER //var/can_move = 1 var/mob/living/carbon/occupant = null diff --git a/code/modules/admin/verbs/buildmode.dm b/code/modules/admin/verbs/buildmode.dm index 5e9c63949b..290b04bdde 100644 --- a/code/modules/admin/verbs/buildmode.dm +++ b/code/modules/admin/verbs/buildmode.dm @@ -49,8 +49,8 @@ H.cl = M.client /obj/effect/bmode//Cleaning up the tree a bit - density = 1 - anchored = 1 + density = TRUE + anchored = TRUE layer = LAYER_HUD_BASE plane = PLANE_PLAYER_HUD dir = NORTH @@ -179,8 +179,8 @@ return 1 /obj/effect/bmode/buildholder - density = 0 - anchored = 1 + density = FALSE + anchored = TRUE var/client/cl = null var/obj/effect/bmode/builddir/builddir = null var/obj/effect/bmode/buildhelp/buildhelp = null diff --git a/code/modules/assembly/infrared.dm b/code/modules/assembly/infrared.dm index ebe5269f77..af697777f9 100644 --- a/code/modules/assembly/infrared.dm +++ b/code/modules/assembly/infrared.dm @@ -148,7 +148,7 @@ icon_state = "ibeam" var/obj/item/device/assembly/infra/master = null var/visible = 0 - anchored = 1 + anchored = TRUE /obj/effect/beam/i_beam/Initialize() . = ..() diff --git a/code/modules/awaymissions/bluespaceartillery.dm b/code/modules/awaymissions/bluespaceartillery.dm index 331e96efa4..5781085c5e 100644 --- a/code/modules/awaymissions/bluespaceartillery.dm +++ b/code/modules/awaymissions/bluespaceartillery.dm @@ -4,8 +4,8 @@ name = "bluespace artillery control" icon_state = "control_boxp1" icon = 'icons/obj/machines/particle_accelerator2.dmi' - density = 1 - anchored = 1 + density = TRUE + anchored = TRUE /obj/machinery/artillerycontrol/process() if(src.reload<180) @@ -14,11 +14,11 @@ /obj/structure/artilleryplaceholder name = "artillery" icon = 'icons/obj/machines/artillery.dmi' - anchored = 1 - density = 1 + anchored = TRUE + density = TRUE /obj/structure/artilleryplaceholder/decorative - density = 0 + density = FALSE /obj/machinery/artillerycontrol/attack_hand(mob/user as mob) user.set_machine(src) diff --git a/code/modules/awaymissions/gateway.dm b/code/modules/awaymissions/gateway.dm index bf734a429f..1fa45f6a10 100644 --- a/code/modules/awaymissions/gateway.dm +++ b/code/modules/awaymissions/gateway.dm @@ -3,15 +3,15 @@ desc = "A mysterious gateway built by unknown hands. It allows for faster than light travel to far-flung locations and even alternate realities." //VOREStation Edit icon = 'icons/obj/machines/gateway.dmi' icon_state = "off" - density = 1 - anchored = 1 + density = TRUE + anchored = TRUE var/active = 0 /obj/machinery/gateway/Initialize() update_icon() if(dir == SOUTH) - density = 0 + density = FALSE . = ..() /obj/machinery/gateway/update_icon() @@ -25,7 +25,7 @@ //this is da important part wot makes things go GLOBAL_DATUM(gateway_station, /obj/machinery/gateway/centerstation) /obj/machinery/gateway/centerstation - density = 1 + density = TRUE icon_state = "offcenter" use_power = USE_POWER_IDLE @@ -50,7 +50,7 @@ GLOBAL_DATUM(gateway_station, /obj/machinery/gateway/centerstation) awaygate = locate(/obj/machinery/gateway/centeraway) . = ..() - density = 1 //VOREStation Add + density = TRUE //VOREStation Add /obj/machinery/gateway/centerstation/Destroy() if(awaygate?.stationgate == src) @@ -66,7 +66,7 @@ GLOBAL_DATUM(gateway_station, /obj/machinery/gateway/centerstation) icon_state = "offcenter" /* VOREStation Removal - Doesn't do anything /obj/machinery/gateway/centerstation/New() - density = 1 + density = TRUE */ //VOREStation Removal End /obj/machinery/gateway/centerstation/process() @@ -238,7 +238,7 @@ GLOBAL_DATUM(gateway_station, /obj/machinery/gateway/centerstation) /////////////////////////////////////Away//////////////////////// GLOBAL_DATUM(gateway_away, /obj/machinery/gateway/centeraway) /obj/machinery/gateway/centeraway - density = 1 + density = TRUE icon_state = "offcenter" use_power = USE_POWER_OFF var/calibrated = 1 @@ -247,7 +247,7 @@ GLOBAL_DATUM(gateway_away, /obj/machinery/gateway/centeraway) var/obj/machinery/gateway/centerstation/stationgate = null /obj/machinery/gateway/centeraway/New() - density = 1 + density = TRUE /obj/machinery/gateway/centeraway/Initialize() if(GLOB.gateway_away) @@ -262,7 +262,7 @@ GLOBAL_DATUM(gateway_away, /obj/machinery/gateway/centeraway) else stationgate = locate(/obj/machinery/gateway/centerstation) . = ..() - density = 1 //VOREStation Add + density = TRUE //VOREStation Add /obj/machinery/gateway/centeraway/Destroy() if(stationgate?.awaygate == src) diff --git a/code/modules/awaymissions/loot_vr.dm b/code/modules/awaymissions/loot_vr.dm index 71a8d44dca..17509ce12e 100644 --- a/code/modules/awaymissions/loot_vr.dm +++ b/code/modules/awaymissions/loot_vr.dm @@ -352,7 +352,7 @@ /**********************************/ /obj/structure/symbol - anchored = 1 + anchored = TRUE layer = 3.5 name = "strange symbol" icon = 'icons/obj/decals_vr.dmi' diff --git a/code/modules/blob/blob.dm b/code/modules/blob/blob.dm index 587214a0cb..5218a78c7f 100644 --- a/code/modules/blob/blob.dm +++ b/code/modules/blob/blob.dm @@ -6,9 +6,9 @@ light_range = 2 light_color = "#b5ff5b" desc = "Some blob creature thingy" - density = 1 + density = TRUE opacity = 0 - anchored = 1 + anchored = TRUE mouse_opacity = 2 var/maxHealth = 30 @@ -193,7 +193,7 @@ update_nearby_tiles() /obj/effect/blob/shield/Destroy() - density = 0 + density = FALSE update_nearby_tiles() ..() diff --git a/code/modules/clothing/masks/monitor.dm b/code/modules/clothing/masks/monitor.dm index 320ea7a90e..0d577443be 100644 --- a/code/modules/clothing/masks/monitor.dm +++ b/code/modules/clothing/masks/monitor.dm @@ -23,14 +23,14 @@ if(istype(H) && H.wear_mask == src) var/obj/item/organ/external/E = H.organs_by_name[BP_HEAD] var/datum/robolimb/robohead = all_robolimbs[E.model] - canremove = 0 + canremove = FALSE if(robohead.monitor_styles) monitor_states = params2list(robohead.monitor_styles) icon_state = monitor_states[monitor_state_index] to_chat(H, "\The [src] connects to your display output.") /obj/item/clothing/mask/monitor/dropped() - canremove = 1 + canremove = TRUE return ..() /obj/item/clothing/mask/monitor/mob_can_equip(var/mob/living/carbon/human/user, var/slot, disable_warning = FALSE) diff --git a/code/modules/clothing/shoes/magboots.dm b/code/modules/clothing/shoes/magboots.dm index bdf2be889d..b775dcf98c 100644 --- a/code/modules/clothing/shoes/magboots.dm +++ b/code/modules/clothing/shoes/magboots.dm @@ -97,7 +97,7 @@ if(src.magpulse) item_flags &= ~NOSLIP magpulse = 0 - canremove = 1 + canremove = TRUE to_chat(user, "You relax your deathgrip on the flooring.") else //make sure these can only be used when equipped. @@ -110,7 +110,7 @@ item_flags |= NOSLIP magpulse = 1 - canremove = 0 //kinda hard to take off magclaws when you are gripping them tightly. + canremove = FALSE //kinda hard to take off magclaws when you are gripping them tightly. to_chat(user, "You dig your claws deeply into the flooring, bracing yourself.") user.update_action_buttons() @@ -121,7 +121,7 @@ user.visible_message("The [src] go limp as they are removed from [usr]'s feet.", "The [src] go limp as they are removed from your feet.") item_flags &= ~NOSLIP magpulse = 0 - canremove = 1 + canremove = TRUE /obj/item/clothing/shoes/magboots/vox/examine(mob/user) . = ..() diff --git a/code/modules/clothing/spacesuits/rig/rig.dm b/code/modules/clothing/spacesuits/rig/rig.dm index f3fc52ce29..2fedc6855d 100644 --- a/code/modules/clothing/spacesuits/rig/rig.dm +++ b/code/modules/clothing/spacesuits/rig/rig.dm @@ -23,7 +23,7 @@ max_heat_protection_temperature = SPACE_SUIT_MAX_HEAT_PROTECTION_TEMPERATURE siemens_coefficient = 0.2 permeability_coefficient = 0.1 - unacidable = 1 + unacidable = TRUE preserve_item = 1 var/default_mob_icon = 'icons/mob/rig_back.dmi' @@ -246,7 +246,7 @@ /obj/item/weapon/rig/proc/reset() offline = 2 - canremove = 1 + canremove = TRUE for(var/obj/item/piece in list(helmet,boots,gloves,chest)) if(!piece) continue piece.icon_state = "[suit_state]" @@ -256,7 +256,7 @@ /obj/item/weapon/rig/proc/cut_suit() offline = 2 - canremove = 1 + canremove = TRUE toggle_piece("helmet", loc, ONLY_RETRACT, TRUE) toggle_piece("gauntlets", loc, ONLY_RETRACT, TRUE) toggle_piece("boots", loc, ONLY_RETRACT, TRUE) @@ -286,7 +286,7 @@ M.client?.screen += booting_L M.client?.screen += booting_R - canremove = 0 // No removing the suit while unsealing. + canremove = FALSE // No removing the suit while unsealing. sealing = 1 if(!seal_target && !suit_is_deployed()) diff --git a/code/modules/clothing/spacesuits/void/wizard.dm b/code/modules/clothing/spacesuits/void/wizard.dm index f86ecf8642..7dab89d1d7 100644 --- a/code/modules/clothing/spacesuits/void/wizard.dm +++ b/code/modules/clothing/spacesuits/void/wizard.dm @@ -4,7 +4,7 @@ desc = "A bizarre gem-encrusted helmet that radiates magical energies." icon_state = "rig0-wiz" item_state_slots = list(slot_r_hand_str = "wiz_helm", slot_l_hand_str = "wiz_helm") - unacidable = 1 //No longer shall our kind be foiled by lone chemists with spray bottles! + unacidable = TRUE //No longer shall our kind be foiled by lone chemists with spray bottles! armor = list(melee = 40, bullet = 20, laser = 20,energy = 20, bomb = 35, bio = 100, rad = 60) siemens_coefficient = 0.7 sprite_sheets_refit = null @@ -17,7 +17,7 @@ desc = "A bizarre gem-encrusted suit that radiates magical energies." item_state_slots = list(slot_r_hand_str = "wiz_voidsuit", slot_l_hand_str = "wiz_voidsuit") w_class = ITEMSIZE_NORMAL - unacidable = 1 + unacidable = TRUE armor = list(melee = 40, bullet = 20, laser = 20,energy = 20, bomb = 35, bio = 100, rad = 60) siemens_coefficient = 0.7 sprite_sheets_refit = null diff --git a/code/modules/detectivework/microscope/dnascanner.dm b/code/modules/detectivework/microscope/dnascanner.dm index 9af65789fe..1017e74df8 100644 --- a/code/modules/detectivework/microscope/dnascanner.dm +++ b/code/modules/detectivework/microscope/dnascanner.dm @@ -4,8 +4,8 @@ desc = "A high tech machine that is designed to read DNA samples properly." icon = 'icons/obj/forensics.dmi' icon_state = "dnaopen" - anchored = 1 - density = 1 + anchored = TRUE + density = TRUE circuit = /obj/item/weapon/circuitboard/dna_analyzer var/obj/item/weapon/forensics/swab/bloodsamp = null diff --git a/code/modules/detectivework/microscope/microscope.dm b/code/modules/detectivework/microscope/microscope.dm index 5b556f4c00..575465d0e0 100644 --- a/code/modules/detectivework/microscope/microscope.dm +++ b/code/modules/detectivework/microscope/microscope.dm @@ -4,8 +4,8 @@ desc = "A highly advanced microscope capable of zooming up to 3000x." icon = 'icons/obj/forensics.dmi' icon_state = "microscope" - anchored = 1 - density = 1 + anchored = TRUE + density = TRUE var/obj/item/weapon/sample = null var/report_num = 0 diff --git a/code/modules/detectivework/tools/rag.dm b/code/modules/detectivework/tools/rag.dm index 4ec669a565..301c99b704 100644 --- a/code/modules/detectivework/tools/rag.dm +++ b/code/modules/detectivework/tools/rag.dm @@ -24,7 +24,7 @@ volume = 10 can_be_placed_into = null flags = OPENCONTAINER | NOBLUDGEON - unacidable = 0 + unacidable = FALSE drop_sound = 'sound/items/drop/cloth.ogg' pickup_sound = 'sound/items/pickup/cloth.ogg' diff --git a/code/modules/economy/ATM.dm b/code/modules/economy/ATM.dm index f09c6ab7bc..8abd3583c0 100644 --- a/code/modules/economy/ATM.dm +++ b/code/modules/economy/ATM.dm @@ -19,7 +19,7 @@ log transactions desc = "For all your monetary needs!" icon = 'icons/obj/terminals_vr.dmi' //VOREStation Edit icon_state = "atm" - anchored = 1 + anchored = TRUE use_power = USE_POWER_IDLE idle_power_usage = 10 circuit = /obj/item/weapon/circuitboard/atm diff --git a/code/modules/economy/Accounts_DB.dm b/code/modules/economy/Accounts_DB.dm index f220f29e14..237f1206cb 100644 --- a/code/modules/economy/Accounts_DB.dm +++ b/code/modules/economy/Accounts_DB.dm @@ -4,9 +4,9 @@ desc = "Access transaction logs, account data and all kinds of other financial records." icon = 'icons/obj/computer.dmi' icon_state = "account_computer" - density = 1 + density = TRUE req_one_access = list(access_hop, access_captain, access_cent_captain) - anchored = 1 + anchored = TRUE var/receipt_num var/machine_id = "" var/obj/item/weapon/card/id/held_card diff --git a/code/modules/economy/cash.dm b/code/modules/economy/cash.dm index c67ddac088..ec2ad51dca 100644 --- a/code/modules/economy/cash.dm +++ b/code/modules/economy/cash.dm @@ -6,8 +6,8 @@ icon = 'icons/obj/items.dmi' icon_state = "spacecash1" opacity = 0 - density = 0 - anchored = 0.0 + density = FALSE + anchored = FALSE force = 1.0 throwforce = 1.0 throw_speed = 1 diff --git a/code/modules/economy/cash_register.dm b/code/modules/economy/cash_register.dm index ddf19d895c..9286401aae 100644 --- a/code/modules/economy/cash_register.dm +++ b/code/modules/economy/cash_register.dm @@ -5,7 +5,7 @@ icon_state = "register_idle" flags = NOBLUDGEON req_access = list(access_heads) - anchored = 1 + anchored = TRUE var/locked = 1 var/cash_locked = 1 diff --git a/code/modules/economy/mint.dm b/code/modules/economy/mint.dm index 8417663150..db50578fe7 100644 --- a/code/modules/economy/mint.dm +++ b/code/modules/economy/mint.dm @@ -3,8 +3,8 @@ name = "Coin press" icon = 'icons/obj/stationobjs.dmi' icon_state = "coinpress0" - density = 1 - anchored = 1.0 + density = TRUE + anchored = TRUE var/obj/machinery/mineral/input = null var/obj/machinery/mineral/output = null var/amt_silver = 0 //amount of silver diff --git a/code/modules/economy/vending.dm b/code/modules/economy/vending.dm index 4086dcd921..bc8130d0e0 100644 --- a/code/modules/economy/vending.dm +++ b/code/modules/economy/vending.dm @@ -11,8 +11,8 @@ desc = "A generic vending machine." icon = 'icons/obj/vending.dmi' icon_state = "generic" - anchored = 1 - density = 1 + anchored = TRUE + density = TRUE clicksound = "button" // Power diff --git a/code/modules/economy/vending_machines.dm b/code/modules/economy/vending_machines.dm index dfd693afd2..af7e905005 100644 --- a/code/modules/economy/vending_machines.dm +++ b/code/modules/economy/vending_machines.dm @@ -406,7 +406,7 @@ product_ads = "Go save some lives!;The best stuff for your medbay.;Only the finest tools.;Natural chemicals!;This stuff saves lives.;Don't you want some?" icon_state = "wallmed" layer = ABOVE_WINDOW_LAYER - density = 0 //It is wall-mounted, and thus, not dense. --Superxpdude + density = FALSE //It is wall-mounted, and thus, not dense. --Superxpdude products = list(/obj/item/stack/medical/bruise_pack = 2, /obj/item/stack/medical/ointment = 2, /obj/item/weapon/reagent_containers/hypospray/autoinjector = 4, @@ -424,7 +424,7 @@ description_fluff = "NanoMed is NanoTrasen's medical science division, and provides almost all of the modern medbay essentials in-house at no extra charge. By using this vending machine, employees accept liability for products that may or may not be temporarily replaced by placebos or experimental treatments." icon_state = "wallmed" layer = ABOVE_WINDOW_LAYER - density = 0 //It is wall-mounted, and thus, not dense. --Superxpdude + density = FALSE //It is wall-mounted, and thus, not dense. --Superxpdude products = list(/obj/item/weapon/reagent_containers/hypospray/autoinjector = 5, /obj/item/weapon/reagent_containers/syringe/antitoxin = 3, /obj/item/stack/medical/bruise_pack = 3, diff --git a/code/modules/events/meteor_strike_vr.dm b/code/modules/events/meteor_strike_vr.dm index 83b1f8ac2d..3ed40c50f3 100644 --- a/code/modules/events/meteor_strike_vr.dm +++ b/code/modules/events/meteor_strike_vr.dm @@ -21,7 +21,7 @@ desc = "The sky is falling!" icon = 'icons/obj/meteor.dmi' icon_state = "large" - anchored = 1 + anchored = TRUE /obj/effect/meteor_falling/New() ..() @@ -73,8 +73,8 @@ desc = "A big hunk of star-stuff." icon = 'icons/obj/meteor.dmi' icon_state = "large" - density = 1 - climbable = 1 + density = TRUE + climbable = TRUE /obj/structure/meteorite/New() ..() diff --git a/code/modules/flufftext/Hallucination.dm b/code/modules/flufftext/Hallucination.dm index 5fac3debd7..963b869439 100644 --- a/code/modules/flufftext/Hallucination.dm +++ b/code/modules/flufftext/Hallucination.dm @@ -222,8 +222,8 @@ Gunshots/explosions/opening doors/less rare audio (done) icon_state = null name = "" desc = "" - density = 0 - anchored = 1 + density = FALSE + anchored = TRUE opacity = 0 var/mob/living/carbon/human/my_target = null var/weapon_name = null diff --git a/code/modules/food/drinkingglass/metaglass.dm b/code/modules/food/drinkingglass/metaglass.dm index b8167f10bb..d182c0837f 100644 --- a/code/modules/food/drinkingglass/metaglass.dm +++ b/code/modules/food/drinkingglass/metaglass.dm @@ -4,7 +4,7 @@ icon_state = "glass_empty" amount_per_transfer_from_this = 5 volume = 30 - unacidable = 1 //glass + unacidable = TRUE //glass center_of_mass = list("x"=16, "y"=10) matter = list(MAT_GLASS = 500) icon = 'icons/obj/drinks.dmi' diff --git a/code/modules/food/food/drinks/bottle.dm b/code/modules/food/food/drinks/bottle.dm index 90979df1e6..831bca128e 100644 --- a/code/modules/food/food/drinks/bottle.dm +++ b/code/modules/food/food/drinks/bottle.dm @@ -18,7 +18,7 @@ /obj/item/weapon/reagent_containers/food/drinks/bottle/Initialize() . = ..() if(isGlass) - unacidable = 1 + unacidable = TRUE drop_sound = 'sound/items/drop/bottle.ogg' pickup_sound = 'sound/items/pickup/bottle.ogg' @@ -184,8 +184,8 @@ item_state = "beer" flags = NOCONDUCT attack_verb = list("stabbed", "slashed", "attacked") - sharp = 1 - edge = 0 + sharp = TRUE + edge = FALSE var/icon/broken_outline = icon('icons/obj/drinks.dmi', "broken") /obj/item/weapon/broken_bottle/attack(mob/living/carbon/M as mob, mob/living/carbon/user as mob) diff --git a/code/modules/food/food/drinks/drinkingglass.dm b/code/modules/food/food/drinks/drinkingglass.dm index 92609ebbd4..da640b272a 100644 --- a/code/modules/food/food/drinks/drinkingglass.dm +++ b/code/modules/food/food/drinks/drinkingglass.dm @@ -6,7 +6,7 @@ icon_state = "glass_empty" amount_per_transfer_from_this = 5 volume = 30 - unacidable = 1 //glass + unacidable = TRUE //glass center_of_mass = list("x"=16, "y"=10) matter = list(MAT_GLASS = 500) diff --git a/code/modules/food/food/drinks/jar.dm b/code/modules/food/food/drinks/jar.dm index 2167eb48a4..515a5bfba8 100644 --- a/code/modules/food/food/drinks/jar.dm +++ b/code/modules/food/food/drinks/jar.dm @@ -5,7 +5,7 @@ icon_state = "jar" item_state = "beaker" center_of_mass = list("x"=15, "y"=8) - unacidable = 1 + unacidable = TRUE /obj/item/weapon/reagent_containers/food/drinks/jar/on_reagent_change() if (reagents.reagent_list.len > 0) diff --git a/code/modules/food/kitchen/cooking_machines/_appliance.dm b/code/modules/food/kitchen/cooking_machines/_appliance.dm index 9a838efeb8..db3025f961 100644 --- a/code/modules/food/kitchen/cooking_machines/_appliance.dm +++ b/code/modules/food/kitchen/cooking_machines/_appliance.dm @@ -10,8 +10,8 @@ desc = "You shouldn't be seeing this!" icon = 'icons/obj/cooking_machines.dmi' var/appliancetype = 0 - density = 1 - anchored = 1 + density = TRUE + anchored = TRUE use_power = USE_POWER_IDLE idle_power_usage = 5 // Power used when turned on, but not processing anything diff --git a/code/modules/food/kitchen/gibber.dm b/code/modules/food/kitchen/gibber.dm index cb52a0ca7b..737072ba55 100644 --- a/code/modules/food/kitchen/gibber.dm +++ b/code/modules/food/kitchen/gibber.dm @@ -4,8 +4,8 @@ desc = "The name isn't descriptive enough?" icon = 'icons/obj/kitchen.dmi' icon_state = "grinder" - density = 1 - anchored = 1 + density = TRUE + anchored = TRUE req_access = list(access_kitchen,access_morgue) var/operating = 0 //Is it on? diff --git a/code/modules/food/kitchen/icecream.dm b/code/modules/food/kitchen/icecream.dm index 9887bc7bd7..7dd64d3574 100644 --- a/code/modules/food/kitchen/icecream.dm +++ b/code/modules/food/kitchen/icecream.dm @@ -12,8 +12,8 @@ desc = "Ding-aling ding dong. Get your NanoTrasen-approved ice cream!" icon = 'icons/obj/kitchen.dmi' icon_state = "icecream_vat" - density = 1 - anchored = 0 + density = TRUE + anchored = FALSE use_power = USE_POWER_OFF flags = OPENCONTAINER | NOREACT diff --git a/code/modules/food/kitchen/microwave.dm b/code/modules/food/kitchen/microwave.dm index 9162286858..bb9ef2a255 100644 --- a/code/modules/food/kitchen/microwave.dm +++ b/code/modules/food/kitchen/microwave.dm @@ -4,8 +4,8 @@ icon = 'icons/obj/kitchen.dmi' icon_state = "mw" layer = 2.9 - density = 1 - anchored = 1 + density = TRUE + anchored = TRUE use_power = USE_POWER_IDLE idle_power_usage = 5 active_power_usage = 2000 diff --git a/code/modules/food/kitchen/smartfridge/smartfridge.dm b/code/modules/food/kitchen/smartfridge/smartfridge.dm index 6e9e47e411..5e0f2e4284 100644 --- a/code/modules/food/kitchen/smartfridge/smartfridge.dm +++ b/code/modules/food/kitchen/smartfridge/smartfridge.dm @@ -7,8 +7,8 @@ icon_state = "smartfridge" var/icon_base = "smartfridge" //Iconstate to base all the broken/deny/etc on var/icon_contents = "misc" //Overlay to put on glass to show contents - density = 1 - anchored = 1 + density = TRUE + anchored = TRUE use_power = USE_POWER_IDLE idle_power_usage = 5 active_power_usage = 100 diff --git a/code/modules/holodeck/HolodeckObjects.dm b/code/modules/holodeck/HolodeckObjects.dm index df08f30b54..96d3bbcabc 100644 --- a/code/modules/holodeck/HolodeckObjects.dm +++ b/code/modules/holodeck/HolodeckObjects.dm @@ -128,7 +128,7 @@ desc = "Apply butt." icon = 'icons/obj/furniture.dmi' icon_state = "stool_padded_preview" - anchored = 1.0 + anchored = TRUE pressure_resistance = 15 /obj/item/clothing/gloves/boxing/hologlove @@ -212,7 +212,7 @@ if(W.damtype == BRUTE || W.damtype == BURN) hit(W.force) if(health <= 7) - anchored = 0 + anchored = FALSE update_nearby_icons() step(src, get_dir(user, src)) else @@ -367,8 +367,8 @@ desc = "Boom, Shakalaka!" icon = 'icons/obj/basketball.dmi' icon_state = "hoop" - anchored = 1 - density = 1 + anchored = TRUE + density = TRUE throwpass = 1 /obj/structure/holohoop/attackby(obj/item/weapon/W as obj, mob/user as mob) @@ -411,7 +411,7 @@ var/area/currentarea = null var/eventstarted = 0 - anchored = 1.0 + anchored = TRUE use_power = USE_POWER_IDLE idle_power_usage = 2 active_power_usage = 6 diff --git a/code/modules/holomap/station_holomap.dm b/code/modules/holomap/station_holomap.dm index 2430267981..8c88102f06 100644 --- a/code/modules/holomap/station_holomap.dm +++ b/code/modules/holomap/station_holomap.dm @@ -7,8 +7,8 @@ icon = 'icons/obj/machines/stationmap.dmi' icon_state = "station_map" layer = ABOVE_WINDOW_LAYER - anchored = 1 - density = 0 + anchored = TRUE + density = FALSE use_power = USE_POWER_IDLE idle_power_usage = 10 active_power_usage = 500 diff --git a/code/modules/hydroponics/beekeeping/beehive.dm b/code/modules/hydroponics/beekeeping/beehive.dm index f514ff8b6a..37f7c5cc79 100644 --- a/code/modules/hydroponics/beekeeping/beehive.dm +++ b/code/modules/hydroponics/beekeeping/beehive.dm @@ -2,8 +2,8 @@ name = "beehive" icon = 'icons/obj/beekeeping.dmi' icon_state = "beehive" - density = 1 - anchored = 1 + density = TRUE + anchored = TRUE var/closed = 0 var/bee_count = 0 // Percent diff --git a/code/modules/hydroponics/seed_machines.dm b/code/modules/hydroponics/seed_machines.dm index 690d970522..32013d9734 100644 --- a/code/modules/hydroponics/seed_machines.dm +++ b/code/modules/hydroponics/seed_machines.dm @@ -35,8 +35,8 @@ /obj/machinery/botany icon = 'icons/obj/hydroponics_machines_vr.dmi' //VOREStation Edit icon_state = "hydrotray3" - density = 1 - anchored = 1 + density = TRUE + anchored = TRUE use_power = USE_POWER_IDLE var/obj/item/seeds/seed // Currently loaded seed packet. diff --git a/code/modules/hydroponics/seed_storage.dm b/code/modules/hydroponics/seed_storage.dm index 8034e3d9ff..3ff2e48174 100644 --- a/code/modules/hydroponics/seed_storage.dm +++ b/code/modules/hydroponics/seed_storage.dm @@ -22,8 +22,8 @@ desc = "It stores, sorts, and dispenses seeds." icon = 'icons/obj/vending.dmi' icon_state = "seeds" - density = 1 - anchored = 1 + density = TRUE + anchored = TRUE use_power = USE_POWER_IDLE idle_power_usage = 100 diff --git a/code/modules/hydroponics/spreading/spreading.dm b/code/modules/hydroponics/spreading/spreading.dm index 73d93abe55..e55bb448bd 100644 --- a/code/modules/hydroponics/spreading/spreading.dm +++ b/code/modules/hydroponics/spreading/spreading.dm @@ -29,9 +29,9 @@ message_admins("Event: Spacevines failed to find a viable turf.") /obj/effect/dead_plant - anchored = 1 + anchored = TRUE opacity = 0 - density = 0 + density = FALSE color = DEAD_PLANT_COLOUR /obj/effect/dead_plant/attack_hand() @@ -45,10 +45,10 @@ /obj/effect/plant name = "plant" - anchored = 1 - can_buckle = 1 + anchored = TRUE + can_buckle = TRUE opacity = 0 - density = 0 + density = FALSE icon = 'icons/obj/hydroponics_growing.dmi' icon_state = "bush4-1" pass_flags = PASSTABLE @@ -197,10 +197,10 @@ plane = ABOVE_PLANE set_opacity(1) if(!isnull(seed.chems["woodpulp"])) - density = 1 + density = TRUE else reset_plane_and_layer() - density = 0 + density = FALSE /obj/effect/plant/proc/calc_dir() set background = 1 diff --git a/code/modules/hydroponics/trays/tray.dm b/code/modules/hydroponics/trays/tray.dm index c049457e75..5eddbb59b8 100644 --- a/code/modules/hydroponics/trays/tray.dm +++ b/code/modules/hydroponics/trays/tray.dm @@ -5,8 +5,8 @@ desc = "A tray usually full of fluid for growing plants." icon = 'icons/obj/hydroponics_machines_vr.dmi' //VOREStation Edit icon_state = "hydrotray3" - density = 1 - anchored = 1 + density = TRUE + anchored = TRUE flags = OPENCONTAINER volume = 100 diff --git a/code/modules/hydroponics/trays/tray_soil.dm b/code/modules/hydroponics/trays/tray_soil.dm index 76a3417645..ff32f9712b 100644 --- a/code/modules/hydroponics/trays/tray_soil.dm +++ b/code/modules/hydroponics/trays/tray_soil.dm @@ -1,7 +1,7 @@ /obj/machinery/portable_atmospherics/hydroponics/soil name = "soil" icon_state = "soil" - density = 0 + density = FALSE use_power = USE_POWER_OFF mechanical = 0 tray_light = 0 diff --git a/code/modules/integrated_electronics/subtypes/reagents.dm b/code/modules/integrated_electronics/subtypes/reagents.dm index ff8bb0f16b..b7fc6ae0b6 100644 --- a/code/modules/integrated_electronics/subtypes/reagents.dm +++ b/code/modules/integrated_electronics/subtypes/reagents.dm @@ -1,7 +1,7 @@ /obj/item/integrated_circuit/reagent category_text = "Reagent" var/volume = 0 - unacidable = 1 + unacidable = TRUE origin_tech = list(TECH_ENGINEERING = 2, TECH_DATA = 2, TECH_BIO = 2) /obj/item/integrated_circuit/reagent/New() diff --git a/code/modules/library/lib_items.dm b/code/modules/library/lib_items.dm index af20cc0959..85a06cd571 100644 --- a/code/modules/library/lib_items.dm +++ b/code/modules/library/lib_items.dm @@ -16,8 +16,8 @@ desc = "A set of wooden shelves, perfect for placing books on." icon = 'icons/obj/library.dmi' icon_state = "book-0" - anchored = 1 - density = 1 + anchored = TRUE + density = TRUE opacity = 1 /obj/structure/bookcase/Initialize() @@ -104,7 +104,7 @@ Book Cart name = "book cart" icon = 'icons/obj/library.dmi' icon_state = "bookcart-0" - anchored = 0 + anchored = FALSE opacity = 0 /obj/structure/bookcase/bookcart/attackby(obj/item/O as obj, mob/user as mob) diff --git a/code/modules/library/lib_machines.dm b/code/modules/library/lib_machines.dm index f1f518d375..50980217a3 100644 --- a/code/modules/library/lib_machines.dm +++ b/code/modules/library/lib_machines.dm @@ -24,8 +24,8 @@ name = "visitor computer" icon = 'icons/obj/library.dmi' icon_state = "computer" - anchored = 1 - density = 1 + anchored = TRUE + density = TRUE var/screenstate = 0 var/title var/category = "Any" @@ -127,8 +127,8 @@ desc = "Print books from the archives! (You aren't quite sure how they're printed by it, though.)" icon = 'icons/obj/library.dmi' icon_state = "computer" - anchored = 1 - density = 1 + anchored = TRUE + density = TRUE var/arcanecheckout = 0 var/screenstate = 0 // 0 - Main Menu, 1 - Inventory, 2 - Checked Out, 3 - Check Out a Book var/sortby = "author" @@ -488,8 +488,8 @@ desc = "A scanner for scanning in books and papers." icon = 'icons/obj/library.dmi' icon_state = "bigscanner" - anchored = 1 - density = 1 + anchored = TRUE + density = TRUE var/obj/item/weapon/book/cache // Last scanned book /obj/machinery/libraryscanner/attackby(var/obj/O as obj, var/mob/user as mob) @@ -540,8 +540,8 @@ desc = "Bundles up a stack of inserted paper into a convenient book format." icon = 'icons/obj/library.dmi' icon_state = "binder" - anchored = 1 - density = 1 + anchored = TRUE + density = TRUE /obj/machinery/bookbinder/attackby(var/obj/O as obj, var/mob/user as mob) if(istype(O, /obj/item/weapon/paper) || istype(O, /obj/item/weapon/paper_bundle)) diff --git a/code/modules/mining/drilling/drill.dm b/code/modules/mining/drilling/drill.dm index e21275504c..f1b8816c8a 100644 --- a/code/modules/mining/drilling/drill.dm +++ b/code/modules/mining/drilling/drill.dm @@ -1,8 +1,8 @@ /obj/machinery/mining icon = 'icons/obj/mining_drill.dmi' - anchored = 0 + anchored = FALSE use_power = USE_POWER_OFF //The drill takes power directly from a cell. - density = 1 + density = TRUE layer = MOB_LAYER+0.1 //So it draws over mobs in the tile north of it. /obj/machinery/mining/drill @@ -266,10 +266,10 @@ if((!supports || !supports.len) && initial(anchored) == 0) icon_state = "mining_drill" - anchored = 0 + anchored = FALSE active = 0 else - anchored = 1 + anchored = TRUE if(supports && supports.len >= braces_needed) supported = 1 diff --git a/code/modules/mining/machinery/machine_input_output_plates.dm b/code/modules/mining/machinery/machine_input_output_plates.dm index 35149a49b3..179a8f112b 100644 --- a/code/modules/mining/machinery/machine_input_output_plates.dm +++ b/code/modules/mining/machinery/machine_input_output_plates.dm @@ -4,8 +4,8 @@ icon = 'icons/mob/screen1.dmi' icon_state = "x2" name = "Input area" - density = 0 - anchored = 1.0 + density = FALSE + anchored = TRUE /obj/machinery/mineral/input/New() icon_state = "blank" @@ -14,8 +14,8 @@ icon = 'icons/mob/screen1.dmi' icon_state = "x" name = "Output area" - density = 0 - anchored = 1.0 + density = FALSE + anchored = TRUE /obj/machinery/mineral/output/New() icon_state = "blank" \ No newline at end of file diff --git a/code/modules/mining/machinery/machine_stacking.dm b/code/modules/mining/machinery/machine_stacking.dm index 9469b2d64d..030c52f764 100644 --- a/code/modules/mining/machinery/machine_stacking.dm +++ b/code/modules/mining/machinery/machine_stacking.dm @@ -5,8 +5,8 @@ icon = 'icons/obj/machines/mining_machines_vr.dmi' // VOREStation Edit icon_state = "console" layer = ABOVE_WINDOW_LAYER - density = 1 - anchored = 1 + density = TRUE + anchored = TRUE var/obj/machinery/mineral/stacking_machine/machine = null //var/machinedir = SOUTHEAST //This is really dumb, so lets burn it with fire. @@ -77,8 +77,8 @@ name = "stacking machine" icon = 'icons/obj/machines/mining_machines_vr.dmi' // VOREStation Edit icon_state = "stacker" - density = 1 - anchored = 1.0 + density = TRUE + anchored = TRUE var/obj/machinery/mineral/stacking_unit_console/console var/obj/machinery/mineral/input = null var/obj/machinery/mineral/output = null diff --git a/code/modules/mining/machinery/machine_unloading.dm b/code/modules/mining/machinery/machine_unloading.dm index 73caa57bc1..ed609e4dfa 100644 --- a/code/modules/mining/machinery/machine_unloading.dm +++ b/code/modules/mining/machinery/machine_unloading.dm @@ -5,8 +5,8 @@ name = "unloading machine" icon = 'icons/obj/machines/mining_machines_vr.dmi' // VOREStation Edit icon_state = "unloader" - density = 1 - anchored = 1.0 + density = TRUE + anchored = TRUE var/obj/machinery/mineral/input = null var/obj/machinery/mineral/output = null diff --git a/code/modules/mining/mine_items.dm b/code/modules/mining/mine_items.dm index 4d89004424..e8593efb5d 100644 --- a/code/modules/mining/mine_items.dm +++ b/code/modules/mining/mine_items.dm @@ -26,7 +26,7 @@ attack_verb = list("hit", "pierced", "sliced", "attacked") var/drill_sound = "pickaxe" var/drill_verb = "drilling" - sharp = 1 + sharp = TRUE var/excavation_amount = 200 var/destroy_artefacts = FALSE // some mining tools will destroy artefacts completely while avoiding side-effects. @@ -78,8 +78,8 @@ desc = "A rock cutter that uses bursts of hot plasma. You could use it to cut limbs off of xenos! Or, you know, mine stuff." drill_verb = "cutting" drill_sound = 'sound/items/Welder.ogg' - sharp = 1 - edge = 1 + sharp = TRUE + edge = TRUE /obj/item/weapon/pickaxe/diamond name = "diamond pickaxe" @@ -124,8 +124,8 @@ origin_tech = list(TECH_MATERIAL = 1, TECH_ENGINEERING = 1) matter = list(MAT_STEEL = 50) attack_verb = list("bashed", "bludgeoned", "thrashed", "whacked") - sharp = 0 - edge = 1 + sharp = FALSE + edge = TRUE var/digspeed = 40 /obj/item/weapon/shovel/spade @@ -144,7 +144,7 @@ desc = "A mining car. This one doesn't work on rails, but has to be dragged." name = "Mining car (not for rails)" icon = 'icons/obj/closets/miningcar.dmi' - density = 1 + density = TRUE // Flags. @@ -193,7 +193,7 @@ if(upright) upright = 0 icon_state = base_state - anchored = 0 + anchored = FALSE src.visible_message("[user] knocks down [src].") else ..() diff --git a/code/modules/mining/mine_outcrops.dm b/code/modules/mining/mine_outcrops.dm index 989b172e1e..ae70e710e3 100644 --- a/code/modules/mining/mine_outcrops.dm +++ b/code/modules/mining/mine_outcrops.dm @@ -2,10 +2,10 @@ name = "outcrop" desc = "A boring rocky outcrop." icon = 'icons/obj/outcrop.dmi' - density = 1 + density = TRUE throwpass = 1 - climbable = 1 - anchored = 1 + climbable = TRUE + anchored = TRUE icon_state = "outcrop" var/mindrop = 5 var/upperdrop = 10 diff --git a/code/modules/mining/mine_turfs.dm b/code/modules/mining/mine_turfs.dm index 3af97e5e75..9155f054a4 100644 --- a/code/modules/mining/mine_turfs.dm +++ b/code/modules/mining/mine_turfs.dm @@ -5,7 +5,7 @@ var/list/mining_overlay_cache = list() name = "impassable rock" icon = 'icons/turf/walls.dmi' icon_state = "rock-dark" - density = 1 + density = TRUE opacity = 1 // YW edit. Stops all my unsimulated tiles from being seethrough. //YW add start @@ -27,7 +27,7 @@ var/list/mining_overlay_cache = list() oxygen = 0 nitrogen = 0 opacity = 1 - density = 1 + density = TRUE blocks_air = 1 temperature = T0C @@ -113,7 +113,7 @@ var/list/mining_overlay_cache = list() name = "sand" icon = 'icons/turf/flooring/asteroid.dmi' icon_state = "asteroid" - density = 0 + density = FALSE opacity = 0 blocks_air = 0 can_build_into_floor = TRUE @@ -145,7 +145,7 @@ var/list/mining_overlay_cache = list() /turf/simulated/mineral/proc/make_floor() if(!density && !opacity) return - density = 0 + density = FALSE opacity = 0 blocks_air = 0 can_build_into_floor = TRUE @@ -154,7 +154,7 @@ var/list/mining_overlay_cache = list() /turf/simulated/mineral/proc/make_wall() if(density && opacity) return - density = 1 + density = TRUE opacity = 1 blocks_air = 1 can_build_into_floor = FALSE diff --git a/code/modules/mining/mineral_effect.dm b/code/modules/mining/mineral_effect.dm index f8bc4a03d6..43bd5c8588 100644 --- a/code/modules/mining/mineral_effect.dm +++ b/code/modules/mining/mineral_effect.dm @@ -3,8 +3,8 @@ icon = 'icons/obj/mining.dmi' desc = "Shiny." mouse_opacity = 0 - density = 0 - anchored = 1 + density = FALSE + anchored = TRUE var/ore_key var/image/scanner_image var/ore_reagent // Reagent from pumping water near this ore. diff --git a/code/modules/mining/ore_box.dm b/code/modules/mining/ore_box.dm index 965ec4a9df..7ab96cda10 100644 --- a/code/modules/mining/ore_box.dm +++ b/code/modules/mining/ore_box.dm @@ -5,7 +5,7 @@ icon_state = "orebox0" name = "ore box" desc = "A heavy box used for storing ore." - density = 1 + density = TRUE var/last_update = 0 var/list/stored_ore = list() diff --git a/code/modules/mob/dead/observer/observer.dm b/code/modules/mob/dead/observer/observer.dm index a3ff5cf5c7..9e80b75da5 100644 --- a/code/modules/mob/dead/observer/observer.dm +++ b/code/modules/mob/dead/observer/observer.dm @@ -1,7 +1,7 @@ /mob/observer name = "observer" desc = "This shouldn't appear" - density = 0 + density = FALSE vis_flags = NONE /mob/observer/dead @@ -12,7 +12,7 @@ stat = DEAD canmove = 0 blinded = 0 - anchored = 1 // don't get pushed around + anchored = TRUE // don't get pushed around var/can_reenter_corpse var/datum/hud/living/carbon/hud = null // hud diff --git a/code/modules/mob/living/bot/SLed209bot.dm b/code/modules/mob/living/bot/SLed209bot.dm index c4fd4b2767..82f3c43cc2 100644 --- a/code/modules/mob/living/bot/SLed209bot.dm +++ b/code/modules/mob/living/bot/SLed209bot.dm @@ -3,7 +3,7 @@ desc = "A security robot. He looks less than thrilled." icon = 'icons/obj/aibots.dmi' icon_state = "sled2090" - density = 1 + density = TRUE health = 200 maxHealth = 200 diff --git a/code/modules/mob/living/bot/bot.dm b/code/modules/mob/living/bot/bot.dm index e2ba25cec0..9e47e4e702 100644 --- a/code/modules/mob/living/bot/bot.dm +++ b/code/modules/mob/living/bot/bot.dm @@ -5,7 +5,7 @@ icon = 'icons/obj/aibots.dmi' layer = MOB_LAYER universal_speak = 1 - density = 0 + density = FALSE makes_dirt = FALSE // No more dirt from Beepsky diff --git a/code/modules/mob/living/bot/ed209bot.dm b/code/modules/mob/living/bot/ed209bot.dm index f0e58c455f..17d2da7878 100644 --- a/code/modules/mob/living/bot/ed209bot.dm +++ b/code/modules/mob/living/bot/ed209bot.dm @@ -3,7 +3,7 @@ desc = "A security robot. He looks less than thrilled." icon = 'icons/obj/aibots.dmi' icon_state = "ed2090" - density = 1 + density = TRUE health = 200 maxHealth = 200 diff --git a/code/modules/mob/living/bot/mulebot.dm b/code/modules/mob/living/bot/mulebot.dm index 66d5a595cf..0f851d6dd5 100644 --- a/code/modules/mob/living/bot/mulebot.dm +++ b/code/modules/mob/living/bot/mulebot.dm @@ -11,8 +11,8 @@ name = "Mulebot" desc = "A Multiple Utility Load Effector bot." icon_state = "mulebot0" - anchored = 1 - density = 1 + anchored = TRUE + density = TRUE health = 150 maxHealth = 150 mob_bump_flag = HEAVY diff --git a/code/modules/mob/living/bot/secbot.dm b/code/modules/mob/living/bot/secbot.dm index a035861265..d1a309c410 100644 --- a/code/modules/mob/living/bot/secbot.dm +++ b/code/modules/mob/living/bot/secbot.dm @@ -14,7 +14,7 @@ target_speed = 3 max_frustration = 7 //CHOMPEdit - density = 1 + density = TRUE var/default_icon_state = "secbot" var/idcheck = FALSE // If true, arrests for having weapons without authorization. diff --git a/code/modules/mob/living/carbon/human/species/species_attack.dm b/code/modules/mob/living/carbon/human/species/species_attack.dm index 2755255252..3b38201206 100644 --- a/code/modules/mob/living/carbon/human/species/species_attack.dm +++ b/code/modules/mob/living/carbon/human/species/species_attack.dm @@ -3,8 +3,8 @@ attack_verb = list("bit", "chomped on") attack_sound = 'sound/weapons/bite.ogg' shredding = 0 - sharp = 1 - edge = 1 + sharp = TRUE + edge = TRUE /datum/unarmed_attack/diona attack_name = "tendrils" @@ -21,8 +21,8 @@ eye_attack_text_victim = "sharp claws" attack_sound = 'sound/weapons/slice.ogg' miss_sound = 'sound/weapons/slashmiss.ogg' - sharp = 1 - edge = 1 + sharp = TRUE + edge = TRUE /datum/unarmed_attack/claws/show_attack(var/mob/living/carbon/human/user, var/mob/living/carbon/human/target, var/zone, var/attack_damage) var/skill = user.skills["combat"] diff --git a/code/modules/mob/living/carbon/human/species/species_attack_vr.dm b/code/modules/mob/living/carbon/human/species/species_attack_vr.dm index 2742b66a60..bff44609ea 100644 --- a/code/modules/mob/living/carbon/human/species/species_attack_vr.dm +++ b/code/modules/mob/living/carbon/human/species/species_attack_vr.dm @@ -3,8 +3,8 @@ attack_noun = list("fangs") attack_sound = 'sound/weapons/bite.ogg' shredding = 0 - sharp = 1 - edge = 1 + sharp = TRUE + edge = TRUE /datum/unarmed_attack/bite/sharp/numbing/show_attack(var/mob/living/carbon/human/user, var/mob/living/carbon/human/target, var/zone, var/attack_damage) var/obj/item/organ/external/affecting = target.get_organ(zone) diff --git a/code/modules/mob/living/carbon/human/species/station/traits_vr/weaver_objs.dm b/code/modules/mob/living/carbon/human/species/station/traits_vr/weaver_objs.dm index a315c8218e..cd5f64e5c6 100644 --- a/code/modules/mob/living/carbon/human/species/station/traits_vr/weaver_objs.dm +++ b/code/modules/mob/living/carbon/human/species/station/traits_vr/weaver_objs.dm @@ -4,8 +4,8 @@ name = "weaversilk web" desc = "A thin layer of fiberous webs. It looks like it can be torn down with one strong hit." icon = 'icons/vore/weaver_icons_vr.dmi' - anchored = 1 - density = 0 + anchored = TRUE + density = FALSE /obj/effect/weaversilk/ex_act(severity) qdel(src) @@ -50,7 +50,7 @@ desc = "A thin layer of fiberous webs, but just thick enough to block your way. It looks like it can be torn down with one strong hit." icon_state = "wallweb1" var/possible_icon_states = list("wallweb1", "wallweb2", "wallweb3") - density = 1 + density = TRUE /obj/effect/weaversilk/wall/Initialize() ..() diff --git a/code/modules/mob/living/carbon/human/unarmed_attack.dm b/code/modules/mob/living/carbon/human/unarmed_attack.dm index 2c70b6dacc..fff19eef7e 100644 --- a/code/modules/mob/living/carbon/human/unarmed_attack.dm +++ b/code/modules/mob/living/carbon/human/unarmed_attack.dm @@ -9,8 +9,8 @@ var/global/list/sparring_attack_cache = list() var/attack_sound = "punch" var/miss_sound = 'sound/weapons/punchmiss.ogg' var/shredding = 0 // Calls the old attack_alien() behavior on objects/mobs when on harm intent. - var/sharp = 0 - var/edge = 0 + var/sharp = FALSE + var/edge = FALSE var/damage_type = BRUTE var/sparring_variant_type = /datum/unarmed_attack/light_strike @@ -115,8 +115,8 @@ var/global/list/sparring_attack_cache = list() attack_sound = 'sound/weapons/bite.ogg' shredding = 0 damage = 0 - sharp = 0 - edge = 0 + sharp = FALSE + edge = FALSE /datum/unarmed_attack/bite/event1 @@ -281,5 +281,5 @@ var/global/list/sparring_attack_cache = list() damage_type = AGONY shredding = 0 damage = 0 - sharp = 0 - edge = 0 + sharp = FALSE + edge = FALSE diff --git a/code/modules/mob/living/carbon/metroid/items.dm b/code/modules/mob/living/carbon/metroid/items.dm index 45c30cb3e3..cc04791e04 100644 --- a/code/modules/mob/living/carbon/metroid/items.dm +++ b/code/modules/mob/living/carbon/metroid/items.dm @@ -256,12 +256,12 @@ qdel(src)*/ */ /obj/effect/golemrune - anchored = 1 + anchored = TRUE desc = "a strange rune used to create golems. It glows when spirits are nearby." name = "rune" icon = 'icons/obj/rune.dmi' icon_state = "golem" - unacidable = 1 + unacidable = TRUE layer = TURF_LAYER New() diff --git a/code/modules/mob/living/carbon/metroid/powers.dm b/code/modules/mob/living/carbon/metroid/powers.dm index 2b55a95afc..8da3a5debd 100644 --- a/code/modules/mob/living/carbon/metroid/powers.dm +++ b/code/modules/mob/living/carbon/metroid/powers.dm @@ -32,7 +32,7 @@ Victim = M loc = M.loc canmove = 0 - anchored = 1 + anchored = TRUE regenerate_icons() @@ -81,7 +81,7 @@ break canmove = 1 - anchored = 0 + anchored = FALSE if(M && invalidFeedTarget(M)) // This means that the slime drained the victim if(!client) diff --git a/code/modules/mob/living/living.dm b/code/modules/mob/living/living.dm index 634ae06b52..592d7d0db2 100644 --- a/code/modules/mob/living/living.dm +++ b/code/modules/mob/living/living.dm @@ -833,21 +833,21 @@ if(!V.riding_datum) // If it has a riding datum, the datum handles moving the pixel_ vars. pixel_y = V.mob_offset_y else if(buckled) - anchored = 1 + anchored = TRUE canmove = 1 //The line above already makes the chair not swooce away if the sitter presses a button. No need to incapacitate them as a criminally large amount of mechanics read this var as a type of stun. if(istype(buckled)) if(buckled.buckle_lying != -1) lying = buckled.buckle_lying canmove = buckled.buckle_movable if(buckled.buckle_movable) - anchored = 0 + anchored = FALSE canmove = 1 else lying = incapacitated(INCAPACITATION_KNOCKDOWN) canmove = !incapacitated(INCAPACITATION_DISABLED) if(lying) - density = 0 + density = FALSE if(l_hand) unEquip(l_hand) if(r_hand) diff --git a/code/modules/mob/living/silicon/ai/ai.dm b/code/modules/mob/living/silicon/ai/ai.dm index e19fa16745..2a0a307818 100644 --- a/code/modules/mob/living/silicon/ai/ai.dm +++ b/code/modules/mob/living/silicon/ai/ai.dm @@ -44,8 +44,8 @@ var/list/ai_verbs_default = list( name = "AI" icon = 'icons/mob/AI.dmi'// icon_state = "ai" - anchored = 1 // -- TLE - density = 1 + anchored = TRUE // -- TLE + density = TRUE status_flags = CANSTUN|CANPARALYSE|CANPUSH shouldnt_see = list(/mob/observer/eye, /obj/effect/rune) var/list/network = list(NETWORK_DEFAULT) @@ -124,9 +124,9 @@ var/list/ai_verbs_default = list( if(!is_dummy) aiPDA = new/obj/item/device/pda/ai(src) SetName(pickedName) - anchored = 1 + anchored = TRUE canmove = 0 - density = 1 + density = TRUE loc = loc if(!is_dummy) @@ -761,7 +761,7 @@ var/list/ai_verbs_default = list( user.visible_message("\The [user] decides not to unbolt \the [src].") return user.visible_message("\The [user] finishes unfastening \the [src]!") - anchored = 0 + anchored = FALSE return else playsound(src, W.usesound, 50, 1) @@ -770,7 +770,7 @@ var/list/ai_verbs_default = list( user.visible_message("\The [user] decides not to bolt \the [src].") return user.visible_message("\The [user] finishes fastening down \the [src]!") - anchored = 1 + anchored = TRUE return else return ..() diff --git a/code/modules/mob/living/silicon/ai/death.dm b/code/modules/mob/living/silicon/ai/death.dm index d6d5baf1d9..9c26f64c43 100644 --- a/code/modules/mob/living/silicon/ai/death.dm +++ b/code/modules/mob/living/silicon/ai/death.dm @@ -20,4 +20,4 @@ card.update_icon() . = ..(gibbed,"gives one shrill beep before falling lifeless.") - density = 1 + density = TRUE diff --git a/code/modules/mob/living/silicon/decoy/decoy.dm b/code/modules/mob/living/silicon/decoy/decoy.dm index 673edeea87..6abdaadde8 100644 --- a/code/modules/mob/living/silicon/decoy/decoy.dm +++ b/code/modules/mob/living/silicon/decoy/decoy.dm @@ -2,7 +2,7 @@ name = "AI" icon = 'icons/mob/AI.dmi'// icon_state = "ai" - anchored = 1 // -- TLE + anchored = TRUE // -- TLE canmove = 0 /mob/living/silicon/decoy/New() diff --git a/code/modules/mob/living/silicon/robot/dogborg/dog_modules_vr.dm b/code/modules/mob/living/silicon/robot/dogborg/dog_modules_vr.dm index af07971ed7..eb6dc881a9 100644 --- a/code/modules/mob/living/silicon/robot/dogborg/dog_modules_vr.dm +++ b/code/modules/mob/living/silicon/robot/dogborg/dog_modules_vr.dm @@ -336,8 +336,8 @@ icon_state = "swordtail" desc = "A glowing pink dagger normally attached to the end of a cyborg's tail. It appears to be extremely sharp." force = 20 //Takes 5 hits to 100-0 - sharp = 1 - edge = 1 + sharp = TRUE + edge = TRUE throwforce = 0 //This shouldn't be thrown in the first place. hitsound = 'sound/weapons/blade1.ogg' attack_verb = list("slashed", "stabbed", "jabbed", "mauled", "sliced") diff --git a/code/modules/mob/living/silicon/robot/drone/drone.dm b/code/modules/mob/living/silicon/robot/drone/drone.dm index d615f41290..aca27b3791 100644 --- a/code/modules/mob/living/silicon/robot/drone/drone.dm +++ b/code/modules/mob/living/silicon/robot/drone/drone.dm @@ -32,7 +32,7 @@ var/list/mob_hat_cache = list() pass_flags = PASSTABLE braintype = "Drone" lawupdate = 0 - density = 1 + density = TRUE req_access = list(access_engine, access_robotics) integrated_light_power = 3 local_transmit = 1 diff --git a/code/modules/mob/living/silicon/robot/drone/drone_manufacturer.dm b/code/modules/mob/living/silicon/robot/drone/drone_manufacturer.dm index a3e8d71f48..22851e5632 100644 --- a/code/modules/mob/living/silicon/robot/drone/drone_manufacturer.dm +++ b/code/modules/mob/living/silicon/robot/drone/drone_manufacturer.dm @@ -9,8 +9,8 @@ desc = "A large automated factory for producing maintenance drones." appearance_flags = 0 - density = 1 - anchored = 1 + density = TRUE + anchored = TRUE use_power = USE_POWER_IDLE idle_power_usage = 20 active_power_usage = 5000 diff --git a/code/modules/mob/living/silicon/robot/drone/swarm.dm b/code/modules/mob/living/silicon/robot/drone/swarm.dm index 3db976437b..153594801c 100644 --- a/code/modules/mob/living/silicon/robot/drone/swarm.dm +++ b/code/modules/mob/living/silicon/robot/drone/swarm.dm @@ -14,7 +14,7 @@ pass_flags = PASSTABLE braintype = "Drone" lawupdate = 0 - density = 1 + density = TRUE idcard_type = /obj/item/weapon/card/id/syndicate req_access = list(999) integrated_light_power = 3 diff --git a/code/modules/mob/living/simple_mob/life.dm b/code/modules/mob/living/simple_mob/life.dm index 493a68e43b..05d7d8a4a3 100644 --- a/code/modules/mob/living/simple_mob/life.dm +++ b/code/modules/mob/living/simple_mob/life.dm @@ -151,7 +151,7 @@ purge -= 1 /mob/living/simple_mob/death(gibbed, deathmessage = "dies!") - density = 0 //We don't block even if we did before + density = FALSE //We don't block even if we did before if(has_eye_glow) remove_eyes() diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/giant_spider/_giant_spider.dm b/code/modules/mob/living/simple_mob/subtypes/animal/giant_spider/_giant_spider.dm index c0c44250a8..6f7e6f4626 100644 --- a/code/modules/mob/living/simple_mob/subtypes/animal/giant_spider/_giant_spider.dm +++ b/code/modules/mob/living/simple_mob/subtypes/animal/giant_spider/_giant_spider.dm @@ -85,7 +85,7 @@ melee_damage_lower = 18 melee_damage_upper = 30 - attack_sharp = 1 + attack_sharp = TRUE attack_edge = 1 attack_sound = 'sound/weapons/bite.ogg' diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/passive/mouse.dm b/code/modules/mob/living/simple_mob/subtypes/animal/passive/mouse.dm index 8fe1799d12..1a2094c15d 100644 --- a/code/modules/mob/living/simple_mob/subtypes/animal/passive/mouse.dm +++ b/code/modules/mob/living/simple_mob/subtypes/animal/passive/mouse.dm @@ -21,7 +21,7 @@ // can_pull_size = ITEMSIZE_TINY // can_pull_mobs = MOB_PULL_NONE layer = MOB_LAYER - density = 0 + density = FALSE response_help = "pets" response_disarm = "gently pushes aside" diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/passive/possum.dm b/code/modules/mob/living/simple_mob/subtypes/animal/passive/possum.dm index 614a15a5b3..329655a808 100644 --- a/code/modules/mob/living/simple_mob/subtypes/animal/passive/possum.dm +++ b/code/modules/mob/living/simple_mob/subtypes/animal/passive/possum.dm @@ -126,7 +126,7 @@ response_help = "pets" response_disarm = "gently pushes aside" response_harm = "stamps on" - density = 0 + density = FALSE minbodytemp = 223 maxbodytemp = 323 universal_speak = FALSE diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/sif/diyaab.dm b/code/modules/mob/living/simple_mob/subtypes/animal/sif/diyaab.dm index dcdfdf04f0..989ca0266b 100644 --- a/code/modules/mob/living/simple_mob/subtypes/animal/sif/diyaab.dm +++ b/code/modules/mob/living/simple_mob/subtypes/animal/sif/diyaab.dm @@ -34,7 +34,7 @@ melee_damage_lower = 2 melee_damage_upper = 6 base_attack_cooldown = 1 SECOND - attack_sharp = 1 //Bleeds, but it shouldn't rip off a limb? + attack_sharp = TRUE //Bleeds, but it shouldn't rip off a limb? attacktext = list("gouged") say_list_type = /datum/say_list/diyaab diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/sif/hare.dm b/code/modules/mob/living/simple_mob/subtypes/animal/sif/hare.dm index e796cd488b..5b67a8604c 100644 --- a/code/modules/mob/living/simple_mob/subtypes/animal/sif/hare.dm +++ b/code/modules/mob/living/simple_mob/subtypes/animal/sif/hare.dm @@ -52,7 +52,7 @@ mob_size = MOB_SMALL pass_flags = PASSTABLE layer = MOB_LAYER - density = 0 + density = FALSE response_help = "pets" response_disarm = "nudges" diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/sif/siffet.dm b/code/modules/mob/living/simple_mob/subtypes/animal/sif/siffet.dm index 40ae65d3bc..f649e5a68f 100644 --- a/code/modules/mob/living/simple_mob/subtypes/animal/sif/siffet.dm +++ b/code/modules/mob/living/simple_mob/subtypes/animal/sif/siffet.dm @@ -35,7 +35,7 @@ melee_damage_lower = 10 melee_damage_upper = 15 base_attack_cooldown = 1 SECOND - attack_sharp = 1 + attack_sharp = TRUE attacktext = list("sliced", "snapped", "gnawed") say_list_type = /datum/say_list/siffet diff --git a/code/modules/mob/living/simple_mob/subtypes/horror/Master.dm b/code/modules/mob/living/simple_mob/subtypes/horror/Master.dm index b76cc5cddd..430cb4e865 100644 --- a/code/modules/mob/living/simple_mob/subtypes/horror/Master.dm +++ b/code/modules/mob/living/simple_mob/subtypes/horror/Master.dm @@ -10,7 +10,7 @@ icon = 'icons/mob/horror_show/master.dmi' vis_height = 64 icon_gib = "generic_gib" - anchored = 1 + anchored = TRUE attack_sound = 'sound/h_sounds/shitty_tim.ogg' diff --git a/code/modules/mob/living/simple_mob/subtypes/humanoid/mercs/mercs.dm b/code/modules/mob/living/simple_mob/subtypes/humanoid/mercs/mercs.dm index 2770d6ff98..cf6b2649a8 100644 --- a/code/modules/mob/living/simple_mob/subtypes/humanoid/mercs/mercs.dm +++ b/code/modules/mob/living/simple_mob/subtypes/humanoid/mercs/mercs.dm @@ -25,7 +25,7 @@ melee_damage_lower = 15 //Tac Knife damage melee_damage_upper = 15 attack_armor_pen = 20 - attack_sharp = 1 + attack_sharp = TRUE attack_edge = 1 attacktext = list("slashed", "stabbed") armor = list(melee = 40, bullet = 30, laser = 30, energy = 10, bomb = 10, bio = 100, rad = 100) // Same armor values as the vest they drop, plus simple mob immunities @@ -112,7 +112,7 @@ melee_damage_lower = 30 melee_damage_upper = 30 attack_armor_pen = 50 - attack_sharp = 1 + attack_sharp = TRUE attack_edge = 1 attacktext = list("slashed") diff --git a/code/modules/mob/living/simple_mob/subtypes/humanoid/pirates.dm b/code/modules/mob/living/simple_mob/subtypes/humanoid/pirates.dm index 3927b1dcf1..253bfb73b8 100644 --- a/code/modules/mob/living/simple_mob/subtypes/humanoid/pirates.dm +++ b/code/modules/mob/living/simple_mob/subtypes/humanoid/pirates.dm @@ -16,7 +16,7 @@ melee_damage_lower = 30 melee_damage_upper = 30 attack_armor_pen = 30 - attack_sharp = 1 + attack_sharp = TRUE attack_edge = 1 attacktext = list("slashed") diff --git a/code/modules/mob/living/simple_mob/subtypes/mechanical/corrupt_maint_drone_vr.dm b/code/modules/mob/living/simple_mob/subtypes/mechanical/corrupt_maint_drone_vr.dm index f71242a637..a75c0c2f2f 100644 --- a/code/modules/mob/living/simple_mob/subtypes/mechanical/corrupt_maint_drone_vr.dm +++ b/code/modules/mob/living/simple_mob/subtypes/mechanical/corrupt_maint_drone_vr.dm @@ -39,7 +39,7 @@ melee_damage_lower = 6 // Approx 12 DPS. melee_damage_upper = 6 base_attack_cooldown = 2.5 // Four attacks per second. - attack_sharp = 1 + attack_sharp = TRUE attack_edge = 1 attack_sound = 'sound/weapons/bladeslice.ogg' attacktext = list("cut", "sliced") diff --git a/code/modules/mob/living/simple_mob/subtypes/mechanical/viscerator.dm b/code/modules/mob/living/simple_mob/subtypes/mechanical/viscerator.dm index 4545057bc6..87e8b4223e 100644 --- a/code/modules/mob/living/simple_mob/subtypes/mechanical/viscerator.dm +++ b/code/modules/mob/living/simple_mob/subtypes/mechanical/viscerator.dm @@ -40,7 +40,7 @@ melee_damage_lower = 4 // Approx 8 DPS. melee_damage_upper = 4 base_attack_cooldown = 5 // Two attacks a second or so. - attack_sharp = 1 + attack_sharp = TRUE attack_edge = 1 attack_sound = 'sound/weapons/bladeslice.ogg' attacktext = list("cut", "sliced") diff --git a/code/modules/mob/living/simple_mob/subtypes/occult/constructs/harvester.dm b/code/modules/mob/living/simple_mob/subtypes/occult/constructs/harvester.dm index 9328d9cffd..a161548d99 100644 --- a/code/modules/mob/living/simple_mob/subtypes/occult/constructs/harvester.dm +++ b/code/modules/mob/living/simple_mob/subtypes/occult/constructs/harvester.dm @@ -14,7 +14,7 @@ health = 150 melee_damage_lower = 20 melee_damage_upper = 25 - attack_sharp = 1 + attack_sharp = TRUE attacktext = list("violently stabbed") friendly = list("caresses") movement_cooldown = 0 diff --git a/code/modules/mob/living/simple_mob/subtypes/occult/constructs/wraith.dm b/code/modules/mob/living/simple_mob/subtypes/occult/constructs/wraith.dm index 13580bc845..0b8f69c7a9 100644 --- a/code/modules/mob/living/simple_mob/subtypes/occult/constructs/wraith.dm +++ b/code/modules/mob/living/simple_mob/subtypes/occult/constructs/wraith.dm @@ -15,7 +15,7 @@ melee_damage_lower = 25 melee_damage_upper = 30 attack_armor_pen = 15 - attack_sharp = 1 + attack_sharp = TRUE attack_edge = 1 attacktext = list("slashed") friendly = list("pinches") diff --git a/code/modules/mob/living/simple_mob/subtypes/occult/creature.dm b/code/modules/mob/living/simple_mob/subtypes/occult/creature.dm index 3cc9df4fa3..fe385ee60b 100644 --- a/code/modules/mob/living/simple_mob/subtypes/occult/creature.dm +++ b/code/modules/mob/living/simple_mob/subtypes/occult/creature.dm @@ -18,7 +18,7 @@ melee_damage_lower = 8 melee_damage_upper = 15 attack_armor_pen = 5 //It's a horror from beyond, I ain't gotta explain 5 AP - attack_sharp = 1 + attack_sharp = TRUE attack_edge = 1 attacktext = list("chomped") diff --git a/code/modules/mob/living/simple_mob/subtypes/vore/solargrub.dm b/code/modules/mob/living/simple_mob/subtypes/vore/solargrub.dm index 67747a76ca..6e37675856 100644 --- a/code/modules/mob/living/simple_mob/subtypes/vore/solargrub.dm +++ b/code/modules/mob/living/simple_mob/subtypes/vore/solargrub.dm @@ -82,7 +82,7 @@ var/global/list/moth_amount = 0 // Chompstation Addition, Rykka waz here. *pawst var/datum/effect/effect/system/spark_spread/sparks = new /datum/effect/effect/system/spark_spread() sparks.set_up(5, 0, get_turf(src)) sparks.start() - anchored = 1 + anchored = TRUE PN = attached.powernet PN.draw_power(powerdraw) // previous value 150000 // CHOMPEDIT Start, Rykka waz here. *pawstamp* charge = charge + (powerdraw/1000) //This adds raw powerdraw to charge(Charge is in Ks as in 1 = 1000) // CHOMPEDIT End, Rykka waz here. *pawstamp* @@ -95,7 +95,7 @@ var/global/list/moth_amount = 0 // Chompstation Addition, Rykka waz here. *pawst var/drain_val = min(apc_drain_rate, cur_charge) A.cell.use(drain_val * CELLRATE) else if(!attached && anchored) - anchored = 0 + anchored = FALSE PN = null // CHOMPEDIT Start, Rykka waz here. *pawstamp* diff --git a/code/modules/mob/living/simple_mob/subtypes/vore/solargrub_larva.dm b/code/modules/mob/living/simple_mob/subtypes/vore/solargrub_larva.dm index 156ad340bc..72e2532792 100644 --- a/code/modules/mob/living/simple_mob/subtypes/vore/solargrub_larva.dm +++ b/code/modules/mob/living/simple_mob/subtypes/vore/solargrub_larva.dm @@ -30,7 +30,7 @@ var/global/list/grub_machine_overlays = list() pass_flags = PASSTABLE can_pull_size = ITEMSIZE_TINY can_pull_mobs = MOB_PULL_NONE - density = 0 + density = FALSE //stop_when_pulled = 0 diff --git a/code/modules/mob/mob.dm b/code/modules/mob/mob.dm index 5da7d82557..af947a7b6e 100644 --- a/code/modules/mob/mob.dm +++ b/code/modules/mob/mob.dm @@ -945,7 +945,7 @@ if(O == selection) pinned -= O if(!pinned.len) - anchored = 0 + anchored = FALSE return 1 //Check for brain worms in head. diff --git a/code/modules/mob/mob_defines.dm b/code/modules/mob/mob_defines.dm index 4cdaa0dc95..dc1f1fc219 100644 --- a/code/modules/mob/mob_defines.dm +++ b/code/modules/mob/mob_defines.dm @@ -1,5 +1,5 @@ /mob - density = 1 + density = TRUE layer = MOB_LAYER plane = MOB_PLANE animate_movement = 2 @@ -90,7 +90,7 @@ var/canmove = 1 //Allows mobs to move through dense areas without restriction. For instance, in space or out of holder objects. var/incorporeal_move = 0 //0 is off, 1 is normal, 2 is for ninjas. - var/unacidable = 0 + var/unacidable = FALSE var/list/pinned = list() // List of things pinning this creature to walls (see living_defense.dm) var/list/embedded = list() // Embedded items, since simple mobs don't have organs. var/list/languages = list() // For speaking/listening. diff --git a/code/modules/mob/new_player/new_player.dm b/code/modules/mob/new_player/new_player.dm index 74ef9043fb..81e0c91d4a 100644 --- a/code/modules/mob/new_player/new_player.dm +++ b/code/modules/mob/new_player/new_player.dm @@ -11,11 +11,11 @@ invisibility = 101 - density = 0 + density = FALSE stat = 2 canmove = 0 - anchored = 1 // don't get pushed around + anchored = TRUE // don't get pushed around var/created_for diff --git a/code/modules/modular_computers/NTNet/NTNet_relay.dm b/code/modules/modular_computers/NTNet/NTNet_relay.dm index 9e39fe8e2e..8da5a9972f 100644 --- a/code/modules/modular_computers/NTNet/NTNet_relay.dm +++ b/code/modules/modular_computers/NTNet/NTNet_relay.dm @@ -6,8 +6,8 @@ active_power_usage = 20000 //20kW, apropriate for machine that keeps massive cross-Zlevel wireless network operational. idle_power_usage = 100 icon_state = "ntnet" - anchored = 1 - density = 1 + anchored = TRUE + density = TRUE circuit = /obj/item/weapon/circuitboard/ntnet_relay var/datum/ntnet/NTNet = null // This is mostly for backwards reference and to allow varedit modifications from ingame. var/enabled = 1 // Set to 0 if the relay was turned off diff --git a/code/modules/modular_computers/computers/subtypes/dev_console.dm b/code/modules/modular_computers/computers/subtypes/dev_console.dm index d7dbeed75d..a259651da6 100644 --- a/code/modules/modular_computers/computers/subtypes/dev_console.dm +++ b/code/modules/modular_computers/computers/subtypes/dev_console.dm @@ -8,7 +8,7 @@ icon_state_menu = "menu" hardware_flag = PROGRAM_CONSOLE anchored = TRUE - density = 1 + density = TRUE layer = 2.9 base_idle_power_usage = 100 base_active_power_usage = 500 diff --git a/code/modules/modular_computers/computers/subtypes/dev_telescreen.dm b/code/modules/modular_computers/computers/subtypes/dev_telescreen.dm index 33aaa2120c..f1ae59c80c 100644 --- a/code/modules/modular_computers/computers/subtypes/dev_telescreen.dm +++ b/code/modules/modular_computers/computers/subtypes/dev_telescreen.dm @@ -9,7 +9,7 @@ icon_state_screensaver = "standby" hardware_flag = PROGRAM_TELESCREEN anchored = TRUE - density = 0 + density = FALSE base_idle_power_usage = 75 base_active_power_usage = 300 max_hardware_size = 2 @@ -53,7 +53,7 @@ valid = TRUE if(valid) - anchored = 1 + anchored = TRUE screen_on = TRUE to_chat(user, "You secure \the [src].") return diff --git a/code/modules/multiz/hoist.dm b/code/modules/multiz/hoist.dm index c5b31e7bed..d8c064f56e 100644 --- a/code/modules/multiz/hoist.dm +++ b/code/modules/multiz/hoist.dm @@ -21,8 +21,8 @@ icon = 'icons/obj/hoists.dmi' icon_state = "hoist_hook" var/obj/structure/hoist/source_hoist - can_buckle = 1 - anchored = 1 + can_buckle = TRUE + anchored = TRUE description_info = "Click and drag someone (or any object) to this to attach them to the clamp. If you are within reach, when you click and drag this to a turf adjacent to you, it will move the attached object there and release it." /obj/effect/hoist_hook/attack_hand(mob/living/user) @@ -91,8 +91,8 @@ icon = 'icons/obj/hoists.dmi' icon_state = "hoist_base" var/broken = 0 - density = 1 - anchored = 1 + density = TRUE + anchored = TRUE name = "hoist" desc = "A manual hoist, uses a clamp and pulley to hoist things." var/atom/movable/hoistee diff --git a/code/modules/multiz/ladder_assembly_vr.dm b/code/modules/multiz/ladder_assembly_vr.dm index 3f335c4b6a..49f765225a 100644 --- a/code/modules/multiz/ladder_assembly_vr.dm +++ b/code/modules/multiz/ladder_assembly_vr.dm @@ -6,9 +6,9 @@ name = "ladder assembly" icon = 'icons/obj/structures.dmi' icon_state = "ladder00" - density = 0 + density = FALSE opacity = 0 - anchored = 0 + anchored = FALSE w_class = ITEMSIZE_HUGE var/state = 0 diff --git a/code/modules/multiz/ladders.dm b/code/modules/multiz/ladders.dm index 6b03f8f610..e45e61e482 100644 --- a/code/modules/multiz/ladders.dm +++ b/code/modules/multiz/ladders.dm @@ -3,9 +3,9 @@ desc = "A ladder. You can climb it up and down." icon_state = "ladder01" icon = 'icons/obj/structures/multiz.dmi' - density = 0 + density = FALSE opacity = 0 - anchored = 1 + anchored = TRUE var/allowed_directions = DOWN var/obj/structure/ladder/target_up diff --git a/code/modules/multiz/ladders_vr.dm b/code/modules/multiz/ladders_vr.dm index 8f96800a7e..6892e2ef12 100644 --- a/code/modules/multiz/ladders_vr.dm +++ b/code/modules/multiz/ladders_vr.dm @@ -3,10 +3,10 @@ desc = "Looks unstable. Best to test it with the clown." icon = 'icons/obj/stationobjs.dmi' icon_state = "portal" - density = 1 - unacidable = 1//Can't destroy energy portals. + density = TRUE + unacidable = TRUE//Can't destroy energy portals. var/failchance = 0 - anchored = 1 + anchored = TRUE var/obj/structure/portal_subtle/target /obj/structure/portal_subtle/Destroy() @@ -64,9 +64,9 @@ desc = "Looks unstable. Best to test it with the clown." icon = 'icons/obj/stationobjs_vr.dmi' icon_state = "portalgateway" - density = 1 - unacidable = 1//Can't destroy energy portals. - anchored = 1 + density = TRUE + unacidable = TRUE//Can't destroy energy portals. + anchored = TRUE /obj/structure/portal_gateway/Bumped(mob/M as mob|obj) if(istype(M,/mob) && !(istype(M,/mob/living))) diff --git a/code/modules/multiz/stairs.dm b/code/modules/multiz/stairs.dm index d2956ae194..ef92ffa18d 100644 --- a/code/modules/multiz/stairs.dm +++ b/code/modules/multiz/stairs.dm @@ -6,8 +6,8 @@ icon = 'icons/obj/structures/multiz.dmi' icon_state = "stair" opacity = 0 - density = 0 - anchored = 1 + density = FALSE + anchored = TRUE layer = STAIRS_LAYER /obj/structure/stairs/Initialize() diff --git a/code/modules/multiz/turf.dm b/code/modules/multiz/turf.dm index ab2bcf6e3d..b3bbddfd4b 100644 --- a/code/modules/multiz/turf.dm +++ b/code/modules/multiz/turf.dm @@ -48,7 +48,7 @@ GLOBAL_DATUM_INIT(openspace_backdrop_one_for_all, /atom/movable/openspace_backdr icon = 'icons/turf/floors.dmi' icon_state = "invisible" desc = "Watch your step!" - density = 0 + density = FALSE plane = OPENSPACE_PLANE pathweight = 100000 //Seriously, don't try and path over this one numbnuts dynamic_lighting = 0 // Someday lets do proper lighting z-transfer. Until then we are leaving this off so it looks nicer. diff --git a/code/modules/nifsoft/nif_softshop.dm b/code/modules/nifsoft/nif_softshop.dm index 836ab61233..9ba72f215e 100644 --- a/code/modules/nifsoft/nif_softshop.dm +++ b/code/modules/nifsoft/nif_softshop.dm @@ -13,7 +13,7 @@ var/global/list/starting_legal_nifsoft var/global/list/starting_illegal_nifsoft - density = 0 + density = FALSE opacity = 0 var/datum/entopic/entopic diff --git a/code/modules/nifsoft/software/10_combat.dm b/code/modules/nifsoft/software/10_combat.dm index d44b4bc3b2..ef70cf1854 100644 --- a/code/modules/nifsoft/software/10_combat.dm +++ b/code/modules/nifsoft/software/10_combat.dm @@ -56,8 +56,8 @@ var/global/datum/unarmed_attack/hardclaws/unarmed_hardclaws = new() damage = 15 attack_sound = "punch" miss_sound = 'sound/weapons/punchmiss.ogg' - sharp = 1 - edge = 1 + sharp = TRUE + edge = TRUE sparring_variant_type = /datum/unarmed_attack/hardclaws /datum/nifsoft/hidelaser diff --git a/code/modules/organs/organ.dm b/code/modules/organs/organ.dm index e5df765bdc..646787d088 100644 --- a/code/modules/organs/organ.dm +++ b/code/modules/organs/organ.dm @@ -177,7 +177,7 @@ var/list/organ_cache = list() if(!owner && reagents) var/datum/reagent/blood/B = locate(/datum/reagent/blood) in reagents.reagent_list - if(B && prob(40)) + if(B && prob(40) && !isbelly(loc)) //VOREStation Edit reagents.remove_reagent("blood",0.1) blood_splatter(src,B,1) if(config.organs_decay && decays) damage += rand(1,3) diff --git a/code/modules/overmap/overmap_shuttle.dm b/code/modules/overmap/overmap_shuttle.dm index 86ee893f1e..c827835fb9 100644 --- a/code/modules/overmap/overmap_shuttle.dm +++ b/code/modules/overmap/overmap_shuttle.dm @@ -126,8 +126,8 @@ desc = "The fuel input port of the shuttle. Holds one fuel tank. Use a crowbar to open and close it." icon = 'icons/turf/shuttle_parts.dmi' icon_state = "fuel_port" - density = 0 - anchored = 1 + density = FALSE + anchored = TRUE var/icon_closed = "fuel_port" var/icon_empty = "fuel_port_empty" var/icon_full = "fuel_port_full" diff --git a/code/modules/overmap/sectors.dm b/code/modules/overmap/sectors.dm index 4b461a6a52..1b422c01d3 100644 --- a/code/modules/overmap/sectors.dm +++ b/code/modules/overmap/sectors.dm @@ -190,7 +190,7 @@ name = "generic sector" desc = "Sector with some stuff in it." icon_state = "sector" - anchored = 1 + anchored = TRUE // Because of the way these are spawned, they will potentially have their invisibility adjusted by the turfs they are mapped on // prior to being moved to the overmap. This blocks that. Use set_invisibility to adjust invisibility as needed instead. diff --git a/code/modules/overmap/ships/computers/helm.dm b/code/modules/overmap/ships/computers/helm.dm index 8de83e1a72..e0692314f9 100644 --- a/code/modules/overmap/ships/computers/helm.dm +++ b/code/modules/overmap/ships/computers/helm.dm @@ -278,7 +278,7 @@ GLOBAL_LIST_EMPTY(all_waypoints) icon_keyboard = null icon_screen = null circuit = /obj/item/weapon/circuitboard/nav/tele - density = 0 + density = FALSE /obj/machinery/computer/ship/navigation/telescreen/update_icon() if(stat & NOPOWER || stat & BROKEN) diff --git a/code/modules/overmap/ships/computers/sensors.dm b/code/modules/overmap/ships/computers/sensors.dm index 86e4a91f52..3775af9a75 100644 --- a/code/modules/overmap/ships/computers/sensors.dm +++ b/code/modules/overmap/ships/computers/sensors.dm @@ -128,7 +128,7 @@ desc = "Long range gravity scanner with various other sensors, used to detect irregularities in surrounding space. Can only run in vacuum to protect delicate quantum BS elements." //VOREStation Edit icon = 'icons/obj/stationobjs_vr.dmi' //VOREStation Edit icon_state = "sensors" - anchored = 1 + anchored = TRUE var/max_health = 200 var/health = 200 var/critical_heat = 50 // sparks and takes damage when active & above this heat diff --git a/code/modules/overmap/ships/engines/gas_thruster.dm b/code/modules/overmap/ships/engines/gas_thruster.dm index 40f2183dc7..773ed97a64 100644 --- a/code/modules/overmap/ships/engines/gas_thruster.dm +++ b/code/modules/overmap/ships/engines/gas_thruster.dm @@ -58,7 +58,7 @@ icon = 'icons/turf/shuttle_parts.dmi' icon_state = "nozzle" opacity = 1 - density = 1 + density = TRUE can_atmos_pass = ATMOS_PASS_NO connect_types = CONNECT_TYPE_REGULAR|CONNECT_TYPE_FUEL @@ -188,7 +188,7 @@ icon = 'icons/effects/effects.dmi' icon_state = "smoke" light_color = "#ed9200" - anchored = 1 + anchored = TRUE /obj/effect/engine_exhaust/New(var/turf/nloc, var/ndir, var/flame) ..(nloc) diff --git a/code/modules/overmap/turfs.dm b/code/modules/overmap/turfs.dm index 6647d16a4d..9d7a35c226 100644 --- a/code/modules/overmap/turfs.dm +++ b/code/modules/overmap/turfs.dm @@ -13,7 +13,7 @@ var/global/list/map_sectors = list() /turf/unsimulated/map/edge opacity = 1 - density = 1 + density = TRUE var/map_is_to_my var/turf/unsimulated/map/edge/wrap_buddy diff --git a/code/modules/paperwork/filingcabinet.dm b/code/modules/paperwork/filingcabinet.dm index c4fa72a9b5..396390a650 100644 --- a/code/modules/paperwork/filingcabinet.dm +++ b/code/modules/paperwork/filingcabinet.dm @@ -14,8 +14,8 @@ desc = "A large cabinet with drawers." icon = 'icons/obj/bureaucracy.dmi' icon_state = "filingcabinet" - density = 1 - anchored = 1 + density = TRUE + anchored = TRUE /obj/structure/filingcabinet/chestdrawer name = "chest drawer" diff --git a/code/modules/paperwork/paper.dm b/code/modules/paperwork/paper.dm index e8b3c52d82..0f0ea8e2ef 100644 --- a/code/modules/paperwork/paper.dm +++ b/code/modules/paperwork/paper.dm @@ -665,7 +665,7 @@ /obj/item/weapon/paper/flag icon_state = "flag_neutral" item_state = "paper" - anchored = 1.0 + anchored = TRUE /obj/item/weapon/paper/jobs name = "Job Information" diff --git a/code/modules/paperwork/papershredder.dm b/code/modules/paperwork/papershredder.dm index 223608f0aa..19a0994699 100644 --- a/code/modules/paperwork/papershredder.dm +++ b/code/modules/paperwork/papershredder.dm @@ -7,8 +7,8 @@ icon = 'icons/obj/papershredder.dmi' icon_state = "shredder-off" var/shred_anim = "shredder-shredding" - density = 1 - anchored = 1 + density = TRUE + anchored = TRUE use_power = USE_POWER_IDLE idle_power_usage = 10 active_power_usage = 200 diff --git a/code/modules/paperwork/pen.dm b/code/modules/paperwork/pen.dm index 8cb60d4405..5f5a088b5b 100644 --- a/code/modules/paperwork/pen.dm +++ b/code/modules/paperwork/pen.dm @@ -150,8 +150,8 @@ embed_chance = active_embed_chance force = active_force throwforce = active_throwforce - sharp = 1 - edge = 1 + sharp = TRUE + edge = TRUE w_class = active_w_class playsound(src, 'sound/weapons/saberon.ogg', 15, 1) damtype = SEARING diff --git a/code/modules/paperwork/photocopier.dm b/code/modules/paperwork/photocopier.dm index e420187151..74cceb11f6 100644 --- a/code/modules/paperwork/photocopier.dm +++ b/code/modules/paperwork/photocopier.dm @@ -4,8 +4,8 @@ icon = 'icons/obj/library.dmi' icon_state = "bigscanner" var/insert_anim = "bigscanner1" - anchored = 1 - density = 1 + anchored = TRUE + density = TRUE use_power = USE_POWER_IDLE idle_power_usage = 30 active_power_usage = 200 diff --git a/code/modules/persistence/filth.dm b/code/modules/persistence/filth.dm index 059f1b61fe..55590c805c 100644 --- a/code/modules/persistence/filth.dm +++ b/code/modules/persistence/filth.dm @@ -5,7 +5,7 @@ icon_state = "mfloor1" random_icon_states = list("mfloor1", "mfloor2", "mfloor3", "mfloor4", "mfloor5", "mfloor6", "mfloor7") color = "#464f33" - anchored = 1 + anchored = TRUE persistent = TRUE /obj/effect/decal/cleanable/filth/Initialize() diff --git a/code/modules/persistence/graffiti.dm b/code/modules/persistence/graffiti.dm index 999a82ea90..fefc73c199 100644 --- a/code/modules/persistence/graffiti.dm +++ b/code/modules/persistence/graffiti.dm @@ -9,7 +9,7 @@ blend_mode = BLEND_MULTIPLY color = "#000000" alpha = 120 - anchored = 1 + anchored = TRUE var/message var/graffiti_age = 0 diff --git a/code/modules/persistence/noticeboard.dm b/code/modules/persistence/noticeboard.dm index ced0b3128b..c187225fa1 100644 --- a/code/modules/persistence/noticeboard.dm +++ b/code/modules/persistence/noticeboard.dm @@ -4,8 +4,8 @@ icon = 'icons/obj/stationobjs.dmi' icon_state = "nboard00" layer = ABOVE_WINDOW_LAYER - density = 0 - anchored = 1 + density = FALSE + anchored = TRUE var/list/notices var/base_icon_state = "nboard0" var/const/max_notices = 5 diff --git a/code/modules/power/antimatter/containment_jar.dm b/code/modules/power/antimatter/containment_jar.dm index dd0e503bd4..f2da66eea0 100644 --- a/code/modules/power/antimatter/containment_jar.dm +++ b/code/modules/power/antimatter/containment_jar.dm @@ -3,8 +3,8 @@ desc = "Holds antimatter." icon = 'icons/obj/machines/antimatter.dmi' icon_state = "jar" - density = 0 - anchored = 0 + density = FALSE + anchored = FALSE force = 8 throwforce = 10 throw_speed = 1 diff --git a/code/modules/power/antimatter/control.dm b/code/modules/power/antimatter/control.dm index 93e48f2bb4..8f3c3db009 100644 --- a/code/modules/power/antimatter/control.dm +++ b/code/modules/power/antimatter/control.dm @@ -3,8 +3,8 @@ desc = "This device injects antimatter into connected shielding units, the more antimatter injected the more power produced. Wrench the device to set it up." icon = 'icons/obj/machines/antimatter.dmi' icon_state = "control" - anchored = 1 - density = 1 + anchored = TRUE + density = TRUE use_power = USE_POWER_IDLE idle_power_usage = 100 active_power_usage = 1000 diff --git a/code/modules/power/antimatter/engine.dm b/code/modules/power/antimatter/engine.dm index 13f230bbb6..613c866020 100644 --- a/code/modules/power/antimatter/engine.dm +++ b/code/modules/power/antimatter/engine.dm @@ -1,7 +1,7 @@ /obj/machinery/power/am_engine icon = 'icons/am_engine.dmi' - density = 1 - anchored = 1.0 + density = TRUE + anchored = TRUE flags = ON_BORDER /obj/machinery/power/am_engine/bits diff --git a/code/modules/power/antimatter/fuel.dm b/code/modules/power/antimatter/fuel.dm index e54f0eb0d7..bd78186a96 100644 --- a/code/modules/power/antimatter/fuel.dm +++ b/code/modules/power/antimatter/fuel.dm @@ -4,8 +4,8 @@ icon = 'icons/obj/items.dmi' icon_state = "rcdammo" opacity = 0 - density = 0 - anchored = 0.0 + density = FALSE + anchored = FALSE var/fuel = 0 var/s_time = 1.0 var/content = null diff --git a/code/modules/power/antimatter/shielding.dm b/code/modules/power/antimatter/shielding.dm index 8dfd12a296..3dc9e97af3 100644 --- a/code/modules/power/antimatter/shielding.dm +++ b/code/modules/power/antimatter/shielding.dm @@ -13,8 +13,8 @@ icon = 'icons/obj/machines/antimatter.dmi' icon_state = "shield" - anchored = 1 - density = 1 + anchored = TRUE + density = TRUE dir = 1 use_power = USE_POWER_OFF //Living things generally dont use power idle_power_usage = 0 diff --git a/code/modules/power/apc.dm b/code/modules/power/apc.dm index 0d16617feb..f6f02bb277 100644 --- a/code/modules/power/apc.dm +++ b/code/modules/power/apc.dm @@ -81,7 +81,7 @@ GLOBAL_LIST_EMPTY(apcs) icon = 'icons/obj/power.dmi' icon_state = "apc0" layer = ABOVE_WINDOW_LAYER - anchored = 1 + anchored = TRUE use_power = USE_POWER_OFF clicksound = "switch" req_access = list(access_engine_equip) diff --git a/code/modules/power/breaker_box.dm b/code/modules/power/breaker_box.dm index 5ebf482679..669600bab7 100644 --- a/code/modules/power/breaker_box.dm +++ b/code/modules/power/breaker_box.dm @@ -12,8 +12,8 @@ //directwired = 0 var/icon_state_on = "bbox_on" var/icon_state_off = "bbox_off" - density = 1 - anchored = 1 + density = TRUE + anchored = TRUE circuit = /obj/item/weapon/circuitboard/breakerbox var/on = 0 var/busy = 0 diff --git a/code/modules/power/cable.dm b/code/modules/power/cable.dm index cdc7f4343a..b71ee80b28 100644 --- a/code/modules/power/cable.dm +++ b/code/modules/power/cable.dm @@ -45,7 +45,7 @@ var/list/possible_cable_coil_colours = list( /obj/structure/cable level = 1 - anchored =1 + anchored =TRUE var/datum/powernet/powernet name = "power cable" desc = "A flexible superconducting cable for heavy-duty power transfer." diff --git a/code/modules/power/cable_ender.dm b/code/modules/power/cable_ender.dm index 20ca1fdd05..5a581e37be 100644 --- a/code/modules/power/cable_ender.dm +++ b/code/modules/power/cable_ender.dm @@ -11,7 +11,7 @@ plane = PLATING_PLANE layer = PIPES_LAYER - 0.05 //Just below pipes color = null - unacidable = 1 + unacidable = TRUE var/id = null /obj/structure/cable/ender/get_connections(var/powernetless_only = 0) diff --git a/code/modules/power/debug_items.dm b/code/modules/power/debug_items.dm index c7ca43705b..0fe6e9fb07 100644 --- a/code/modules/power/debug_items.dm +++ b/code/modules/power/debug_items.dm @@ -1,8 +1,8 @@ /obj/machinery/power/debug_items/ icon = 'icons/obj/power.dmi' icon_state = "tracker" - anchored = 1 - density = 1 + anchored = TRUE + density = TRUE var/show_extended_information = 1 // Set to 0 to disable extra information on examining (for example, when used on admin events) /obj/machinery/power/debug_items/examine(mob/user) diff --git a/code/modules/power/fusion/core/_core.dm b/code/modules/power/fusion/core/_core.dm index aba9087b75..0fb5626a57 100644 --- a/code/modules/power/fusion/core/_core.dm +++ b/code/modules/power/fusion/core/_core.dm @@ -12,11 +12,11 @@ GLOBAL_LIST_EMPTY(fusion_cores) desc = "An enormous solenoid for generating extremely high power electromagnetic fields. It includes a kinetic energy harvester." icon = 'icons/obj/machines/power/fusion.dmi' icon_state = "core0" - density = 1 + density = TRUE use_power = USE_POWER_IDLE idle_power_usage = 50 active_power_usage = 500 //multiplied by field strength - anchored = 0 + anchored = FALSE circuit = /obj/item/weapon/circuitboard/fusion_core @@ -30,7 +30,7 @@ GLOBAL_LIST_EMPTY(fusion_cores) var/reactant_dump = FALSE // Does the tokomak actively try to syphon materials? /obj/machinery/power/fusion_core/mapped - anchored = 1 + anchored = TRUE /obj/machinery/power/fusion_core/Initialize() . = ..() diff --git a/code/modules/power/fusion/fuel_assembly/fuel_compressor.dm b/code/modules/power/fusion/fuel_assembly/fuel_compressor.dm index fd691c65cb..9720d17245 100644 --- a/code/modules/power/fusion/fuel_assembly/fuel_compressor.dm +++ b/code/modules/power/fusion/fuel_assembly/fuel_compressor.dm @@ -4,8 +4,8 @@ name = "fuel compressor" icon = 'icons/obj/machines/power/fusion.dmi' icon_state = "fuel_compressor1" - density = 1 - anchored = 1 + density = TRUE + anchored = TRUE circuit = /obj/item/weapon/circuitboard/fusion_fuel_compressor diff --git a/code/modules/power/fusion/fuel_assembly/fuel_injector.dm b/code/modules/power/fusion/fuel_assembly/fuel_injector.dm index 5e0122ce04..c928399c29 100644 --- a/code/modules/power/fusion/fuel_assembly/fuel_injector.dm +++ b/code/modules/power/fusion/fuel_assembly/fuel_injector.dm @@ -4,8 +4,8 @@ GLOBAL_LIST_EMPTY(fuel_injectors) name = "fuel injector" icon = 'icons/obj/machines/power/fusion.dmi' icon_state = "injector0" - density = 1 - anchored = 0 + density = TRUE + anchored = FALSE req_access = list(access_engine) use_power = USE_POWER_IDLE idle_power_usage = 10 @@ -31,7 +31,7 @@ GLOBAL_LIST_EMPTY(fuel_injectors) return ..() /obj/machinery/fusion_fuel_injector/mapped - anchored = 1 + anchored = TRUE /obj/machinery/fusion_fuel_injector/process() if(injecting) diff --git a/code/modules/power/fusion/fusion_particle_catcher.dm b/code/modules/power/fusion/fusion_particle_catcher.dm index 78e4b8b950..d70f10a255 100644 --- a/code/modules/power/fusion/fusion_particle_catcher.dm +++ b/code/modules/power/fusion/fusion_particle_catcher.dm @@ -1,7 +1,7 @@ /obj/effect/fusion_particle_catcher icon = 'icons/effects/effects.dmi' - density = 1 - anchored = 1 + density = TRUE + anchored = TRUE invisibility = 101 var/obj/effect/fusion_em_field/parent var/mysize = 0 @@ -26,10 +26,10 @@ /obj/effect/fusion_particle_catcher/proc/UpdateSize() if(parent.size >= mysize) - density = 1 + density = TRUE name = "collector [mysize] ON" else - density = 0 + density = FALSE name = "collector [mysize] OFF" /obj/effect/fusion_particle_catcher/bullet_act(var/obj/item/projectile/Proj) diff --git a/code/modules/power/fusion/gyrotron/gyrotron.dm b/code/modules/power/fusion/gyrotron/gyrotron.dm index 4740e0a118..8f7e1f9f52 100644 --- a/code/modules/power/fusion/gyrotron/gyrotron.dm +++ b/code/modules/power/fusion/gyrotron/gyrotron.dm @@ -18,7 +18,7 @@ GLOBAL_LIST_EMPTY(gyrotrons) /obj/machinery/power/emitter/gyrotron/anchored - anchored = 1 + anchored = TRUE state = 2 /obj/machinery/power/emitter/gyrotron/Initialize() diff --git a/code/modules/power/fusion/magpower.dm b/code/modules/power/fusion/magpower.dm index 9ebea0e4fc..81ab2e5ce5 100644 --- a/code/modules/power/fusion/magpower.dm +++ b/code/modules/power/fusion/magpower.dm @@ -6,7 +6,7 @@ desc = "A device for extracting power from high-energy plasma in toroidal fields." icon = 'icons/obj/machines/power/fusion.dmi' icon_state = "mag_trap0" - anchored = 1 + anchored = TRUE var/list/things_in_range = list()//what is in a radius of us? var/list/fields_in_range = list()//What EM fields are in that radius? var/list/active_field = list()//Our active field. diff --git a/code/modules/power/generator.dm b/code/modules/power/generator.dm index c6ad30ccc5..590a681cec 100644 --- a/code/modules/power/generator.dm +++ b/code/modules/power/generator.dm @@ -4,8 +4,8 @@ GLOBAL_LIST_EMPTY(all_turbines) name = "thermoelectric generator" desc = "It's a high efficiency thermoelectric generator." icon_state = "teg-unassembled" - density = 1 - anchored = 0 + density = TRUE + anchored = FALSE use_power = USE_POWER_IDLE idle_power_usage = 100 //Watts, I hope. Just enough to do the computer and display things. diff --git a/code/modules/power/gravitygenerator.dm b/code/modules/power/gravitygenerator.dm index d71da42e9e..abad3f3431 100644 --- a/code/modules/power/gravitygenerator.dm +++ b/code/modules/power/gravitygenerator.dm @@ -4,8 +4,8 @@ name = "gravity generator control" desc = "A computer to control a local gravity generator. Qualified personnel only." icon_state = "airtunnel0e" - anchored = 1 - density = 1 + anchored = TRUE + density = TRUE var/obj/machinery/gravity_generator = null @@ -14,8 +14,8 @@ desc = "A device which produces a gravaton field when set up." icon = 'icons/obj/singularity.dmi' icon_state = "TheSingGen" - anchored = 1 - density = 1 + anchored = TRUE + density = TRUE use_power = USE_POWER_IDLE idle_power_usage = 200 active_power_usage = 1000 diff --git a/code/modules/power/grid_checker.dm b/code/modules/power/grid_checker.dm index 53766098f0..1409be9fef 100644 --- a/code/modules/power/grid_checker.dm +++ b/code/modules/power/grid_checker.dm @@ -4,8 +4,8 @@ than the alternative." icon_state = "gridchecker_on" circuit = /obj/item/weapon/circuitboard/grid_checker - density = 1 - anchored = 1 + density = TRUE + anchored = TRUE var/power_failing = FALSE // Turns to TRUE when the grid check event is fired by the Game Master, or perhaps a cheeky antag. // Wire stuff below. var/datum/wires/grid_checker/wires diff --git a/code/modules/power/lighting.dm b/code/modules/power/lighting.dm index 44e1bc569a..2a79ddb08a 100644 --- a/code/modules/power/lighting.dm +++ b/code/modules/power/lighting.dm @@ -24,7 +24,7 @@ var/global/list/light_type_cache = list() desc = "A light fixture under construction." icon = 'icons/obj/lighting.dmi' icon_state = "tube-construct-stage1" - anchored = 1 + anchored = TRUE plane = MOB_PLANE layer = ABOVE_MOB_LAYER var/stage = 1 @@ -166,7 +166,7 @@ var/global/list/light_type_cache = list() desc = "A small light fixture under construction." icon = 'icons/obj/lighting.dmi' icon_state = "bulb-construct-stage1" - anchored = 1 + anchored = TRUE stage = 1 fixture_type = /obj/machinery/light/small sheets_refunded = 1 @@ -185,7 +185,7 @@ var/global/list/light_type_cache = list() desc = "A floor light fixture under construction." icon = 'icons/obj/lighting.dmi' icon_state = "flamp-construct-stage1" - anchored = 0 + anchored = FALSE plane = OBJ_PLANE layer = OBJ_LAYER stage = 1 @@ -208,7 +208,7 @@ var/global/list/light_type_cache = list() var/base_state = "tube" // base description and icon_state icon_state = "tube1" desc = "A lighting fixture." - anchored = 1 + anchored = TRUE plane = MOB_PLANE layer = ABOVE_MOB_LAYER use_power = USE_POWER_ACTIVE @@ -1060,7 +1060,7 @@ var/global/list/light_type_cache = list() src.visible_message("[name] shatters."," You hear a small glass object shatter.") status = LIGHT_BROKEN force = 5 - sharp = 1 + sharp = TRUE playsound(src, 'sound/effects/Glasshit.ogg', 75, 1) update_icon() diff --git a/code/modules/power/lighting_vr.dm b/code/modules/power/lighting_vr.dm index 4c13300a73..b7f0fb320c 100644 --- a/code/modules/power/lighting_vr.dm +++ b/code/modules/power/lighting_vr.dm @@ -70,7 +70,7 @@ icon = 'icons/obj/lighting_vr.dmi' icon_state = "floortube-construct-stage1" stage = 1 - anchored = 0 + anchored = FALSE fixture_type = /obj/machinery/light/floortube sheets_refunded = 2 @@ -101,8 +101,8 @@ base_state = "big_flamp" desc = "A set of tube lights on a raised, solid fixture" shows_alerts = FALSE - density = 1 - anchored = 1 + density = TRUE + anchored = TRUE plane = MOB_PLANE layer = ABOVE_MOB_LAYER construct_type = /obj/machinery/light_construct/bigfloorlamp @@ -116,7 +116,7 @@ icon = 'icons/obj/lighting32x64.dmi' icon_state = "big_flamp-construct-stage1" stage = 1 - anchored = 0 + anchored = FALSE fixture_type = /obj/machinery/light/bigfloorlamp sheets_refunded = 3 diff --git a/code/modules/power/port_gen.dm b/code/modules/power/port_gen.dm index dce52720b4..abf536f651 100644 --- a/code/modules/power/port_gen.dm +++ b/code/modules/power/port_gen.dm @@ -4,8 +4,8 @@ desc = "A portable generator for emergency backup power" icon = 'icons/obj/power_vr.dmi' //VOREStation Edit icon_state = "portgen0" //VOREStation Edit - density = 1 - anchored = 0 + density = TRUE + anchored = FALSE use_power = USE_POWER_OFF interact_offline = TRUE diff --git a/code/modules/power/port_gen_vr.dm b/code/modules/power/port_gen_vr.dm index 5964adc297..b2c8deb469 100644 --- a/code/modules/power/port_gen_vr.dm +++ b/code/modules/power/port_gen_vr.dm @@ -5,7 +5,7 @@ icon_state = "potato" time_per_sheet = 1152 //same power output, but a 50 sheet stack will last 4 hours at max safe power power_gen = 50000 //watts - anchored = 1 + anchored = TRUE // Circuits for the RTGs below /obj/item/weapon/circuitboard/machine/rtg diff --git a/code/modules/power/power.dm b/code/modules/power/power.dm index bbf3cb7c75..dc09a9fb0c 100644 --- a/code/modules/power/power.dm +++ b/code/modules/power/power.dm @@ -9,7 +9,7 @@ /obj/machinery/power name = null icon = 'icons/obj/power.dmi' - anchored = 1.0 + anchored = TRUE var/datum/powernet/powernet = null use_power = USE_POWER_OFF idle_power_usage = 0 diff --git a/code/modules/power/sensors/powernet_sensor.dm b/code/modules/power/sensors/powernet_sensor.dm index 6f1b53db05..6dd58ea102 100644 --- a/code/modules/power/sensors/powernet_sensor.dm +++ b/code/modules/power/sensors/powernet_sensor.dm @@ -10,8 +10,8 @@ /obj/machinery/power/sensor name = "Powernet Sensor" desc = "Small machine which transmits data about specific powernet" - anchored = 1 - density = 0 + anchored = TRUE + density = FALSE layer = ABOVE_UTILITY icon = 'icons/obj/objects.dmi' icon_state = "floor_beacon" // If anyone wants to make better sprite, feel free to do so without asking me. diff --git a/code/modules/power/sensors/sensor_monitoring.dm b/code/modules/power/sensors/sensor_monitoring.dm index 4e6198f410..277b175102 100644 --- a/code/modules/power/sensors/sensor_monitoring.dm +++ b/code/modules/power/sensors/sensor_monitoring.dm @@ -11,8 +11,8 @@ light_color = "#ffcc33" //computer stuff - density = 1 - anchored = 1.0 + density = TRUE + anchored = TRUE circuit = /obj/item/weapon/circuitboard/powermonitor var/alerting = 0 use_power = USE_POWER_IDLE diff --git a/code/modules/power/singularity/collector.dm b/code/modules/power/singularity/collector.dm index c036cf0368..86a4d00edb 100644 --- a/code/modules/power/singularity/collector.dm +++ b/code/modules/power/singularity/collector.dm @@ -6,8 +6,8 @@ var/global/list/rad_collectors = list() desc = "A device which uses Hawking Radiation and phoron to produce power." icon = 'icons/obj/singularity.dmi' icon_state = "ca" - anchored = 0 - density = 1 + anchored = FALSE + density = TRUE req_access = list(access_engine_equip) // use_power = 0 var/obj/item/weapon/tank/phoron/P = null diff --git a/code/modules/power/singularity/containment_field.dm b/code/modules/power/singularity/containment_field.dm index 50655315ad..c47352e09d 100644 --- a/code/modules/power/singularity/containment_field.dm +++ b/code/modules/power/singularity/containment_field.dm @@ -5,9 +5,9 @@ desc = "An energy field." icon = 'icons/obj/singularity.dmi' icon_state = "Contain_F" - anchored = 1 - density = 0 - unacidable = 1 + anchored = TRUE + density = FALSE + unacidable = TRUE use_power = USE_POWER_OFF light_range = 4 var/obj/machinery/field_generator/FG1 = null diff --git a/code/modules/power/singularity/emitter.dm b/code/modules/power/singularity/emitter.dm index 8a6a16aee4..61acc41293 100644 --- a/code/modules/power/singularity/emitter.dm +++ b/code/modules/power/singularity/emitter.dm @@ -5,8 +5,8 @@ desc = "It is a heavy duty industrial laser." icon = 'icons/obj/singularity.dmi' icon_state = "emitter" - anchored = 0 - density = 1 + anchored = FALSE + density = TRUE req_access = list(access_engine_equip) var/id = null diff --git a/code/modules/power/singularity/field_generator.dm b/code/modules/power/singularity/field_generator.dm index a21156d9e4..ec29e08efa 100644 --- a/code/modules/power/singularity/field_generator.dm +++ b/code/modules/power/singularity/field_generator.dm @@ -18,8 +18,8 @@ field_generator power level display desc = "A large thermal battery that projects a high amount of energy when powered." icon = 'icons/obj/machines/field_generator.dmi' icon_state = "Field_Gen" - anchored = 0 - density = 1 + anchored = FALSE + density = TRUE use_power = USE_POWER_OFF var/const/num_power_levels = 6 // Total number of power level icon has var/Varedit_start = 0 @@ -67,7 +67,7 @@ field_generator power level display active = 1 state = 2 power = field_generator_max_power - anchored = 1 + anchored = TRUE warming_up = 3 start_fields() update_icon() diff --git a/code/modules/power/singularity/generator.dm b/code/modules/power/singularity/generator.dm index 5c9031a831..c29e200e86 100644 --- a/code/modules/power/singularity/generator.dm +++ b/code/modules/power/singularity/generator.dm @@ -4,8 +4,8 @@ desc = "An Odd Device which produces a Gravitational Singularity when set up." icon = 'icons/obj/singularity.dmi' icon_state = "TheSingGen" - anchored = 0 - density = 1 + anchored = FALSE + density = TRUE use_power = USE_POWER_OFF var/energy = 0 var/creation_type = /obj/singularity diff --git a/code/modules/power/singularity/particle_accelerator/particle.dm b/code/modules/power/singularity/particle_accelerator/particle.dm index e54b46c7f0..7f30e02966 100644 --- a/code/modules/power/singularity/particle_accelerator/particle.dm +++ b/code/modules/power/singularity/particle_accelerator/particle.dm @@ -5,8 +5,8 @@ desc = "Small things moving very fast." icon = 'icons/obj/machines/particle_accelerator2.dmi' icon_state = "particle1"//Need a new icon for this - anchored = 1 - density = 1 + anchored = TRUE + density = TRUE var/movement_range = 10 var/energy = 10 //energy in eV var/mega_energy = 0 //energy in MeV diff --git a/code/modules/power/singularity/particle_accelerator/particle_accelerator.dm b/code/modules/power/singularity/particle_accelerator/particle_accelerator.dm index 45916c73f8..bf005048ca 100644 --- a/code/modules/power/singularity/particle_accelerator/particle_accelerator.dm +++ b/code/modules/power/singularity/particle_accelerator/particle_accelerator.dm @@ -63,8 +63,8 @@ So, hopefully this is helpful if any more icons are to be added/changed/wonderin desc = "Part of a Particle Accelerator." icon = 'icons/obj/machines/particle_accelerator2.dmi' icon_state = "none" - anchored = 0 - density = 1 + anchored = FALSE + density = TRUE var/obj/machinery/particle_accelerator/control_box/master = null var/construction_state = 0 var/reference = null @@ -252,8 +252,8 @@ So, hopefully this is helpful if any more icons are to be added/changed/wonderin desc = "Part of a Particle Accelerator." icon = 'icons/obj/machines/particle_accelerator2.dmi' icon_state = "none" - anchored = 0 - density = 1 + anchored = FALSE + density = TRUE use_power = USE_POWER_OFF idle_power_usage = 0 active_power_usage = 0 diff --git a/code/modules/power/singularity/particle_accelerator/particle_control.dm b/code/modules/power/singularity/particle_accelerator/particle_control.dm index 6beda2db15..e4d3254fda 100644 --- a/code/modules/power/singularity/particle_accelerator/particle_control.dm +++ b/code/modules/power/singularity/particle_accelerator/particle_control.dm @@ -6,8 +6,8 @@ icon = 'icons/obj/machines/particle_accelerator_vr.dmi' //VOREStation Edit icon_state = "control_box" reference = "control_box" - anchored = 0 - density = 1 + anchored = FALSE + density = TRUE use_power = USE_POWER_OFF idle_power_usage = 500 active_power_usage = 70000 //70 kW per unit of strength diff --git a/code/modules/power/singularity/particle_accelerator/particle_smasher.dm b/code/modules/power/singularity/particle_accelerator/particle_smasher.dm index 44e5c5d4fc..938f9b6934 100644 --- a/code/modules/power/singularity/particle_accelerator/particle_smasher.dm +++ b/code/modules/power/singularity/particle_accelerator/particle_smasher.dm @@ -7,8 +7,8 @@ desc = "A strange device used to create exotic matter." icon = 'icons/obj/machines/particle_smasher.dmi' icon_state = "smasher" - anchored = 0 - density = 1 + anchored = FALSE + density = TRUE use_power = USE_POWER_OFF var/successful_craft = FALSE // Are we waiting to be emptied? diff --git a/code/modules/power/singularity/singularity.dm b/code/modules/power/singularity/singularity.dm index 61fae18c42..3225030581 100644 --- a/code/modules/power/singularity/singularity.dm +++ b/code/modules/power/singularity/singularity.dm @@ -7,11 +7,11 @@ GLOBAL_LIST_BOILERPLATE(all_singularities, /obj/singularity) desc = "A gravitational singularity." icon = 'icons/obj/singularity.dmi' icon_state = "singularity_s1" - anchored = 1 - density = 1 + anchored = TRUE + density = TRUE plane = ABOVE_PLANE light_range = 6 - unacidable = 1 //Don't comment this out. + unacidable = TRUE //Don't comment this out. var/current_size = 1 var/allowed_size = 1 diff --git a/code/modules/power/smes.dm b/code/modules/power/smes.dm index d0dc9a21e0..3ddbb303e8 100644 --- a/code/modules/power/smes.dm +++ b/code/modules/power/smes.dm @@ -10,8 +10,8 @@ GLOBAL_LIST_EMPTY(smeses) name = "power storage unit" desc = "A high-capacity superconducting magnetic energy storage (SMES) unit." icon_state = "smes" - density = 1 - anchored = 1 + density = TRUE + anchored = TRUE use_power = USE_POWER_OFF circuit = /obj/item/weapon/circuitboard/smes clicksound = "switch" diff --git a/code/modules/power/solar.dm b/code/modules/power/solar.dm index f6d59b804d..8a20c9e685 100644 --- a/code/modules/power/solar.dm +++ b/code/modules/power/solar.dm @@ -11,8 +11,8 @@ GLOBAL_LIST_EMPTY(solars_list) desc = "A solar electrical generator." icon = 'icons/obj/power.dmi' icon_state = "sp_base" - anchored = 1 - density = 1 + anchored = TRUE + density = TRUE use_power = USE_POWER_OFF idle_power_usage = 0 active_power_usage = 0 @@ -202,7 +202,7 @@ GLOBAL_LIST_EMPTY(solars_list) icon_state = "sp_base" item_state = "camera" w_class = ITEMSIZE_LARGE // Pretty big! - anchored = 0 + anchored = FALSE var/tracker = 0 /obj/item/solar_assembly/attack_hand(var/mob/user) @@ -214,13 +214,13 @@ GLOBAL_LIST_EMPTY(solars_list) return 0 if(!anchored) if(W.is_wrench()) - anchored = 1 + anchored = TRUE user.visible_message("[user] wrenches the solar assembly into place.") playsound(src, W.usesound, 75, 1) return 1 else if(W.is_wrench()) - anchored = 0 + anchored = FALSE user.visible_message("[user] unwrenches the solar assembly from it's place.") playsound(src, W.usesound, 75, 1) return 1 @@ -264,8 +264,8 @@ GLOBAL_LIST_EMPTY(solars_list) desc = "A controller for solar panel arrays." icon = 'icons/obj/computer.dmi' icon_state = "solar" - anchored = 1 - density = 1 + anchored = TRUE + density = TRUE use_power = USE_POWER_IDLE idle_power_usage = 250 var/id = 0 diff --git a/code/modules/power/supermatter/setup_supermatter.dm b/code/modules/power/supermatter/setup_supermatter.dm index bb8561cfbf..22fc9547b5 100644 --- a/code/modules/power/supermatter/setup_supermatter.dm +++ b/code/modules/power/supermatter/setup_supermatter.dm @@ -103,8 +103,8 @@ name = "Engine Setup Marker" desc = "You shouldn't see this." invisibility = 101 - anchored = 1 - density = 0 + anchored = TRUE + density = FALSE icon = 'icons/mob/screen1.dmi' icon_state = "x3" diff --git a/code/modules/power/supermatter/supermatter.dm b/code/modules/power/supermatter/supermatter.dm index b50da0162d..ace5a7b58c 100644 --- a/code/modules/power/supermatter/supermatter.dm +++ b/code/modules/power/supermatter/supermatter.dm @@ -54,8 +54,8 @@ icon_state = "darkmatter" plane = MOB_PLANE // So people can walk behind the top part layer = ABOVE_MOB_LAYER // So people can walk behind the top part - density = 1 - anchored = 0 + density = TRUE + anchored = FALSE light_range = 4 var/gasefficency = 0.25 @@ -170,7 +170,7 @@ message_admins("Supermatter exploded at ([x],[y],[z] - JMP)",0,1) log_game("SUPERMATTER([x],[y],[z]) Exploded. Power:[power], Oxygen:[oxygen], Damage:[damage], Integrity:[get_integrity()]") - anchored = 1 + anchored = TRUE grav_pulling = 1 exploded = 1 sleep(pull_time) diff --git a/code/modules/power/terminal.dm b/code/modules/power/terminal.dm index 7846ff6ff1..068b131cf8 100644 --- a/code/modules/power/terminal.dm +++ b/code/modules/power/terminal.dm @@ -9,7 +9,7 @@ desc = "It's an underfloor wiring terminal for power equipment." level = 1 var/obj/machinery/power/master = null - anchored = 1 + anchored = TRUE plane = PLATING_PLANE layer = WIRES_LAYER+0.01 diff --git a/code/modules/power/tracker.dm b/code/modules/power/tracker.dm index c03d7db3b6..299d4de823 100644 --- a/code/modules/power/tracker.dm +++ b/code/modules/power/tracker.dm @@ -8,8 +8,8 @@ desc = "A solar directional tracker." icon = 'icons/obj/power.dmi' icon_state = "tracker" - anchored = 1 - density = 1 + anchored = TRUE + density = TRUE use_power = USE_POWER_OFF var/glass_type = /obj/item/stack/material/glass diff --git a/code/modules/projectiles/guns/automatic_fire.dm b/code/modules/projectiles/guns/automatic_fire.dm index 25e1e3a461..e85c33a485 100644 --- a/code/modules/projectiles/guns/automatic_fire.dm +++ b/code/modules/projectiles/guns/automatic_fire.dm @@ -8,8 +8,8 @@ /obj/screen/auto_target name = "targeter" icon = null//We dont want people to see this guy - density = 0 - anchored = 1 + density = FALSE + anchored = TRUE var/obj/item/weapon/gun/gun var/active = 0//Just tells us that it was clicked on so we should start shooting var/delay_del = 0//Delays the del if we retarget without shooting diff --git a/code/modules/projectiles/guns/energy/cell_loaded_vr/nsfw_cells.dm b/code/modules/projectiles/guns/energy/cell_loaded_vr/nsfw_cells.dm index e5f1b7bfbe..c74c8520e5 100644 --- a/code/modules/projectiles/guns/energy/cell_loaded_vr/nsfw_cells.dm +++ b/code/modules/projectiles/guns/energy/cell_loaded_vr/nsfw_cells.dm @@ -44,7 +44,7 @@ base_spread = 90 //lower means the pellets spread more across body parts. If zero then this is considered a shrapnel explosion instead of a shrapnel cone spread_step = 10 embed_chance = 0 - sharp = 0 + sharp = FALSE check_armour = "melee" /obj/item/ammo_casing/microbattery/combat/ion @@ -64,7 +64,7 @@ nodamage = 1 agony = 5 embed_chance = 0 - sharp = 0 + sharp = FALSE check_armour = "melee" /obj/item/projectile/bullet/stripper/on_hit(var/atom/stripped) diff --git a/code/modules/projectiles/guns/energy/gunsword_vr.dm b/code/modules/projectiles/guns/energy/gunsword_vr.dm index e5ffffc05d..cd28b53c90 100644 --- a/code/modules/projectiles/guns/energy/gunsword_vr.dm +++ b/code/modules/projectiles/guns/energy/gunsword_vr.dm @@ -48,8 +48,8 @@ var/active_throwforce = 20 var/active_w_class = ITEMSIZE_LARGE var/active_embed_chance = 0 //In the off chance one of these is supposed to embed, you can just tweak this var - sharp = 0 - edge = 0 + sharp = FALSE + edge = FALSE armor_penetration = 50 flags = NOBLOODY var/lrange = 2 @@ -66,8 +66,8 @@ embed_chance = active_embed_chance force = active_force throwforce = active_throwforce - sharp = 1 - edge = 1 + sharp = TRUE + edge = TRUE w_class = active_w_class playsound(src, 'sound/weapons/saberon.ogg', 50, 1) set_light(lrange, lpower, lcolor) diff --git a/code/modules/projectiles/guns/energy/laser_vr.dm b/code/modules/projectiles/guns/energy/laser_vr.dm index 91ea6a23c8..989e2b2b25 100644 --- a/code/modules/projectiles/guns/energy/laser_vr.dm +++ b/code/modules/projectiles/guns/energy/laser_vr.dm @@ -203,7 +203,7 @@ charge_cost = 300 battery_lock = 1 - unacidable = 1 + unacidable = TRUE var/recharging = 0 var/phase_power = 75 diff --git a/code/modules/projectiles/guns/launcher/crossbow.dm b/code/modules/projectiles/guns/launcher/crossbow.dm index 6422a88bdf..18c8d15597 100644 --- a/code/modules/projectiles/guns/launcher/crossbow.dm +++ b/code/modules/projectiles/guns/launcher/crossbow.dm @@ -10,8 +10,8 @@ pickup_sound = 'sound/items/pickup/sword.ogg' throwforce = 8 w_class = ITEMSIZE_NORMAL - sharp = 1 - edge = 0 + sharp = TRUE + edge = FALSE /obj/item/weapon/arrow/proc/removed() //Helper for metal rods falling apart. return @@ -19,8 +19,8 @@ /obj/item/weapon/spike name = "alloy spike" desc = "It's about a foot of weird silver metal with a wicked point." - sharp = 1 - edge = 0 + sharp = TRUE + edge = FALSE throwforce = 5 w_class = ITEMSIZE_SMALL icon = 'icons/obj/weapons.dmi' diff --git a/code/modules/projectiles/guns/launcher/syringe_gun.dm b/code/modules/projectiles/guns/launcher/syringe_gun.dm index 981e5c988b..3da58638a5 100644 --- a/code/modules/projectiles/guns/launcher/syringe_gun.dm +++ b/code/modules/projectiles/guns/launcher/syringe_gun.dm @@ -23,7 +23,7 @@ to_chat(user, "You carefully insert [syringe] into [src].") user.remove_from_mob(syringe) syringe.loc = src - sharp = 1 + sharp = TRUE name = "syringe dart" update_icon() diff --git a/code/modules/projectiles/projectile/bullets.dm b/code/modules/projectiles/projectile/bullets.dm index c72d9b35ea..37c99f905a 100644 --- a/code/modules/projectiles/projectile/bullets.dm +++ b/code/modules/projectiles/projectile/bullets.dm @@ -8,7 +8,7 @@ nodamage = 0 check_armour = "bullet" embed_chance = 20 //Modified in the actual embed process, but this should keep embed chance about the same - sharp = 1 + sharp = TRUE hitsound_wall = "ricochet" impact_effect_type = /obj/effect/temp_visual/impact_effect var/mob_passthrough_check = 0 @@ -100,7 +100,7 @@ damage = 10 agony = 60 embed_chance = 0 - sharp = 0 + sharp = FALSE check_armour = "melee" /obj/item/projectile/bullet/pistol/rubber // "Rubber" bullets for all other pistols. @@ -108,7 +108,7 @@ damage = 5 agony = 40 embed_chance = 0 - sharp = 0 + sharp = FALSE check_armour = "melee" fire_sound ='sound/weapons/Gunshot_pathetic.ogg' // Rubber shots have less powder in the casing. @@ -126,7 +126,7 @@ damage = 20 agony = 60 embed_chance = 0 - sharp = 0 + sharp = FALSE check_armour = "melee" //Should do about 80 damage at 1 tile distance (adjacent), and 50 damage at 3 tiles distance. @@ -151,7 +151,7 @@ fire_sound = 'sound/weapons/Laser.ogg' // Really? We got nothing better than this? damage = 15 embed_chance = 0 - sharp = 0 + sharp = FALSE check_armour = "melee" combustion = FALSE @@ -209,7 +209,7 @@ SA_bonus_damage = 35 // 50 total on animals. SA_vulnerability = SA_ANIMAL -/obj/item/projectile/bullet/rifle/a145 // 14.5×114mm is bigger than a .50 BMG round. +/obj/item/projectile/bullet/rifle/a145 // 14.5�114mm is bigger than a .50 BMG round. fire_sound = 'sound/weapons/Gunshot_cannon.ogg' // This is literally an anti-tank rifle caliber. It better sound like a fucking cannon. damage = 80 stun = 3 @@ -249,7 +249,7 @@ fire_sound = 'sound/effects/Explosion1.ogg' damage = 20 embed_chance = 0 - edge = 1 + edge = TRUE /obj/item/projectile/bullet/burstbullet/on_hit(var/atom/target, var/blocked = 0) if(isturf(target)) @@ -305,7 +305,7 @@ damage = 0 nodamage = 1 embed_chance = 0 - sharp = 0 + sharp = FALSE combustion = FALSE @@ -320,7 +320,7 @@ damage = 0 nodamage = 1 embed_chance = 0 - sharp = 0 + sharp = FALSE /obj/item/projectile/bullet/blank/cap/process() loc = null diff --git a/code/modules/projectiles/projectile/bullets_vr.dm b/code/modules/projectiles/projectile/bullets_vr.dm index 7b27a08942..2f927afe99 100644 --- a/code/modules/projectiles/projectile/bullets_vr.dm +++ b/code/modules/projectiles/projectile/bullets_vr.dm @@ -2,7 +2,7 @@ damage = 10 agony = 60 embed_chance = 0 - sharp = 0 + sharp = FALSE check_armour = "melee" /obj/item/projectile/energy/flash/strong diff --git a/code/modules/projectiles/projectile/hook.dm b/code/modules/projectiles/projectile/hook.dm index 35b39910a0..a6568e7b75 100644 --- a/code/modules/projectiles/projectile/hook.dm +++ b/code/modules/projectiles/projectile/hook.dm @@ -42,7 +42,7 @@ if(I_HURT) check_armour = "bullet" damage *= 3 - sharp = 1 + sharp = TRUE agony = 20 if(I_GRAB) check_armour = "melee" diff --git a/code/modules/projectiles/projectile/special.dm b/code/modules/projectiles/projectile/special.dm index 9c06241ecf..ee75074cc7 100644 --- a/code/modules/projectiles/projectile/special.dm +++ b/code/modules/projectiles/projectile/special.dm @@ -41,8 +41,8 @@ icon_state= "bolter" damage = 50 check_armour = "bullet" - sharp = 1 - edge = 1 + sharp = TRUE + edge = TRUE /obj/item/projectile/bullet/gyro/on_hit(var/atom/target, var/blocked = 0) explosion(target, -1, 0, 2) diff --git a/code/modules/projectiles/targeting/targeting_overlay.dm b/code/modules/projectiles/targeting/targeting_overlay.dm index 67525bdc5b..a732d3c8ef 100644 --- a/code/modules/projectiles/targeting/targeting_overlay.dm +++ b/code/modules/projectiles/targeting/targeting_overlay.dm @@ -3,11 +3,11 @@ desc = "Stick 'em up!" icon = 'icons/effects/Targeted.dmi' icon_state = "locking" - anchored = 1 - density = 0 + anchored = TRUE + density = FALSE opacity = 0 plane = ABOVE_PLANE - simulated = 0 + simulated = FALSE mouse_opacity = 0 var/mob/living/aiming_at // Who are we currently targeting, if anyone? diff --git a/code/modules/random_map/automata/diona.dm b/code/modules/random_map/automata/diona.dm index d6bee1c0ff..2966c172c2 100644 --- a/code/modules/random_map/automata/diona.dm +++ b/code/modules/random_map/automata/diona.dm @@ -15,8 +15,8 @@ /obj/structure/diona icon = 'icons/obj/diona.dmi' - anchored = 1 - density = 1 + anchored = TRUE + density = TRUE opacity = 0 layer = TURF_LAYER + 0.01 diff --git a/code/modules/random_map/drop/droppod_doors.dm b/code/modules/random_map/drop/droppod_doors.dm index 291d79b17b..c19aba40fd 100644 --- a/code/modules/random_map/drop/droppod_doors.dm +++ b/code/modules/random_map/drop/droppod_doors.dm @@ -3,8 +3,8 @@ desc = "A drop pod door. Opens rapidly using explosive bolts." icon = 'icons/obj/structures.dmi' icon_state = "droppod_door_closed" - anchored = 1 - density = 1 + anchored = TRUE + density = TRUE opacity = 1 layer = TURF_LAYER + 0.1 var/deploying @@ -68,7 +68,7 @@ M.throw_at(get_edge_target_turf(origin,src.dir),rand(0,3),50) // Create a decorative ramp bottom and flatten out our current ramp. - density = 0 + density = FALSE set_opacity(0) icon_state = "ramptop" var/obj/structure/droppod_door/door_bottom = new(T) diff --git a/code/modules/reagents/machinery/chem_master.dm b/code/modules/reagents/machinery/chem_master.dm index 9147588d70..6c810251fc 100644 --- a/code/modules/reagents/machinery/chem_master.dm +++ b/code/modules/reagents/machinery/chem_master.dm @@ -1,8 +1,8 @@ /obj/machinery/chem_master name = "ChemMaster 3000" desc = "Used to seperate and package chemicals in to patches, pills, or bottles. Warranty void if used to create Space Drugs." - density = 1 - anchored = 1 + density = TRUE + anchored = TRUE icon = 'icons/obj/chemical.dmi' icon_state = "mixer0" circuit = /obj/item/weapon/circuitboard/chem_master diff --git a/code/modules/reagents/machinery/dispenser/cartridge.dm b/code/modules/reagents/machinery/dispenser/cartridge.dm index 0e2b09eb57..ded38cf561 100644 --- a/code/modules/reagents/machinery/dispenser/cartridge.dm +++ b/code/modules/reagents/machinery/dispenser/cartridge.dm @@ -9,7 +9,7 @@ amount_per_transfer_from_this = 50 // Large, but inaccurate. Use a chem dispenser or beaker for accuracy. possible_transfer_amounts = list(50, 100, 250, 500) - unacidable = 1 + unacidable = TRUE var/spawn_reagent = null var/label = "" diff --git a/code/modules/reagents/machinery/dispenser/dispenser2.dm b/code/modules/reagents/machinery/dispenser/dispenser2.dm index c956409dc9..fcc358274a 100644 --- a/code/modules/reagents/machinery/dispenser/dispenser2.dm +++ b/code/modules/reagents/machinery/dispenser/dispenser2.dm @@ -17,7 +17,7 @@ use_power = USE_POWER_IDLE idle_power_usage = 100 - anchored = 1 + anchored = TRUE /obj/machinery/chemical_dispenser/Initialize() . = ..() diff --git a/code/modules/reagents/machinery/dispenser/reagent_tank.dm b/code/modules/reagents/machinery/dispenser/reagent_tank.dm index 9536c272a3..94cfbc4ec9 100644 --- a/code/modules/reagents/machinery/dispenser/reagent_tank.dm +++ b/code/modules/reagents/machinery/dispenser/reagent_tank.dm @@ -4,8 +4,8 @@ icon = 'icons/obj/objects.dmi' icon_state = "watertank" layer = TABLE_LAYER - density = 1 - anchored = 0 + density = TRUE + anchored = FALSE pressure_resistance = 2*ONE_ATMOSPHERE var/obj/item/hose_connector/input/active/InputSocket @@ -247,8 +247,8 @@ desc = "Refills pepper spray canisters." icon = 'icons/obj/objects.dmi' icon_state = "peppertank" - anchored = 1 - density = 0 + anchored = TRUE + density = FALSE amount_per_transfer_from_this = 45 /obj/structure/reagent_dispensers/peppertank/Initialize() @@ -263,7 +263,7 @@ icon = 'icons/obj/vending.dmi' icon_state = "water_cooler" possible_transfer_amounts = null - anchored = 1 + anchored = TRUE var/bottle = 0 var/cups = 0 var/cupholder = 0 @@ -416,7 +416,7 @@ icon = 'icons/obj/objects.dmi' icon_state = "virusfoodtank" amount_per_transfer_from_this = 10 - anchored = 1 + anchored = TRUE /obj/structure/reagent_dispensers/virusfood/Initialize() . = ..() @@ -428,7 +428,7 @@ icon = 'icons/obj/objects.dmi' icon_state = "acidtank" amount_per_transfer_from_this = 10 - anchored = 1 + anchored = TRUE /obj/structure/reagent_dispensers/acid/Initialize() . = ..() diff --git a/code/modules/reagents/machinery/grinder.dm b/code/modules/reagents/machinery/grinder.dm index f913f7947b..51cf0d2153 100644 --- a/code/modules/reagents/machinery/grinder.dm +++ b/code/modules/reagents/machinery/grinder.dm @@ -4,8 +4,8 @@ desc = "Grinds stuff into itty bitty bits." icon = 'icons/obj/kitchen.dmi' icon_state = "juicer1" - density = 0 - anchored = 0 + density = FALSE + anchored = FALSE use_power = USE_POWER_IDLE idle_power_usage = 5 active_power_usage = 100 diff --git a/code/modules/reagents/reagent_containers/glass.dm b/code/modules/reagents/reagent_containers/glass.dm index fc37770284..1c0369adc5 100644 --- a/code/modules/reagents/reagent_containers/glass.dm +++ b/code/modules/reagents/reagent_containers/glass.dm @@ -15,7 +15,7 @@ volume = 60 w_class = ITEMSIZE_SMALL flags = OPENCONTAINER | NOCONDUCT - unacidable = 1 //glass doesn't dissolve in acid + unacidable = TRUE //glass doesn't dissolve in acid drop_sound = 'sound/items/drop/bottle.ogg' pickup_sound = 'sound/items/pickup/bottle.ogg' @@ -270,7 +270,7 @@ possible_transfer_amounts = list(10,20,30,60,120) volume = 120 flags = OPENCONTAINER - unacidable = 0 + unacidable = FALSE drop_sound = 'sound/items/drop/helm.ogg' pickup_sound = 'sound/items/pickup/helm.ogg' @@ -328,7 +328,7 @@ possible_transfer_amounts = list(10,20,30,60,120) volume = 120 flags = OPENCONTAINER - unacidable = 0 + unacidable = FALSE drop_sound = 'sound/items/drop/wooden.ogg' pickup_sound = 'sound/items/pickup/wooden.ogg' diff --git a/code/modules/reagents/reagent_containers/hypospray.dm b/code/modules/reagents/reagent_containers/hypospray.dm index 5f05faeb70..62a469d315 100644 --- a/code/modules/reagents/reagent_containers/hypospray.dm +++ b/code/modules/reagents/reagent_containers/hypospray.dm @@ -9,7 +9,7 @@ item_state = "hypo" icon_state = "hypo" amount_per_transfer_from_this = 5 - unacidable = 1 + unacidable = TRUE volume = 30 possible_transfer_amounts = null flags = OPENCONTAINER diff --git a/code/modules/reagents/reagent_containers/spray.dm b/code/modules/reagents/reagent_containers/spray.dm index 237e9a4070..34068bd456 100644 --- a/code/modules/reagents/reagent_containers/spray.dm +++ b/code/modules/reagents/reagent_containers/spray.dm @@ -13,7 +13,7 @@ throw_speed = 2 throw_range = 10 amount_per_transfer_from_this = 10 - unacidable = 1 //plastic + unacidable = TRUE //plastic possible_transfer_amounts = list(5,10) //Set to null instead of list, if there is only one. var/spray_size = 3 var/list/spray_sizes = list(1,3) diff --git a/code/modules/reagents/reagent_containers/syringes.dm b/code/modules/reagents/reagent_containers/syringes.dm index c8fc2ea379..3ef20ceeda 100644 --- a/code/modules/reagents/reagent_containers/syringes.dm +++ b/code/modules/reagents/reagent_containers/syringes.dm @@ -18,8 +18,8 @@ volume = 15 w_class = ITEMSIZE_TINY slot_flags = SLOT_EARS - sharp = 1 - unacidable = 1 //glass + sharp = TRUE + unacidable = TRUE //glass var/mode = SYRINGE_DRAW var/image/filling //holds a reference to the current filling overlay var/visible_name = "a syringe" diff --git a/code/modules/recycling/conveyor2.dm b/code/modules/recycling/conveyor2.dm index d31b1f9378..8e54b057f8 100644 --- a/code/modules/recycling/conveyor2.dm +++ b/code/modules/recycling/conveyor2.dm @@ -12,7 +12,7 @@ desc = "A conveyor belt." plane = TURF_PLANE layer = ABOVE_TURF_LAYER - anchored = 1 + anchored = TRUE circuit = /obj/item/weapon/circuitboard/conveyor var/operating = OFF // 1 if running forward, -1 if backwards, 0 if off var/operable = 1 // true if can operate (no broken segments in this belt run) @@ -197,7 +197,7 @@ var/id = "" // must match conveyor IDs to control them var/list/conveyors // the list of converyors that are controlled by this switch - anchored = 1 + anchored = TRUE var/speed_active = FALSE // are the linked conveyors on SSfastprocess? diff --git a/code/modules/recycling/disposal-construction.dm b/code/modules/recycling/disposal-construction.dm index 957d7662c3..2416f68826 100644 --- a/code/modules/recycling/disposal-construction.dm +++ b/code/modules/recycling/disposal-construction.dm @@ -7,8 +7,8 @@ desc = "A huge pipe segment used for constructing disposal systems." icon = 'icons/obj/pipes/disposal.dmi' icon_state = "conpipe-s" - anchored = 0 - density = 0 + anchored = FALSE + density = FALSE pressure_resistance = 5*ONE_ATMOSPHERE matter = list(MAT_STEEL = 1850) level = 2 @@ -37,7 +37,7 @@ switch(ptype) if(DISPOSAL_PIPE_BIN, DISPOSAL_PIPE_OUTLET, DISPOSAL_PIPE_CHUTE) - density = 1 + density = TRUE if(DISPOSAL_PIPE_SORTER, DISPOSAL_PIPE_SORTER_FLIPPED) subtype = newsubtype @@ -248,12 +248,12 @@ // wrench: (un)anchor if(I.is_wrench()) if(anchored) - anchored = 0 + anchored = FALSE if(ispipe) level = 2 - density = 0 + density = FALSE else - density = 1 + density = TRUE to_chat(user, "You detach the [nicetype] from the underfloor.") else if(ptype == DISPOSAL_PIPE_BIN || ptype == DISPOSAL_PIPE_OUTLET || ptype == DISPOSAL_PIPE_CHUTE) // Disposal or outlet @@ -274,12 +274,12 @@ to_chat(user, "There is already a [nicetype] at that location.") return - anchored = 1 + anchored = TRUE if(ispipe) level = 1 // We don't want disposal bins to disappear under the floors - density = 0 + density = FALSE else - density = 1 // We don't want disposal bins or outlets to go density 0 + density = TRUE // We don't want disposal bins or outlets to go density 0 to_chat(user, "You attach the [nicetype] to the underfloor.") playsound(src, I.usesound, 100, 1) update() diff --git a/code/modules/recycling/disposal.dm b/code/modules/recycling/disposal.dm index 8a6734f5e8..da3e3c64de 100644 --- a/code/modules/recycling/disposal.dm +++ b/code/modules/recycling/disposal.dm @@ -14,8 +14,8 @@ desc = "A pneumatic waste disposal unit." icon = 'icons/obj/pipes/disposal.dmi' icon_state = "disposal" - anchored = 1 - density = 1 + anchored = TRUE + density = TRUE var/datum/gas_mixture/air_contents // internal reservoir var/mode = 1 // item mode 0=off 1=charging 2=charged var/flush = 0 // true if flush handle is pulled @@ -741,8 +741,8 @@ icon = 'icons/obj/pipes/disposal.dmi' name = "disposal pipe" desc = "An underfloor disposal pipe." - anchored = 1 - density = 0 + anchored = TRUE + density = FALSE level = 1 // underfloor only var/dpdir = 0 // bitmask of pipe directions @@ -1513,8 +1513,8 @@ desc = "An outlet for the pneumatic disposal system." icon = 'icons/obj/pipes/disposal.dmi' icon_state = "outlet" - density = 1 - anchored = 1 + density = TRUE + anchored = TRUE var/active = 0 var/turf/target // this will be where the output objects are 'thrown' to. var/mode = 0 diff --git a/code/modules/recycling/sortingmachinery.dm b/code/modules/recycling/sortingmachinery.dm index 8215390bf9..a8e23e83e8 100755 --- a/code/modules/recycling/sortingmachinery.dm +++ b/code/modules/recycling/sortingmachinery.dm @@ -4,7 +4,7 @@ icon = 'icons/obj/storage_vr.dmi' //VOREStation Edit icon_state = "deliverycloset" var/obj/wrapped = null - density = 1 + density = TRUE var/sortTag = null flags = NOBLUDGEON mouse_drag_pointer = MOUSE_ACTIVE_POINTER @@ -374,7 +374,7 @@ /obj/machinery/disposal/deliveryChute name = "Delivery chute" desc = "A chute for big and small packages alike!" - density = 1 + density = TRUE icon_state = "intake" var/c_mode = 0 diff --git a/code/modules/research/message_server.dm b/code/modules/research/message_server.dm index b81b5910fc..0a96055e32 100644 --- a/code/modules/research/message_server.dm +++ b/code/modules/research/message_server.dm @@ -52,8 +52,8 @@ var/global/list/obj/machinery/message_server/message_servers = list() icon_state = "server" name = "Messaging Server" desc = "Facilitates both PDA messages and request console functions." - density = 1 - anchored = 1.0 + density = TRUE + anchored = TRUE use_power = USE_POWER_IDLE idle_power_usage = 10 active_power_usage = 100 @@ -237,8 +237,8 @@ var/obj/machinery/blackbox_recorder/blackbox icon_state = "blackbox" name = "Blackbox Recorder" desc = "Records all radio communications, as well as various other information in case of the worst." - density = 1 - anchored = 1.0 + density = TRUE + anchored = TRUE use_power = USE_POWER_IDLE idle_power_usage = 10 active_power_usage = 100 diff --git a/code/modules/research/rdmachines.dm b/code/modules/research/rdmachines.dm index e317c665d0..76bbe9d167 100644 --- a/code/modules/research/rdmachines.dm +++ b/code/modules/research/rdmachines.dm @@ -5,8 +5,8 @@ /obj/machinery/r_n_d name = "R&D Device" icon = 'icons/obj/machines/research.dmi' - density = 1 - anchored = 1 + density = TRUE + anchored = TRUE use_power = USE_POWER_IDLE var/busy = 0 var/obj/machinery/computer/rdconsole/linked_console diff --git a/code/modules/resleeving/machines.dm b/code/modules/resleeving/machines.dm index ade23c1dfc..205db962b0 100644 --- a/code/modules/resleeving/machines.dm +++ b/code/modules/resleeving/machines.dm @@ -197,8 +197,8 @@ icon = 'icons/obj/machines/synthpod.dmi' icon_state = "pod_0" circuit = /obj/item/weapon/circuitboard/transhuman_synthprinter - density = 1 - anchored = 1 + density = TRUE + anchored = TRUE var/list/stored_material = list(MAT_STEEL = 30000, MAT_GLASS = 30000) var/connected //What console it's done up with @@ -424,9 +424,9 @@ icon = 'icons/obj/machines/implantchair.dmi' icon_state = "implantchair" circuit = /obj/item/weapon/circuitboard/transhuman_resleever - density = 1 + density = TRUE opacity = 0 - anchored = 1 + anchored = TRUE var/blur_amount var/confuse_amount diff --git a/code/modules/rogueminer_vr/landmarks.dm b/code/modules/rogueminer_vr/landmarks.dm index cef03695ea..881c0aa813 100644 --- a/code/modules/rogueminer_vr/landmarks.dm +++ b/code/modules/rogueminer_vr/landmarks.dm @@ -8,7 +8,7 @@ icon = 'icons/mob/screen1.dmi' icon_state = "x2" invisibility = 101 - anchored = 1 + anchored = TRUE var/datum/rogue/asteroid/myasteroid /obj/asteroid_spawner/New() @@ -21,7 +21,7 @@ icon = 'icons/mob/screen1.dmi' icon_state = "x" invisibility = 101 - anchored = 1 + anchored = TRUE var/mob/mymob /obj/rogue_mobspawner/New() diff --git a/code/modules/security levels/keycard authentication.dm b/code/modules/security levels/keycard authentication.dm index fb22fffb9b..daeae94946 100644 --- a/code/modules/security levels/keycard authentication.dm +++ b/code/modules/security levels/keycard authentication.dm @@ -16,7 +16,7 @@ var/mob/event_confirmed_by //1 = select event //2 = authenticate - anchored = 1.0 + anchored = TRUE use_power = USE_POWER_IDLE idle_power_usage = 2 active_power_usage = 6 diff --git a/code/modules/shieldgen/emergency_shield.dm b/code/modules/shieldgen/emergency_shield.dm index 53790689a9..53c2f129ea 100644 --- a/code/modules/shieldgen/emergency_shield.dm +++ b/code/modules/shieldgen/emergency_shield.dm @@ -3,10 +3,10 @@ desc = "An energy shield used to contain hull breaches." icon = 'icons/effects/effects.dmi' icon_state = "shield-old" - density = 1 + density = TRUE opacity = 0 - anchored = 1 - unacidable = 1 + anchored = TRUE + unacidable = TRUE can_atmos_pass = ATMOS_PASS_NO var/const/max_health = 200 var/health = max_health //The shield can only take so much beating (prevents perma-prisons) @@ -35,7 +35,7 @@ /obj/machinery/shield/Destroy() opacity = 0 - density = 0 + density = FALSE update_nearby_tiles() ..() @@ -120,9 +120,9 @@ desc = "Used to seal minor hull breaches." icon = 'icons/obj/objects.dmi' icon_state = "shieldoff" - density = 1 + density = TRUE opacity = 0 - anchored = 0 + anchored = FALSE pressure_resistance = 2*ONE_ATMOSPHERE req_access = list(access_engine) var/const/max_health = 100 @@ -310,12 +310,12 @@ if(active) to_chat(user, "The [src] shuts off!") src.shields_down() - anchored = 0 + anchored = FALSE else if(istype(get_turf(src), /turf/space)) return //No wrenching these in space! playsound(src, W.usesound, 100, 1) to_chat(user, "You secure the [src] to the floor!") - anchored = 1 + anchored = TRUE else if(istype(W, /obj/item/weapon/card/id) || istype(W, /obj/item/device/pda)) diff --git a/code/modules/shieldgen/energy_field.dm b/code/modules/shieldgen/energy_field.dm index 7176baf23b..04e9738349 100644 --- a/code/modules/shieldgen/energy_field.dm +++ b/code/modules/shieldgen/energy_field.dm @@ -14,10 +14,10 @@ icon = 'icons/obj/machines/shielding.dmi' icon_state = "shield" alpha = 100 - anchored = 1 + anchored = TRUE plane = MOB_PLANE layer = ABOVE_MOB_LAYER - density = 0 + density = FALSE can_atmos_pass = ATMOS_PASS_DENSITY var/obj/machinery/shield_gen/my_gen = null var/strength = 0 // in Renwicks @@ -101,13 +101,13 @@ ticks_recovering = min(ticks_recovering + 2, 10) if(strength < 1) // We broke - density = 0 + density = FALSE ticks_recovering = 10 strength = 0 else if(amount > 0) // Healing damage. if(strength >= 1) - density = 1 + density = TRUE if(density != old_density) update_icon() diff --git a/code/modules/shieldgen/energy_shield.dm b/code/modules/shieldgen/energy_shield.dm index c13c43496a..0982b2d3b8 100644 --- a/code/modules/shieldgen/energy_shield.dm +++ b/code/modules/shieldgen/energy_shield.dm @@ -6,10 +6,10 @@ desc = "An impenetrable field of energy, capable of blocking anything as long as it's active." icon = 'icons/obj/machines/shielding_vr.dmi' icon_state = "shield" - anchored = 1 + anchored = TRUE plane = MOB_PLANE layer = ABOVE_MOB_LAYER - density = 1 + density = TRUE invisibility = 0 var/obj/machinery/power/shield_generator/gen = null // Owning generator var/disabled_for = 0 diff --git a/code/modules/shieldgen/sheldwallgen.dm b/code/modules/shieldgen/sheldwallgen.dm index d814133e20..d03cd22c45 100644 --- a/code/modules/shieldgen/sheldwallgen.dm +++ b/code/modules/shieldgen/sheldwallgen.dm @@ -4,8 +4,8 @@ desc = "A shield generator." icon = 'icons/obj/stationobjs.dmi' icon_state = "Shield_Gen" - anchored = 0 - density = 1 + anchored = FALSE + density = TRUE req_access = list(access_engine_equip) var/active = 0 var/power = 0 @@ -224,9 +224,9 @@ desc = "An energy shield." icon = 'icons/effects/effects.dmi' icon_state = "shieldwall" - anchored = 1 - density = 1 - unacidable = 1 + anchored = TRUE + density = TRUE + unacidable = TRUE light_range = 3 var/needs_power = 0 var/active = 1 diff --git a/code/modules/shieldgen/shield_capacitor.dm b/code/modules/shieldgen/shield_capacitor.dm index 35cd71e134..b1ba46b57a 100644 --- a/code/modules/shieldgen/shield_capacitor.dm +++ b/code/modules/shieldgen/shield_capacitor.dm @@ -8,7 +8,7 @@ icon = 'icons/obj/machines/shielding.dmi' icon_state = "capacitor" var/active = 0 - density = 1 + density = TRUE var/stored_charge = 0 //not to be confused with power cell charge, this is in Joules var/last_stored_charge = 0 var/time_since_fail = 100 diff --git a/code/modules/shieldgen/shield_diffuser.dm b/code/modules/shieldgen/shield_diffuser.dm index f8d9328402..d5ec71f736 100644 --- a/code/modules/shieldgen/shield_diffuser.dm +++ b/code/modules/shieldgen/shield_diffuser.dm @@ -8,8 +8,8 @@ use_power = USE_POWER_ACTIVE idle_power_usage = 25 // Previously 100. active_power_usage = 500 // Previously 2000 - anchored = 1 - density = 0 + anchored = TRUE + density = FALSE level = 1 var/alarm = 0 var/enabled = 1 diff --git a/code/modules/shieldgen/shield_gen.dm b/code/modules/shieldgen/shield_gen.dm index af9d10d444..bf40ac9052 100644 --- a/code/modules/shieldgen/shield_gen.dm +++ b/code/modules/shieldgen/shield_gen.dm @@ -7,7 +7,7 @@ var/field_radius = 3 var/max_field_radius = 150 var/list/field = list() - density = 1 + density = TRUE var/locked = 0 var/average_field_strength = 0 var/strengthen_rate = 0.2 diff --git a/code/modules/shieldgen/shield_generator.dm b/code/modules/shieldgen/shield_generator.dm index 2ab1d3ff5b..48d712bf53 100644 --- a/code/modules/shieldgen/shield_generator.dm +++ b/code/modules/shieldgen/shield_generator.dm @@ -7,7 +7,7 @@ icon = 'icons/obj/machines/shielding_vr.dmi' icon_state = "generator0" circuit = /obj/item/weapon/circuitboard/shield_generator - density = 1 + density = TRUE var/datum/wires/shield_generator/wires = null var/list/field_segments = list() // List of all shield segments owned by this generator. var/list/damaged_segments = list() // List of shield segments that have failed and are currently regenerating. diff --git a/code/modules/shuttles/landmarks.dm b/code/modules/shuttles/landmarks.dm index 28a5c86a8b..cb65c4067c 100644 --- a/code/modules/shuttles/landmarks.dm +++ b/code/modules/shuttles/landmarks.dm @@ -3,9 +3,9 @@ name = "Nav Point" icon = 'icons/effects/effects.dmi' icon_state = "energynet" - anchored = 1 - unacidable = 1 - simulated = 0 + anchored = TRUE + unacidable = TRUE + simulated = FALSE invisibility = 101 flags = SLANDMARK_FLAG_AUTOSET // We generally want to use current area/turf as base. @@ -180,7 +180,7 @@ return active = 1 - anchored = 1 + anchored = TRUE var/obj/effect/shuttle_landmark/automatic/mark = new(T) mark.name = ("Beacon signal ([T.x],[T.y])") diff --git a/code/modules/spells/aoe_turf/conjure/forcewall.dm b/code/modules/spells/aoe_turf/conjure/forcewall.dm index 6d6bfdc3d8..92643b6e6d 100644 --- a/code/modules/spells/aoe_turf/conjure/forcewall.dm +++ b/code/modules/spells/aoe_turf/conjure/forcewall.dm @@ -29,10 +29,10 @@ name = "FORCEWALL" icon = 'icons/effects/effects.dmi' icon_state = "m_shield" - anchored = 1.0 + anchored = TRUE opacity = 0 - density = 1 - unacidable = 1 + density = TRUE + unacidable = TRUE invisibility = 101 /obj/effect/forcefield/bullet_act(var/obj/item/projectile/Proj, var/def_zone) diff --git a/code/modules/spells/targeted/ethereal_jaunt.dm b/code/modules/spells/targeted/ethereal_jaunt.dm index 57e8a13cab..d300f6a912 100644 --- a/code/modules/spells/targeted/ethereal_jaunt.dm +++ b/code/modules/spells/targeted/ethereal_jaunt.dm @@ -74,8 +74,8 @@ icon_state = "nothing" var/canmove = 1 var/reappearing = 0 - density = 0 - anchored = 1 + density = FALSE + anchored = TRUE var/turf/last_valid_turf /obj/effect/dummy/spell_jaunt/New(var/location) diff --git a/code/modules/tables/bench.dm b/code/modules/tables/bench.dm index 88c2b61526..f1ae3d141b 100644 --- a/code/modules/tables/bench.dm +++ b/code/modules/tables/bench.dm @@ -5,7 +5,7 @@ desc = "It's a bench, for putting things on. Or standing on, if you really want to." can_reinforce = 0 flipped = -1 - density = 0 + density = FALSE /obj/structure/table/bench/update_desc() if(material) diff --git a/code/modules/tables/flipping.dm b/code/modules/tables/flipping.dm index 18bcc4fe58..cc6be3352b 100644 --- a/code/modules/tables/flipping.dm +++ b/code/modules/tables/flipping.dm @@ -86,7 +86,7 @@ if(dir != NORTH) plane = MOB_PLANE layer = ABOVE_MOB_LAYER - climbable = 0 //flipping tables allows them to be used as makeshift barriers + climbable = FALSE //flipping tables allows them to be used as makeshift barriers flipped = 1 flags |= ON_BORDER for(var/D in list(turn(direction, 90), turn(direction, -90))) diff --git a/code/modules/tables/tables.dm b/code/modules/tables/tables.dm index 914c478e17..55d0127661 100644 --- a/code/modules/tables/tables.dm +++ b/code/modules/tables/tables.dm @@ -5,9 +5,9 @@ var/list/table_icon_cache = list() icon = 'icons/obj/tables.dmi' icon_state = "frame" desc = "It's a table, for putting things on. Or standing on, if you really want to." - density = 1 - anchored = 1 - climbable = 1 + density = TRUE + anchored = TRUE + climbable = TRUE layer = TABLE_LAYER throwpass = 1 surgery_odds = 50 //VOREStation Edit diff --git a/code/modules/telesci/telepad.dm b/code/modules/telesci/telepad.dm index a5ee8cbd93..86f2279a89 100644 --- a/code/modules/telesci/telepad.dm +++ b/code/modules/telesci/telepad.dm @@ -4,7 +4,7 @@ desc = "A bluespace telepad used for teleporting objects to and from a location." icon = 'icons/obj/telescience.dmi' icon_state = "pad-idle" - anchored = 1 + anchored = TRUE use_power = USE_POWER_IDLE circuit = /obj/item/weapon/circuitboard/telesci_pad idle_power_usage = 200 diff --git a/code/modules/turbolift/turbolift_console.dm b/code/modules/turbolift/turbolift_console.dm index a638fbbad4..4a17deabc2 100644 --- a/code/modules/turbolift/turbolift_console.dm +++ b/code/modules/turbolift/turbolift_console.dm @@ -2,8 +2,8 @@ /obj/structure/lift name = "turbolift control component" icon = 'icons/obj/turbolift.dmi' - anchored = 1 - density = 0 + anchored = TRUE + density = FALSE plane = MOB_PLANE var/datum/turbolift/lift diff --git a/code/modules/vehicles/Securitrain_vr.dm b/code/modules/vehicles/Securitrain_vr.dm index 1c52b6a4ea..a57430d426 100644 --- a/code/modules/vehicles/Securitrain_vr.dm +++ b/code/modules/vehicles/Securitrain_vr.dm @@ -39,7 +39,7 @@ desc = "A trolly designed to transport security personnel or prisoners." icon = 'icons/obj/vehicles_vr.dmi' icon_state = "paddy_trailer" - anchored = 0 + anchored = FALSE passenger_allowed = 1 locked = 0 @@ -384,6 +384,6 @@ src.active_engines = active_engines if(!lead && !tow) - anchored = 0 + anchored = FALSE else - anchored = 1 + anchored = TRUE diff --git a/code/modules/vehicles/bike.dm b/code/modules/vehicles/bike.dm index 915e2687ba..783ed376d3 100644 --- a/code/modules/vehicles/bike.dm +++ b/code/modules/vehicles/bike.dm @@ -157,7 +157,7 @@ /obj/vehicle/bike/turn_on() ion.start() - anchored = 1 + anchored = TRUE update_icon() diff --git a/code/modules/vehicles/cargo_train.dm b/code/modules/vehicles/cargo_train.dm index 37da72f536..0f102110e8 100644 --- a/code/modules/vehicles/cargo_train.dm +++ b/code/modules/vehicles/cargo_train.dm @@ -30,7 +30,7 @@ desc = "A large, flat platform made for putting things on. Or people." icon = 'icons/obj/vehicles_vr.dmi' //VOREStation Edit icon_state = "cargo_trailer" - anchored = 0 + anchored = FALSE passenger_allowed = 0 locked = 0 @@ -385,9 +385,9 @@ src.active_engines = active_engines if(!lead && !tow) - anchored = 0 + anchored = FALSE else - anchored = 1 + anchored = TRUE // VOREStation Edit Start - Overlay stuff for the chair-like effect /obj/vehicle/train/engine/update_icon() diff --git a/code/modules/vehicles/quad.dm b/code/modules/vehicles/quad.dm index 7f5eee732c..c66b2987b0 100644 --- a/code/modules/vehicles/quad.dm +++ b/code/modules/vehicles/quad.dm @@ -160,7 +160,7 @@ name = "all terrain trailer" icon = 'icons/obj/vehicles_64x64.dmi' icon_state = "quadtrailer" - anchored = 0 + anchored = FALSE passenger_allowed = 1 buckle_lying = 1 locked = 0 diff --git a/code/modules/vehicles/rover_vr.dm b/code/modules/vehicles/rover_vr.dm index 1367408743..50d7dba8f9 100644 --- a/code/modules/vehicles/rover_vr.dm +++ b/code/modules/vehicles/rover_vr.dm @@ -47,7 +47,7 @@ desc = "A trolley designed to transport security equipment to a scene." icon = 'icons/obj/vehicles_vr.dmi' icon_state = "secitemcarrierbot" - anchored = 0 + anchored = FALSE passenger_allowed = 0 locked = 0 @@ -397,6 +397,6 @@ src.active_engines = active_engines if(!lead && !tow) - anchored = 0 + anchored = FALSE else - anchored = 1 + anchored = TRUE diff --git a/code/modules/vehicles/vehicle.dm b/code/modules/vehicles/vehicle.dm index 0673c8a115..dcb909a2f5 100644 --- a/code/modules/vehicles/vehicle.dm +++ b/code/modules/vehicles/vehicle.dm @@ -8,12 +8,12 @@ name = "vehicle" icon = 'icons/obj/vehicles.dmi' layer = MOB_LAYER + 0.1 //so it sits above objects including mobs - density = 1 - anchored = 1 + density = TRUE + anchored = TRUE animate_movement=1 light_range = 3 - can_buckle = 1 + can_buckle = TRUE buckle_movable = 1 buckle_lying = 0 diff --git a/code/modules/virus2/analyser.dm b/code/modules/virus2/analyser.dm index b45dba31ed..5a736c28f7 100644 --- a/code/modules/virus2/analyser.dm +++ b/code/modules/virus2/analyser.dm @@ -3,8 +3,8 @@ desc = "Analyzes diseases to find out information about them!" icon = 'icons/obj/virology_vr.dmi' //VOREStation Edit icon_state = "analyser" - anchored = 1 - density = 1 + anchored = TRUE + density = TRUE var/scanning = 0 var/pause = 0 diff --git a/code/modules/virus2/biohazard destroyer.dm b/code/modules/virus2/biohazard destroyer.dm index 7d05c2f607..eabb3f8c62 100644 --- a/code/modules/virus2/biohazard destroyer.dm +++ b/code/modules/virus2/biohazard destroyer.dm @@ -3,8 +3,8 @@ icon = 'icons/obj/pipes/disposal.dmi' icon_state = "disposalbio" var/list/accepts = list(/obj/item/clothing,/obj/item/weapon/virusdish/,/obj/item/weapon/cureimplanter,/obj/item/weapon/diseasedisk,/obj/item/weapon/reagent_containers) - density = 1 - anchored = 1 + density = TRUE + anchored = TRUE /obj/machinery/disease2/biodestroyer/attackby(var/obj/I as obj, var/mob/user as mob) for(var/path in accepts) diff --git a/code/modules/virus2/dishincubator.dm b/code/modules/virus2/dishincubator.dm index 9dd935247a..399aca8738 100644 --- a/code/modules/virus2/dishincubator.dm +++ b/code/modules/virus2/dishincubator.dm @@ -1,8 +1,8 @@ /obj/machinery/disease2/incubator/ name = "pathogenic incubator" desc = "Encourages the growth of diseases. This model comes with a dispenser system and a small radiation generator." - density = 1 - anchored = 1 + density = TRUE + anchored = TRUE icon = 'icons/obj/virology_vr.dmi' //VOREStation Edit icon_state = "incubator" var/obj/item/weapon/virusdish/dish diff --git a/code/modules/virus2/isolator.dm b/code/modules/virus2/isolator.dm index d4053e8e52..61fa5cf820 100644 --- a/code/modules/virus2/isolator.dm +++ b/code/modules/virus2/isolator.dm @@ -1,8 +1,8 @@ /obj/machinery/disease2/isolator/ name = "pathogenic isolator" desc = "Used to isolate and identify diseases, allowing for comparison with a remote database." - density = 1 - anchored = 1 + density = TRUE + anchored = TRUE icon = 'icons/obj/virology_vr.dmi' //VOREStation Edit icon_state = "isolator" var/isolating = 0 diff --git a/code/modules/vore/eating/living_ch.dm b/code/modules/vore/eating/living_ch.dm index 58f4c656e3..ce9b7bd72d 100644 --- a/code/modules/vore/eating/living_ch.dm +++ b/code/modules/vore/eating/living_ch.dm @@ -88,7 +88,7 @@ mob/living/proc/check_vorefootstep(var/m_intent, var/turf/T) var/mob/living/user = usr - var/mob/living/TG = input("Choose who to transfer from") as null| mob in view(user.loc,1) + var/mob/living/TG = input("Choose who to transfer from") as null| mob in view(1,user.loc) if(!TG) return FALSE if(TG.give_reagents == FALSE && user != TG) //User isnt forced to allow giving in prefs if they are the one doing it @@ -107,7 +107,7 @@ mob/living/proc/check_vorefootstep(var/m_intent, var/turf/T) if("Cancel") return FALSE if("Vore belly") - var/mob/living/TR = input(user,"Choose who to transfer to","Select Target") as null|mob in view(user.loc,1) + var/mob/living/TR = input(user,"Choose who to transfer to","Select Target") as null|mob in view(1,user.loc) if(!TR) return FALSE if(TR == user) //Proceed, we dont need to have prefs enabled for transfer within user @@ -121,9 +121,9 @@ mob/living/proc/check_vorefootstep(var/m_intent, var/turf/T) return FALSE if(TG == user) - user.custom_emote_vr(1, "[RTB.reagent_transfer_verb] [RTB.reagent_name] from their [RTB] into their [TB].") + user.custom_emote_vr(1, "[RTB.reagent_transfer_verb] [RTB.reagent_name] from their [lowertext(RTB.name)] into their [lowertext(TB.name)].") else - user.custom_emote_vr(1, "[RTB.reagent_transfer_verb] [RTB.reagent_name] from [TG]'s [RTB] into their [TB].") + user.custom_emote_vr(1, "[RTB.reagent_transfer_verb] [RTB.reagent_name] from [TG]'s [lowertext(RTB.name)] into their [lowertext(TB.name)].") add_attack_logs(user,TR,"Transfered [RTB.reagent_name] from [TG]'s [RTB] to [TR]'s [TB]") //Bonus for staff so they can see if people have abused transfer and done pref breaks RTB.reagents.vore_trans_to_mob(TR, transfer_amount, CHEM_VORE, 1, 0, TB) @@ -138,29 +138,29 @@ mob/living/proc/check_vorefootstep(var/m_intent, var/turf/T) if(!Adjacent(TR) || !Adjacent(TG)) return //No long distance transfer if(!TR.reagents.get_free_space()) - to_chat(user, "[TR]'s [TB] is full!") + to_chat(user, "[TR]'s [lowertext(TB.name)] is full!") return FALSE if(TG == user) - user.custom_emote_vr(1, "[RTB.reagent_transfer_verb] [RTB.reagent_name] from their [RTB] into [TR]'s [TB].") + user.custom_emote_vr(1, "[RTB.reagent_transfer_verb] [RTB.reagent_name] from their [lowertext(RTB.name)] into [TR]'s [lowertext(TB.name)].") else - user.custom_emote_vr(1, "[RTB.reagent_transfer_verb] [RTB.reagent_name] from [TG]s [RTB] into [TR]'s [TB].") + user.custom_emote_vr(1, "[RTB.reagent_transfer_verb] [RTB.reagent_name] from [TG]s [lowertext(RTB.name)] into [TR]'s [lowertext(TB.name)].") RTB.reagents.vore_trans_to_mob(TR, transfer_amount, CHEM_VORE, 1, 0, TB) add_attack_logs(user,TR,"Transfered reagents from [TG]'s [RTB] to [TR]'s [TB]") //Bonus for staff so they can see if people have abused transfer and done pref breaks if("Stomach") - var/mob/living/TR = input(user,"Choose who to transfer to","Select Target") as null|mob in view(user.loc,1) + var/mob/living/TR = input(user,"Choose who to transfer to","Select Target") as null|mob in view(1,user.loc) if(!TR) return if(!Adjacent(TR) || !Adjacent(TG)) return //No long distance transfer if(TR == user) //Proceed, we dont need to have prefs enabled for transfer within user if(TG == user) - user.custom_emote_vr(1, "[RTB.reagent_transfer_verb] [RTB.reagent_name] from their [RTB] into their stomach.") + user.custom_emote_vr(1, "[RTB.reagent_transfer_verb] [RTB.reagent_name] from their [lowertext(RTB.name)] into their stomach.") else - user.custom_emote_vr(1, "[RTB.reagent_transfer_verb] [RTB.reagent_name] from [TG]'s [RTB] into their stomach.") + user.custom_emote_vr(1, "[RTB.reagent_transfer_verb] [RTB.reagent_name] from [TG]'s [lowertext(RTB.name)] into their stomach.") RTB.reagents.vore_trans_to_mob(TR, transfer_amount, CHEM_INGEST, 1, 0, null) add_attack_logs(user,TR,"Transfered [RTB.reagent_name] from [TG]'s [RTB] to [TR]'s Stomach") @@ -170,16 +170,16 @@ mob/living/proc/check_vorefootstep(var/m_intent, var/turf/T) else if(TG == user) - user.custom_emote_vr(1, "[RTB.reagent_transfer_verb] [RTB.reagent_name] from their [RTB] into [TR]'s stomach.") + user.custom_emote_vr(1, "[RTB.reagent_transfer_verb] [RTB.reagent_name] from their [lowertext(RTB.name)] into [TR]'s stomach.") else - user.custom_emote_vr(1, "[RTB.reagent_transfer_verb] [RTB.reagent_name] from [TG]'s [RTB] into [TR]'s stomach.") + user.custom_emote_vr(1, "[RTB.reagent_transfer_verb] [RTB.reagent_name] from [TG]'s [lowertext(RTB.name)] into [TR]'s stomach.") RTB.reagents.vore_trans_to_mob(TR, transfer_amount, CHEM_INGEST, 1, 0, null) add_attack_logs(user,TR,"Transfered [RTB.reagent_name] from [TG]'s [RTB] to [TR]'s Stomach") //Bonus for staff so they can see if people have abused transfer and done pref breaks if("Container") var/list/choices = list() - for(var/obj/item/weapon/reagent_containers/rc in view(user.loc,1)) + for(var/obj/item/weapon/reagent_containers/rc in view(1,user.loc)) choices += rc var/obj/item/weapon/reagent_containers/T = input(user,"Choose what to transfer to","Select Target") as null|anything in choices if(!T) @@ -188,9 +188,9 @@ mob/living/proc/check_vorefootstep(var/m_intent, var/turf/T) return //No long distance transfer if(TG == user) - user.custom_emote_vr(1, "[RTB.reagent_transfer_verb] [RTB.reagent_name] from their [RTB] into [T].") + user.custom_emote_vr(1, "[RTB.reagent_transfer_verb] [RTB.reagent_name] from their [lowertext(RTB.name)] into [T].") else - user.custom_emote_vr(1, "[RTB.reagent_transfer_verb] [RTB.reagent_name] from [TG]'s [RTB] into [T].") + user.custom_emote_vr(1, "[RTB.reagent_transfer_verb] [RTB.reagent_name] from [TG]'s [lowertext(RTB.name)] into [T].") RTB.reagents.vore_trans_to_con(T, transfer_amount, 1, 0) add_attack_logs(user, T,"Transfered [RTB.reagent_name] from [TG]'s [RTB] to a [T]") //Bonus for staff so they can see if people have abused transfer and done pref breaks @@ -201,13 +201,13 @@ mob/living/proc/check_vorefootstep(var/m_intent, var/turf/T) var/puddle_amount = round(amount_removed/5) if(puddle_amount == 0) - to_chat(user,"[RTB.reagent_name] dripples from the [RTB], not enough to form a puddle. ") + to_chat(user,"[RTB.reagent_name] dripples from the [lowertext(RTB.name)], not enough to form a puddle. ") return if(TG == user) - user.custom_emote_vr(1, "spills [RTB.reagent_name] from their [RTB] onto the floor!") + user.custom_emote_vr(1, "spills [RTB.reagent_name] from their [lowertext(RTB.name)] onto the floor!") else - user.custom_emote_vr(1, "spills [RTB.reagent_name] from [TG]'s [RTB] onto the floor!") + user.custom_emote_vr(1, "spills [RTB.reagent_name] from [TG]'s [lowertext(RTB.name)] onto the floor!") var/obj/effect/decal/cleanable/blood/reagent/puddle = new /obj/effect/decal/cleanable/blood/reagent(RTB.reagent_name, RTB.reagentcolor, RTB.reagentid, puddle_amount, user.ckey, TG.ckey) puddle.loc = TG.loc @@ -220,20 +220,25 @@ mob/living/proc/check_vorefootstep(var/m_intent, var/turf/T) if(soundfile) playsound(src, soundfile, vol = 100, vary = 1, falloff = VORE_SOUND_FALLOFF, preference = /datum/client_preference/eating_noises) -/mob/living/proc/vore_bellyrub(var/mob/living/T) +/mob/living/proc/vore_bellyrub(var/mob/living/T in view(1,src)) set name = "Give Bellyrubs" set category = "Abilities" set desc = "Provide bellyrubs to either yourself or another mob with a belly." if(!T) - T = input("Choose whose belly to rub") as null| mob in view(src.loc,1) + T = input("Choose whose belly to rub") as null| mob in view(1,src) if(!T) return FALSE + if(!T in view(1,src)) + return FALSE if(T.vore_selected) var/obj/belly/B = T.vore_selected if(istype(B)) - custom_emote_vr(1, "gives some rubs over [T]'s [B].") + if(T == src) + custom_emote_vr(1, "rubs their [lowertext(B.name)].") + else + custom_emote_vr(1, "gives some rubs over [T]'s [lowertext(B.name)].") B.quick_cycle() return TRUE to_chat(src, "There is no suitable belly for rubs.") - return FALSE \ No newline at end of file + return FALSE diff --git a/code/modules/vore/eating/vorepanel_vr.dm b/code/modules/vore/eating/vorepanel_vr.dm index 09d1f5b622..c506ff98af 100644 --- a/code/modules/vore/eating/vorepanel_vr.dm +++ b/code/modules/vore/eating/vorepanel_vr.dm @@ -563,7 +563,7 @@ to_chat(user,"You begin to push [M] to freedom!") to_chat(M,"[host] begins to push you to freedom!") - to_chat(M.loc,"Someone is trying to escape from inside you!") + to_chat(OB.owner,"Someone is trying to escape from inside you!") sleep(50) if(prob(33)) OB.release_specific_contents(M) diff --git a/code/modules/vore/fluffstuff/custom_clothes_vr.dm b/code/modules/vore/fluffstuff/custom_clothes_vr.dm index df2f8764be..9955961f5d 100644 --- a/code/modules/vore/fluffstuff/custom_clothes_vr.dm +++ b/code/modules/vore/fluffstuff/custom_clothes_vr.dm @@ -139,7 +139,7 @@ icon_state = "joanasuna" icon_override = 'icons/vore/custom_clothes_vr.dmi' - item_state = "joanasuna" + item_state = "joanasuna_mob" //eekasqueak:Serkii Miishy /obj/item/clothing/under/skirt/fluff/serkii @@ -150,7 +150,7 @@ icon_state = "serkiskirt" icon_override = 'icons/vore/custom_clothes_vr.dmi' - item_state = "serkiskirt" + item_state = "serkiskirt_mob" //Unknown. Please check records from the forums. /obj/item/clothing/under/suit_jacket/female/fluff/miqote @@ -161,7 +161,7 @@ icon_state = "miqote" icon_override = 'icons/vore/custom_clothes_vr.dmi' - item_state = "miqote" + item_state = "miqote_mob" //JoanRisu:Joan Risu /obj/item/clothing/under/fluff/nightgown @@ -172,7 +172,7 @@ icon_state = "joannightgown" icon_override = 'icons/vore/custom_clothes_vr.dmi' - item_state = "joannightgown" + item_state = "joannightgown_mob" //Vorrarkul:Lucina Dakarim /obj/item/clothing/under/dress/fluff/lucinadress @@ -464,7 +464,7 @@ icon_state = "harmcaptain" icon_override = 'icons/vore/custom_clothes_vr.dmi' - item_state = "harmcaptain" + item_state = "harmcaptain_mob" //Variant /obj/item/clothing/under/rank/captain/fluff/harmuniform/centcom name = "\improper CentCom administrator's uniform" @@ -484,7 +484,7 @@ icon_state = "tasaldsuit" icon_override = 'icons/vore/custom_clothes_vr.dmi' - item_state = "tasaldsuit" + item_state = "tasaldsuit_mob" armor = list(melee = 10, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 0, rad = 0) // bwoincognito:Tasald Corlethian @@ -653,7 +653,7 @@ icon_state = "screesuit" icon_override = 'icons/vore/custom_clothes_vr.dmi' - item_state = "screesuit" + item_state = "screesuit_mob" /obj/item/clothing/under/fluff/screesuit/mob_can_equip(var/mob/living/carbon/human/H, slot, disable_warning = 0) if(..()) @@ -946,7 +946,7 @@ No. With a teleporter? Just *no*. - Hawk, YW name = "Earth Swimsuit" desc = "The suit of Subject 688,509,403. Made of an enviromentally safe elastic. Dry-clean not required." icon_state = "fluffearthenbreath" - item_state = "fluffearthenbreath" + item_state = "fluffearthenbreath_mob" //jacobdragon:Earthen Breath /obj/item/clothing/head/fluff/hairflowerpin @@ -1490,7 +1490,7 @@ Departamental Swimsuits, for general use icon = 'icons/vore/custom_clothes_vr.dmi' icon_state = "nanovest" icon_override = 'icons/vore/custom_clothes_vr.dmi' - item_state = "nanovest" + item_state = "nanovest_mob" //General use /obj/item/clothing/suit/storage/fluff/loincloth @@ -1501,7 +1501,7 @@ Departamental Swimsuits, for general use icon_state = "loincloth" icon_override = 'icons/vore/custom_clothes_vr.dmi' - item_state = "loincloth" + item_state = "loincloth_mob" //BeyondMyLife: Ne'tra Ky'ram /obj/item/clothing/suit/storage/hooded/wintercoat/kilanocoat @@ -1559,7 +1559,7 @@ Departamental Swimsuits, for general use icon = 'icons/vore/custom_clothes_vr.dmi' icon_override = 'icons/vore/custom_clothes_vr.dmi' icon_state = "kilanosuit" - item_state = "kilanosuit" + item_state = "kilanosuit_mob" armor = list(melee = 10, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 0, rad = 0) siemens_coefficient = 0.9 @@ -1656,7 +1656,7 @@ Departamental Swimsuits, for general use name = "purple and silver dress uniform" desc = "A royal purple dress, replicating the usual captains dress, made of the same glossy/silky material, with odd oriental and foriegn patterns on it, silver lined too!" icon_state = "kilanosuit_p" - item_state = "kilanosuit_p" + item_state = "kilanosuit_p_mob" //Mewchild: Phi Vietsi /obj/item/clothing/gloves/ring/seal/signet/fluff/phi @@ -1843,8 +1843,8 @@ Departamental Swimsuits, for general use icon_override = 'icons/vore/custom_clothes_vr.dmi' icon_state = "blackutility_med" - worn_state = "blackutility_med" - item_state = "blackutility_med" + worn_state = "blackutility_med_mob" + item_state = "blackutility_med_mob" rolled_down = 0 rolled_sleeves = 0 @@ -1903,6 +1903,7 @@ Departamental Swimsuits, for general use body_parts_covered = UPPER_TORSO|LOWER_TORSO icon = 'icons/vore/custom_clothes_vr.dmi' icon_state = "latex_clothes" + item_state = "latex_clothes_mob" item_icons = null default_worn_icon = 'icons/vore/custom_clothes_vr.dmi' color = COLOR_NAVY diff --git a/code/modules/vore/fluffstuff/custom_items_vr.dm b/code/modules/vore/fluffstuff/custom_items_vr.dm index 9eba770312..23801db70f 100644 --- a/code/modules/vore/fluffstuff/custom_items_vr.dm +++ b/code/modules/vore/fluffstuff/custom_items_vr.dm @@ -173,8 +173,8 @@ item_state = "joanariamob" origin_tech = "materials=7" force = 15 - sharp = 1 - edge = 1 + sharp = TRUE + edge = TRUE hitsound = 'sound/weapons/bladeslice.ogg' @@ -933,8 +933,8 @@ icon_state = "stunstaff00" var/base_icon = "stunstaff" force = 5 - sharp = 0 - edge = 0 + sharp = FALSE + edge = FALSE throwforce = 7 w_class = ITEMSIZE_HUGE origin_tech = list(TECH_COMBAT = 2) @@ -1029,8 +1029,8 @@ var/active_throwforce var/active_w_class var/active_embed_chance = 0 - sharp = 0 - edge = 0 + sharp = FALSE + edge = FALSE /obj/item/weapon/melee/fluffstuff/proc/activate(mob/living/user) if(active) @@ -1039,8 +1039,8 @@ embed_chance = active_embed_chance force = active_force throwforce = active_throwforce - sharp = 1 - edge = 1 + sharp = TRUE + edge = TRUE w_class = active_w_class playsound(src, 'sound/weapons/sparkle.ogg', 50, 1) @@ -1112,8 +1112,8 @@ ..() attack_verb = list("attacked", "slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut") - sharp = 1 - edge = 1 + sharp = TRUE + edge = TRUE icon_state = "[active_state]_sharp" damtype = BRUTE diff --git a/code/modules/vore/smoleworld/smoleworld_vr.dm b/code/modules/vore/smoleworld/smoleworld_vr.dm index ebc0aa0485..f9d1c92a64 100644 --- a/code/modules/vore/smoleworld/smoleworld_vr.dm +++ b/code/modules/vore/smoleworld/smoleworld_vr.dm @@ -108,7 +108,7 @@ /obj/structure/smoletrack icon = 'icons/vore/smoleworld_vr.dmi' color = "#ffffff" - density = 0 + density = FALSE /obj/structure/smoletrack/attack_hand(mob/user) if(user.a_intent == I_DISARM) @@ -164,35 +164,35 @@ icon = 'icons/vore/smoleworld_vr.dmi' icon_state = "carstraight" desc = "A long set of tiny road." - anchored = 1 + anchored = TRUE /obj/structure/smoletrack/roadT name = "road threeway piece" icon = 'icons/vore/smoleworld_vr.dmi' icon_state = "carthreeway" desc = "A tiny threeway road piece." - anchored = 1 + anchored = TRUE /obj/structure/smoletrack/roadturn name = "road turn piece" icon = 'icons/vore/smoleworld_vr.dmi' icon_state = "carturn" desc = "A tiny turn road piece." - anchored = 1 + anchored = TRUE /obj/structure/smoletrack/roadF name = "road four-way piece" icon = 'icons/vore/smoleworld_vr.dmi' icon_state = "carfourway" desc = "A four-way road piece." - anchored = 1 + anchored = TRUE //buildings code //Defining building actions /obj/structure/smolebuilding icon = 'icons/vore/smoleworld_vr.dmi' - density = 1 - anchored = 1 + density = TRUE + anchored = TRUE color = "#ffffff" var/health = 75 var/damage @@ -317,7 +317,7 @@ /obj/structure/smoleruins icon = 'icons/vore/smoleworld_vr.dmi' icon_state = "ruins" - density = 0 + density = FALSE /obj/structure/smolebuilding/houses name = "smole houses" diff --git a/code/modules/vore/weight/fitness_machines_vr.dm b/code/modules/vore/weight/fitness_machines_vr.dm index e9125b26d8..ca6267ba49 100644 --- a/code/modules/vore/weight/fitness_machines_vr.dm +++ b/code/modules/vore/weight/fitness_machines_vr.dm @@ -2,7 +2,7 @@ name = "workout equipment" desc = "A utility often used to lose weight." icon = 'icons/obj/machines/fitness_machines_vr.dmi' - anchored = 1 + anchored = TRUE use_power = USE_POWER_OFF idle_power_usage = 0 active_power_usage = 0 @@ -32,8 +32,8 @@ name = "punching bag" desc = "A bag often used to relieve stress and burn fat." icon_state = "punchingbag" - anchored = 0 - density = 1 + anchored = FALSE + density = TRUE workout_sounds = list( "punch") messages = list( @@ -87,7 +87,7 @@ icon = 'icons/obj/machines/fitness_machines_vr.dmi' icon_state = "scale" desc = "A scale used to measure ones weight relative to their size and species." - anchored = 1 // Set to 0 when we can construct or dismantle these. + anchored = TRUE // Set to 0 when we can construct or dismantle these. use_power = USE_POWER_OFF idle_power_usage = 0 active_power_usage = 0 diff --git a/code/modules/xenoarcheaology/anomaly_container.dm b/code/modules/xenoarcheaology/anomaly_container.dm index 795cd9d6df..f9ac6ef4f5 100644 --- a/code/modules/xenoarcheaology/anomaly_container.dm +++ b/code/modules/xenoarcheaology/anomaly_container.dm @@ -3,7 +3,7 @@ desc = "Used to safely contain and move anomalies." icon = 'icons/obj/xenoarchaeology.dmi' icon_state = "anomaly_container" - density = 1 + density = TRUE var/obj/machinery/artifact/contained diff --git a/code/modules/xenoarcheaology/artifacts/artifact.dm b/code/modules/xenoarcheaology/artifacts/artifact.dm index 3344afa24e..bbf54ed469 100644 --- a/code/modules/xenoarcheaology/artifacts/artifact.dm +++ b/code/modules/xenoarcheaology/artifacts/artifact.dm @@ -4,7 +4,7 @@ icon = 'icons/obj/xenoarchaeology.dmi' icon_state = "ano00" var/icon_num = 0 - density = 1 + density = TRUE var/datum/artifact_effect/my_effect var/datum/artifact_effect/secondary_effect var/being_used = 0 diff --git a/code/modules/xenoarcheaology/artifacts/autocloner.dm b/code/modules/xenoarcheaology/artifacts/autocloner.dm index 28cb0a7360..96195fd700 100644 --- a/code/modules/xenoarcheaology/artifacts/autocloner.dm +++ b/code/modules/xenoarcheaology/artifacts/autocloner.dm @@ -7,7 +7,7 @@ var/time_spent_spawning = 0 var/time_per_spawn = 0 var/last_process= 0 - density = 1 + density = TRUE var/previous_power_state = 0 use_power = USE_POWER_IDLE diff --git a/code/modules/xenoarcheaology/artifacts/crystal.dm b/code/modules/xenoarcheaology/artifacts/crystal.dm index c090c23a3f..a1d93d824b 100644 --- a/code/modules/xenoarcheaology/artifacts/crystal.dm +++ b/code/modules/xenoarcheaology/artifacts/crystal.dm @@ -2,7 +2,7 @@ name = "large crystal" icon = 'icons/obj/xenoarchaeology.dmi' icon_state = "crystal" - density = 1 + density = TRUE /obj/structure/crystal/New() ..() diff --git a/code/modules/xenoarcheaology/artifacts/gigadrill.dm b/code/modules/xenoarcheaology/artifacts/gigadrill.dm index b30b1ed959..5579f3d9a6 100644 --- a/code/modules/xenoarcheaology/artifacts/gigadrill.dm +++ b/code/modules/xenoarcheaology/artifacts/gigadrill.dm @@ -6,7 +6,7 @@ var/active = 0 var/drill_time = 10 var/turf/drilling_turf - density = 1 + density = TRUE layer = ABOVE_JUNK_LAYER /obj/machinery/giga_drill/attack_hand(mob/user as mob) @@ -25,10 +25,10 @@ var/turf/simulated/mineral/M = A drilling_turf = get_turf(src) src.visible_message("\The [src] begins to drill into \the [M].") - anchored = 1 + anchored = TRUE spawn(drill_time) if(get_turf(src) == drilling_turf && active) M.GetDrilled() src.loc = M drilling_turf = null - anchored = 0 + anchored = FALSE diff --git a/code/modules/xenoarcheaology/artifacts/replicator.dm b/code/modules/xenoarcheaology/artifacts/replicator.dm index a1f069e546..f3ad6d674c 100644 --- a/code/modules/xenoarcheaology/artifacts/replicator.dm +++ b/code/modules/xenoarcheaology/artifacts/replicator.dm @@ -3,7 +3,7 @@ desc = "It's some kind of pod with strange wires and gadgets all over it." icon = 'icons/obj/xenoarchaeology.dmi' icon_state = "borgcharger0(old)" - density = 1 + density = TRUE idle_power_usage = 100 active_power_usage = 1000 diff --git a/code/modules/xenoarcheaology/boulder.dm b/code/modules/xenoarcheaology/boulder.dm index b66ed8f0e6..7baa254643 100644 --- a/code/modules/xenoarcheaology/boulder.dm +++ b/code/modules/xenoarcheaology/boulder.dm @@ -3,9 +3,9 @@ desc = "Leftover rock from an excavation, it's been partially dug out already but there's still a lot to go." icon = 'icons/obj/mining.dmi' icon_state = "boulder1" - density = 1 + density = TRUE opacity = 1 - anchored = 1 + anchored = TRUE var/excavation_level = 0 var/datum/geosample/geological_data var/datum/artifact_find/artifact_find diff --git a/code/modules/xenoarcheaology/finds/special.dm b/code/modules/xenoarcheaology/finds/special.dm index 69aa73a02f..02a5096b98 100644 --- a/code/modules/xenoarcheaology/finds/special.dm +++ b/code/modules/xenoarcheaology/finds/special.dm @@ -170,7 +170,7 @@ name = "shadow wight" icon = 'icons/mob/mob.dmi' icon_state = "shade" - density = 1 + density = TRUE /obj/effect/shadow_wight/New() START_PROCESSING(SSobj, src) diff --git a/code/modules/xenoarcheaology/sampling.dm b/code/modules/xenoarcheaology/sampling.dm index 3cdea12960..f9fc735f2e 100644 --- a/code/modules/xenoarcheaology/sampling.dm +++ b/code/modules/xenoarcheaology/sampling.dm @@ -5,7 +5,7 @@ icon_state = "sliver1" randpixel = 8 w_class = ITEMSIZE_TINY - sharp = 1 + sharp = TRUE var/datum/geosample/geological_data /obj/item/weapon/rocksliver/New() diff --git a/code/modules/xenoarcheaology/tools/artifact_analyser.dm b/code/modules/xenoarcheaology/tools/artifact_analyser.dm index 6175aaf8ad..44afa6ea2c 100644 --- a/code/modules/xenoarcheaology/tools/artifact_analyser.dm +++ b/code/modules/xenoarcheaology/tools/artifact_analyser.dm @@ -3,8 +3,8 @@ desc = "Studies the emissions of anomalous materials to discover their uses." icon = 'icons/obj/virology_vr.dmi' //VOREStation Edit icon_state = "isolator" - anchored = 1 - density = 1 + anchored = TRUE + density = TRUE var/scan_in_progress = 0 var/scan_num = 0 var/obj/scanned_obj diff --git a/code/modules/xenoarcheaology/tools/artifact_harvester.dm b/code/modules/xenoarcheaology/tools/artifact_harvester.dm index 6b47e18617..05aa87442d 100644 --- a/code/modules/xenoarcheaology/tools/artifact_harvester.dm +++ b/code/modules/xenoarcheaology/tools/artifact_harvester.dm @@ -2,8 +2,8 @@ name = "Exotic Particle Harvester" icon = 'icons/obj/virology_vr.dmi' //VOREStation Edit icon_state = "incubator" //incubator_on - anchored = 1 - density = 1 + anchored = TRUE + density = TRUE idle_power_usage = 50 active_power_usage = 750 use_power = USE_POWER_IDLE diff --git a/code/modules/xenoarcheaology/tools/artifact_scanner.dm b/code/modules/xenoarcheaology/tools/artifact_scanner.dm index c5bdfe015a..2b1a1196ca 100644 --- a/code/modules/xenoarcheaology/tools/artifact_scanner.dm +++ b/code/modules/xenoarcheaology/tools/artifact_scanner.dm @@ -3,5 +3,5 @@ desc = "Place things here for scanning." icon = 'icons/obj/stationobjs.dmi' icon_state = "tele0" - anchored = 1 - density = 0 + anchored = TRUE + density = FALSE diff --git a/code/modules/xenoarcheaology/tools/geosample_scanner.dm b/code/modules/xenoarcheaology/tools/geosample_scanner.dm index d6711db804..dc634789bf 100644 --- a/code/modules/xenoarcheaology/tools/geosample_scanner.dm +++ b/code/modules/xenoarcheaology/tools/geosample_scanner.dm @@ -1,8 +1,8 @@ /obj/machinery/radiocarbon_spectrometer name = "radiocarbon spectrometer" desc = "A specialised, complex scanner for gleaning information on all manner of small things." - anchored = 1 - density = 1 + anchored = TRUE + density = TRUE icon = 'icons/obj/virology_vr.dmi' //VOREStation Edit icon_state = "analyser" diff --git a/code/modules/xenoarcheaology/tools/suspension_generator.dm b/code/modules/xenoarcheaology/tools/suspension_generator.dm index cd39d0e181..08d41fc121 100644 --- a/code/modules/xenoarcheaology/tools/suspension_generator.dm +++ b/code/modules/xenoarcheaology/tools/suspension_generator.dm @@ -3,7 +3,7 @@ desc = "It has stubby legs bolted up against it's body for stabilising." icon = 'icons/obj/xenoarchaeology.dmi' icon_state = "suspension2" - density = 1 + density = TRUE req_access = list(access_research) var/obj/item/weapon/cell/cell var/locked = TRUE @@ -95,9 +95,9 @@ else if(W.is_wrench()) if(!suspension_field) if(anchored) - anchored = 0 + anchored = FALSE else - anchored = 1 + anchored = TRUE playsound(src, W.usesound, 50, 1) to_chat(user, "You wrench the stabilising legs [anchored ? "into place" : "up against the body"].") if(anchored) @@ -198,8 +198,8 @@ /obj/effect/suspension_field name = "energy field" icon = 'icons/effects/effects.dmi' - anchored = 1 - density = 1 + anchored = TRUE + density = TRUE /obj/effect/suspension_field/Destroy() for(var/atom/movable/I in src) diff --git a/code/modules/xenoarcheaology/tools/tools_pickaxe.dm b/code/modules/xenoarcheaology/tools/tools_pickaxe.dm index 7962976a0e..ddca8b6fe5 100644 --- a/code/modules/xenoarcheaology/tools/tools_pickaxe.dm +++ b/code/modules/xenoarcheaology/tools/tools_pickaxe.dm @@ -125,7 +125,7 @@ /obj/item/weapon/pickaxe/hand) max_storage_space = ITEMSIZE_COST_SMALL * 9 max_w_class = ITEMSIZE_SMALL - use_to_pickup = 1 + use_to_pickup = TRUE /obj/item/weapon/storage/excavation/New() ..() diff --git a/code/modules/xenobio2/machinery/core_extractor.dm b/code/modules/xenobio2/machinery/core_extractor.dm index 01068e4cd1..4a6b8651e2 100644 --- a/code/modules/xenobio2/machinery/core_extractor.dm +++ b/code/modules/xenobio2/machinery/core_extractor.dm @@ -8,8 +8,8 @@ desc = "A machine for cutting up slimes to get to their cores." icon = 'icons/obj/xenoarchaeology.dmi' icon_state = "scanner_0old" - density = 1 - anchored = 1 + density = TRUE + anchored = TRUE circuit = /obj/item/weapon/circuitboard/slimeextractor var/inuse var/mob/living/simple_mob/xeno/slime/occupant = null diff --git a/code/modules/xenobio2/machinery/gene_manipulators.dm b/code/modules/xenobio2/machinery/gene_manipulators.dm index 4438c60fdf..c896f14309 100644 --- a/code/modules/xenobio2/machinery/gene_manipulators.dm +++ b/code/modules/xenobio2/machinery/gene_manipulators.dm @@ -40,8 +40,8 @@ new /obj/item/weapon/disk/xenobio(src) /obj/machinery/xenobio - density = 1 - anchored = 1 + density = TRUE + anchored = TRUE use_power = USE_POWER_IDLE var/obj/item/weapon/disk/xenobio/loaded_disk //Currently loaded data disk. diff --git a/code/modules/xenobio2/machinery/injector.dm b/code/modules/xenobio2/machinery/injector.dm index 2c0454a8e2..3e31b54cd8 100644 --- a/code/modules/xenobio2/machinery/injector.dm +++ b/code/modules/xenobio2/machinery/injector.dm @@ -8,8 +8,8 @@ /obj/machinery/xenobio2/manualinjector name = "biological injector" desc = "Injects biological organisms that are inserted with the contents of an inserted beaker at the command of a remote computer." - density = 1 - anchored = 1 + density = TRUE + anchored = TRUE use_power = USE_POWER_IDLE icon = 'icons/obj/biogenerator.dmi' icon_state = "biogen-work" diff --git a/code/modules/xenobio2/machinery/slime_replicator.dm b/code/modules/xenobio2/machinery/slime_replicator.dm index b5e49b7c62..f845ad6e8d 100644 --- a/code/modules/xenobio2/machinery/slime_replicator.dm +++ b/code/modules/xenobio2/machinery/slime_replicator.dm @@ -8,8 +8,8 @@ desc = "A machine for creating slimes from cores. Amazing!" icon = 'icons/obj/xenoarchaeology.dmi' icon_state = "restruct_0" - density = 1 - anchored = 1 + density = TRUE + anchored = TRUE circuit = /obj/item/weapon/circuitboard/slimereplicator var/obj/item/xenoproduct/slime/core/core = null var/inuse diff --git a/icons/vore/custom_clothes_tesh_vr.dmi b/icons/vore/custom_clothes_tesh_vr.dmi index 95f6819130..53d1abe197 100644 Binary files a/icons/vore/custom_clothes_tesh_vr.dmi and b/icons/vore/custom_clothes_tesh_vr.dmi differ diff --git a/icons/vore/custom_clothes_vr.dmi b/icons/vore/custom_clothes_vr.dmi index 595ce2da40..6c8267333a 100644 Binary files a/icons/vore/custom_clothes_vr.dmi and b/icons/vore/custom_clothes_vr.dmi differ