diff --git a/code/game/machinery/ai_slipper.dm b/code/game/machinery/ai_slipper.dm index f236ac18e91..bbceade5192 100644 --- a/code/game/machinery/ai_slipper.dm +++ b/code/game/machinery/ai_slipper.dm @@ -5,7 +5,7 @@ layer = 3 plane = FLOOR_PLANE anchored = TRUE - armor = list(melee = 50, bullet = 20, laser = 20, energy = 20, bomb = 0, rad = 0, fire = 50, acid = 30) + armor = list(MELEE = 50, BULLET = 20, LASER = 20, ENERGY = 20, BOMB = 0, RAD = 0, FIRE = 50, ACID = 30) var/uses = 20 var/cooldown_time = 10 SECONDS var/cooldown_on = FALSE diff --git a/code/game/machinery/buttons.dm b/code/game/machinery/buttons.dm index 2c5a8a65135..17c40a3a3f3 100644 --- a/code/game/machinery/buttons.dm +++ b/code/game/machinery/buttons.dm @@ -9,7 +9,7 @@ icon = 'icons/obj/objects.dmi' icon_state = "launcherbtt" anchored = TRUE - armor = list(melee = 50, bullet = 50, laser = 50, energy = 50, bomb = 10, rad = 100, fire = 90, acid = 70) + armor = list(MELEE = 50, BULLET = 50, LASER = 50, ENERGY = 50, BOMB = 10, RAD = 100, FIRE = 90, ACID = 70) idle_power_consumption = 2 active_power_consumption = 4 resistance_flags = LAVA_PROOF | FIRE_PROOF diff --git a/code/game/machinery/deployable.dm b/code/game/machinery/deployable.dm index 6cfb8a0ee86..2d033eed56d 100644 --- a/code/game/machinery/deployable.dm +++ b/code/game/machinery/deployable.dm @@ -158,7 +158,7 @@ anchored = FALSE max_integrity = 180 proj_pass_rate = 20 - armor = list(melee = 10, bullet = 50, laser = 50, energy = 50, bomb = 10, rad = 100, fire = 10, acid = 0) + armor = list(MELEE = 10, BULLET = 50, LASER = 50, ENERGY = 50, BOMB = 10, RAD = 100, FIRE = 10, ACID = 0) stacktype = null var/deploy_time = 40 var/deploy_message = TRUE diff --git a/code/game/machinery/firealarm.dm b/code/game/machinery/firealarm.dm index 5477ea65108..c77bbcf2637 100644 --- a/code/game/machinery/firealarm.dm +++ b/code/game/machinery/firealarm.dm @@ -19,7 +19,7 @@ FIRE ALARM anchored = TRUE max_integrity = 250 integrity_failure = 100 - armor = list(melee = 0, bullet = 0, laser = 0, energy = 0, bomb = 0, rad = 100, fire = 90, acid = 30) + armor = list(MELEE = 0, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 0, RAD = 100, FIRE = 90, ACID = 30) idle_power_consumption = 2 active_power_consumption = 6 power_channel = PW_CHANNEL_ENVIRONMENT diff --git a/code/game/machinery/floor_igniter.dm b/code/game/machinery/floor_igniter.dm index d02945e84d5..127b37fe941 100644 --- a/code/game/machinery/floor_igniter.dm +++ b/code/game/machinery/floor_igniter.dm @@ -4,7 +4,7 @@ icon_state = "igniter1" plane = FLOOR_PLANE max_integrity = 300 - armor = list(melee = 50, bullet = 30, laser = 70, energy = 50, bomb = 20, rad = 0, fire = 100, acid = 70) + armor = list(MELEE = 50, BULLET = 30, LASER = 70, ENERGY = 50, BOMB = 20, RAD = 0, FIRE = 100, ACID = 70) resistance_flags = FIRE_PROOF anchored = TRUE idle_power_consumption = 2 diff --git a/code/game/machinery/hologram.dm b/code/game/machinery/hologram.dm index 9379298c059..18626972d4d 100644 --- a/code/game/machinery/hologram.dm +++ b/code/game/machinery/hologram.dm @@ -67,7 +67,7 @@ GLOBAL_LIST_EMPTY(holopads) layer = HOLOPAD_LAYER //Preventing mice and drones from sneaking under them. plane = FLOOR_PLANE max_integrity = 300 - armor = list(melee = 50, bullet = 20, laser = 20, energy = 20, bomb = 0, rad = 0, fire = 50, acid = 0) + armor = list(MELEE = 50, BULLET = 20, LASER = 20, ENERGY = 20, BOMB = 0, RAD = 0, FIRE = 50, ACID = 0) /// List of living mobs currently using the holopad var/list/masters = list() diff --git a/code/game/machinery/machinery.dm b/code/game/machinery/machinery.dm index 2dac0c993b3..01dd6277162 100644 --- a/code/game/machinery/machinery.dm +++ b/code/game/machinery/machinery.dm @@ -5,7 +5,7 @@ pressure_resistance = 15 max_integrity = 200 layer = BELOW_OBJ_LAYER - armor = list(melee = 25, bullet = 10, laser = 10, energy = 0, bomb = 0, rad = 0, fire = 50, acid = 70) + armor = list(MELEE = 25, BULLET = 10, LASER = 10, ENERGY = 0, BOMB = 0, RAD = 0, FIRE = 50, ACID = 70) atom_say_verb = "beeps" flags_ricochet = RICOCHET_HARD receive_ricochet_chance_mod = 0.3 diff --git a/code/game/machinery/navbeacon.dm b/code/game/machinery/navbeacon.dm index 42c52696eaf..84c7a4896dc 100644 --- a/code/game/machinery/navbeacon.dm +++ b/code/game/machinery/navbeacon.dm @@ -12,7 +12,7 @@ plane = FLOOR_PLANE anchored = TRUE max_integrity = 500 - armor = list(melee = 70, bullet = 70, laser = 70, energy = 70, bomb = 0, rad = 0, fire = 80, acid = 80) + armor = list(MELEE = 70, BULLET = 70, LASER = 70, ENERGY = 70, BOMB = 0, RAD = 0, FIRE = 80, ACID = 80) var/open = FALSE // true if cover is open var/locked = TRUE // true if controls are locked var/location = "" // location response text diff --git a/code/game/machinery/portable_turret.dm b/code/game/machinery/portable_turret.dm index bd6e08c0180..cdb47a37be7 100644 --- a/code/game/machinery/portable_turret.dm +++ b/code/game/machinery/portable_turret.dm @@ -16,7 +16,7 @@ anchored = TRUE idle_power_consumption = 50 //when inactive, this turret takes up constant 50 Equipment power active_power_consumption = 300 //when active, this turret takes up constant 300 Equipment power - armor = list(melee = 50, bullet = 30, laser = 30, energy = 30, bomb = 30, rad = 0, fire = 90, acid = 90) + armor = list(MELEE = 50, BULLET = 30, LASER = 30, ENERGY = 30, BOMB = 30, RAD = 0, FIRE = 90, ACID = 90) ///this will be visible when above doors/firelocks/blastdoors to prevent cheese layer = ABOVE_OBJ_LAYER var/raised = FALSE //if the turret cover is "open" and the turret is raised diff --git a/code/game/machinery/vendors/generic_vendors.dm b/code/game/machinery/vendors/generic_vendors.dm index 9a1e411e5bd..4c9a902ede8 100644 --- a/code/game/machinery/vendors/generic_vendors.dm +++ b/code/game/machinery/vendors/generic_vendors.dm @@ -1120,7 +1120,7 @@ icon_lightmask = "tool" icon_panel = "generic" category = VENDOR_TYPE_SUPPLIES - armor = list(melee = 50, bullet = 20, laser = 20, energy = 20, bomb = 0, rad = 0, fire = 100, acid = 70) + armor = list(MELEE = 50, BULLET = 20, LASER = 20, ENERGY = 20, BOMB = 0, RAD = 0, FIRE = 100, ACID = 70) resistance_flags = FIRE_PROOF products = list(/obj/item/crowbar = 5, /obj/item/screwdriver = 5, diff --git a/code/game/machinery/vendors/vending.dm b/code/game/machinery/vendors/vending.dm index c2f1cb34f2d..9be50fab4df 100644 --- a/code/game/machinery/vendors/vending.dm +++ b/code/game/machinery/vendors/vending.dm @@ -105,7 +105,7 @@ face_while_pulling = TRUE max_integrity = 300 integrity_failure = 100 - armor = list(melee = 20, bullet = 0, laser = 0, energy = 0, bomb = 0, rad = 0, fire = 50, acid = 70) + armor = list(MELEE = 20, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 0, RAD = 0, FIRE = 50, ACID = 70) /// Icon_state when vending var/icon_vend diff --git a/code/game/mecha/combat/combat.dm b/code/game/mecha/combat/combat.dm index 29b6d366bc5..481dc8f6e77 100644 --- a/code/game/mecha/combat/combat.dm +++ b/code/game/mecha/combat/combat.dm @@ -2,7 +2,7 @@ force = 30 var/maxsize = 2 maint_access = 0 - armor = list(melee = 30, bullet = 30, laser = 15, energy = 20, bomb = 20, rad = 0, fire = 100) + armor = list(MELEE = 30, BULLET = 30, LASER = 15, ENERGY = 20, BOMB = 20, RAD = 0, FIRE = 100) destruction_sleep_duration = 4 SECONDS /obj/mecha/combat/moved_inside(mob/living/carbon/human/H as mob) diff --git a/code/game/mecha/combat/durand.dm b/code/game/mecha/combat/durand.dm index b5c587389df..30b12503e2b 100644 --- a/code/game/mecha/combat/durand.dm +++ b/code/game/mecha/combat/durand.dm @@ -7,7 +7,7 @@ dir_in = 1 //Facing North. max_integrity = 400 deflect_chance = 20 - armor = list(melee = 40, bullet = 35, laser = 15, energy = 10, bomb = 20, rad = 50, fire = 100, acid = 75) + armor = list(MELEE = 40, BULLET = 35, LASER = 15, ENERGY = 10, BOMB = 20, RAD = 50, FIRE = 100, ACID = 75) max_temperature = 30000 infra_luminosity = 8 force = 40 @@ -42,7 +42,7 @@ name = "Old Durand" icon_state = "old_durand" initial_icon = "old_durand" - armor = list(melee = 50, bullet = 35, laser = 15, energy = 15, bomb = 20, rad = 50, fire = 100, acid = 100) + armor = list(MELEE = 50, BULLET = 35, LASER = 15, ENERGY = 15, BOMB = 20, RAD = 50, FIRE = 100, ACID = 100) wreckage = /obj/structure/mecha_wreckage/durand/old /obj/mecha/combat/durand/old/examine_more(mob/user) diff --git a/code/game/mecha/combat/gygax.dm b/code/game/mecha/combat/gygax.dm index b4dd6760e50..780983668cb 100644 --- a/code/game/mecha/combat/gygax.dm +++ b/code/game/mecha/combat/gygax.dm @@ -7,7 +7,7 @@ dir_in = 1 //Facing North. max_integrity = 250 deflect_chance = 5 - armor = list(melee = 25, bullet = 20, laser = 30, energy = 15, bomb = 0, rad = 0, fire = 100, acid = 75) + armor = list(MELEE = 25, BULLET = 20, LASER = 30, ENERGY = 15, BOMB = 0, RAD = 0, FIRE = 100, ACID = 75) infra_luminosity = 6 leg_overload_coeff = 2 wreckage = /obj/structure/mecha_wreckage/gygax @@ -47,7 +47,7 @@ initial_icon = "darkgygax" max_integrity = 300 deflect_chance = 20 - armor = list(melee = 40, bullet = 40, laser = 50, energy = 35, bomb = 20, rad =20, fire = 100, acid = 100) + armor = list(MELEE = 40, BULLET = 40, LASER = 50, ENERGY = 35, BOMB = 20, RAD =20, FIRE = 100, ACID = 100) max_temperature = 35000 leg_overload_coeff = 100 operation_req_access = list(ACCESS_SYNDICATE) diff --git a/code/game/mecha/combat/marauder.dm b/code/game/mecha/combat/marauder.dm index 14176514fbc..92e2eb8054a 100644 --- a/code/game/mecha/combat/marauder.dm +++ b/code/game/mecha/combat/marauder.dm @@ -64,7 +64,7 @@ operation_req_access = list(ACCESS_SECURITY) max_integrity = 450 resistance_flags = LAVA_PROOF | FIRE_PROOF - armor = list(melee = 50, bullet = 40, laser = 20, energy = 20, bomb = 20, rad = 60, fire = 100, acid = 75) + armor = list(MELEE = 50, BULLET = 40, LASER = 20, ENERGY = 20, BOMB = 20, RAD = 60, FIRE = 100, ACID = 75) max_temperature = 40000 wreckage = /obj/structure/mecha_wreckage/ares max_equip = 5 diff --git a/code/game/mecha/mecha.dm b/code/game/mecha/mecha.dm index 3a653315ffb..2fe203246db 100644 --- a/code/game/mecha/mecha.dm +++ b/code/game/mecha/mecha.dm @@ -13,7 +13,7 @@ infra_luminosity = 15 //byond implementation is bugged. force = 5 max_integrity = 300 //max_integrity is base health - armor = list(melee = 20, bullet = 10, laser = 0, energy = 0, bomb = 0, rad = 0, fire = 100, acid = 75) + armor = list(MELEE = 20, BULLET = 10, LASER = 0, ENERGY = 0, BOMB = 0, RAD = 0, FIRE = 100, ACID = 75) bubble_icon = "machine" cares_about_temperature = TRUE var/list/facing_modifiers = list(MECHA_FRONT_ARMOUR = 1.5, MECHA_SIDE_ARMOUR = 1, MECHA_BACK_ARMOUR = 0.5) diff --git a/code/game/objects/structures/plasticflaps.dm b/code/game/objects/structures/plasticflaps.dm index 843b38e9ace..cf6f9b19454 100644 --- a/code/game/objects/structures/plasticflaps.dm +++ b/code/game/objects/structures/plasticflaps.dm @@ -5,7 +5,7 @@ icon_state = "plasticflaps" anchored = TRUE layer = 4 - armor = list(melee = 100, bullet = 80, laser = 80, energy = 100, bomb = 50, rad = 100, fire = 50, acid = 50) + armor = list(MELEE = 100, BULLET = 80, LASER = 80, ENERGY = 100, BOMB = 50, RAD = 100, FIRE = 50, ACID = 50) var/state = PLASTIC_FLAPS_NORMAL /obj/structure/plasticflaps/examine(mob/user) diff --git a/code/game/shuttle_engines.dm b/code/game/shuttle_engines.dm index 9f0325ba7f5..c98e687ba09 100644 --- a/code/game/shuttle_engines.dm +++ b/code/game/shuttle_engines.dm @@ -3,7 +3,7 @@ icon = 'icons/turf/shuttle.dmi' resistance_flags = LAVA_PROOF | FIRE_PROOF | ACID_PROOF max_integrity = 500 - armor = list(melee = 100, bullet = 10, laser = 10, energy = 0, bomb = 0, rad = 0, fire = 50, acid = 70) //default + ignores melee + armor = list(MELEE = 100, BULLET = 10, LASER = 10, ENERGY = 0, BOMB = 0, RAD = 0, FIRE = 50, ACID = 70) //default + ignores melee /obj/structure/shuttle/engine name = "engine" diff --git a/code/modules/vehicle/tg_vehicles/cars/clowncar.dm b/code/modules/vehicle/tg_vehicles/cars/clowncar.dm index 98e42b407d2..00ad52d9e51 100644 --- a/code/modules/vehicle/tg_vehicles/cars/clowncar.dm +++ b/code/modules/vehicle/tg_vehicles/cars/clowncar.dm @@ -8,7 +8,7 @@ enter_sound = 'sound/effects/clowncar/door_close.ogg' exit_sound = 'sound/effects/clowncar/door_open.ogg' car_traits = CAN_KIDNAP - armor = list(melee = 70, bullet = 40, laser = 40, energy = 40, bomb = 30, rad = 0, fire = 80, acid = 80) + armor = list(MELEE = 70, BULLET = 40, LASER = 40, ENERGY = 40, BOMB = 30, RAD = 0, FIRE = 80, ACID = 80) enter_delay = 4 SECONDS access_provider_flags = VEHICLE_CONTROL_DRIVE|VEHICLE_CONTROL_KIDNAPPED /// list of headlight colors we use to pick through when we have party mode due to emag