diff --git a/code/datums/spells/mimic.dm b/code/datums/spells/mimic.dm
index 8dcbb947e2e..af1ec3e5b4a 100644
--- a/code/datums/spells/mimic.dm
+++ b/code/datums/spells/mimic.dm
@@ -3,10 +3,9 @@
desc = "Learn a new form to mimic or become one of your known forms"
clothes_req = FALSE
base_cooldown = 3 SECONDS
- action_icon_state = "genetic_morph"
+ action_icon_state = "morph_mimic"
selection_activated_message = "Click on a target to remember it's form. Click on yourself to change form."
create_attack_logs = FALSE
- action_icon_state = "morph_mimic"
/// Which form is currently selected
var/datum/mimic_form/selected_form
/// Which forms the user can become
diff --git a/code/datums/status_effects/buffs.dm b/code/datums/status_effects/buffs.dm
index e476267e04b..880f9eb7a79 100644
--- a/code/datums/status_effects/buffs.dm
+++ b/code/datums/status_effects/buffs.dm
@@ -439,10 +439,9 @@
return
/atom/movable/screen/alert/status_effect/regenerative_core
- name = "Reinforcing Tendrils"
+ name = "Regenerative Core Tendrils"
desc = "You can move faster than your broken body could normally handle!"
icon_state = "regenerative_core"
- name = "Regenerative Core Tendrils"
/datum/status_effect/regenerative_core
id = "Regenerative Core"
diff --git a/code/game/jobs/job/security_jobs.dm b/code/game/jobs/job/security_jobs.dm
index 6bff05890fe..d48c196b07e 100644
--- a/code/game/jobs/job/security_jobs.dm
+++ b/code/game/jobs/job/security_jobs.dm
@@ -127,7 +127,6 @@
selection_color = "#ffeeee"
alt_titles = list("Forensic Technician")
access = list(ACCESS_SECURITY, ACCESS_SEC_DOORS, ACCESS_BRIG, ACCESS_FORENSICS_LOCKERS, ACCESS_MORGUE, ACCESS_MAINT_TUNNELS, ACCESS_COURT, ACCESS_WEAPONS)
- alt_titles = list("Forensic Technician")
minimal_player_age = 14
exp_map = list(EXP_TYPE_CREW = 600)
blacklisted_disabilities = list(DISABILITY_FLAG_BLIND, DISABILITY_FLAG_DEAF, DISABILITY_FLAG_MUTE, DISABILITY_FLAG_DIZZY)
diff --git a/code/game/objects/items/weapons/storage/fancy.dm b/code/game/objects/items/weapons/storage/fancy.dm
index e39ce7e1dd3..8185e2a4a9c 100644
--- a/code/game/objects/items/weapons/storage/fancy.dm
+++ b/code/game/objects/items/weapons/storage/fancy.dm
@@ -43,7 +43,6 @@
icon_state = "donutbox"
storage_slots = 6
can_hold = list(/obj/item/food/snacks/donut)
- icon_type = "donut"
foldable = /obj/item/stack/sheet/cardboard
foldable_amt = 1
diff --git a/code/game/objects/structures/holosigns.dm b/code/game/objects/structures/holosigns.dm
index ef57ac1f836..4e10e0c6265 100644
--- a/code/game/objects/structures/holosigns.dm
+++ b/code/game/objects/structures/holosigns.dm
@@ -79,7 +79,6 @@
density = FALSE
layer = ABOVE_MOB_LAYER
anchored = TRUE
- layer = ABOVE_MOB_LAYER
alpha = 150
flags_2 = RAD_PROTECT_CONTENTS_2 | RAD_NO_CONTAMINATE_2
rad_insulation = RAD_LIGHT_INSULATION
diff --git a/code/game/objects/structures/lavaland/billboard.dm b/code/game/objects/structures/lavaland/billboard.dm
index 571f2899b10..8e3077387dd 100644
--- a/code/game/objects/structures/lavaland/billboard.dm
+++ b/code/game/objects/structures/lavaland/billboard.dm
@@ -11,7 +11,6 @@
armor = list(MELEE = 20, BULLET = 20, LASER = 20, ENERGY = 100, BOMB = 0, RAD = 0, FIRE = 50, ACID = 50)
resistance_flags = LAVA_PROOF | FIRE_PROOF
layer = EDGED_TURF_LAYER
- resistance_flags = FIRE_PROOF
blocks_emissive = FALSE
var/static/list/billboard_overlay = list("chasmland", "incompatible", "feed", "warm", "adventure", "plasmaland", "gate", "gate2", "ufo", "notfriendly", "gps", "service", "protection", "diamonds", "step", "paradise", "hell")
diff --git a/code/game/turfs/space/space_turf.dm b/code/game/turfs/space/space_turf.dm
index a57f48e9886..e40b3382e26 100644
--- a/code/game/turfs/space/space_turf.dm
+++ b/code/game/turfs/space/space_turf.dm
@@ -16,7 +16,6 @@
var/destination_z
var/destination_x
var/destination_y
- plane = PLANE_SPACE
/turf/space/Initialize(mapload)
SHOULD_CALL_PARENT(FALSE)
diff --git a/code/modules/clothing/head/job_hats.dm b/code/modules/clothing/head/job_hats.dm
index 31afd6835b5..973e9ee404e 100644
--- a/code/modules/clothing/head/job_hats.dm
+++ b/code/modules/clothing/head/job_hats.dm
@@ -2,10 +2,9 @@
//Bartender
/obj/item/clothing/head/chefhat
name = "chef's hat"
- desc = "It's a hat used by chefs to keep hair out of your food. Judging by the food in the mess, they don't work."
+ desc = "The commander in chef's head wear."
icon_state = "chef"
item_state = "chef"
- desc = "The commander in chef's head wear."
strip_delay = 10
put_on_delay = 10
dog_fashion = /datum/dog_fashion/head/chef
diff --git a/code/modules/clothing/masks/misc_masks.dm b/code/modules/clothing/masks/misc_masks.dm
index 753bf65070d..2369f6de021 100644
--- a/code/modules/clothing/masks/misc_masks.dm
+++ b/code/modules/clothing/masks/misc_masks.dm
@@ -416,7 +416,6 @@
"Drask" = 'icons/mob/clothing/species/drask/mask.dmi'
)
actions_types = list(/datum/action/item_action/adjust)
- can_toggle = TRUE
/obj/item/clothing/mask/bandana/attack_self(mob/user)
adjustmask(user)
diff --git a/code/modules/clothing/spacesuits/ert_hardsuits.dm b/code/modules/clothing/spacesuits/ert_hardsuits.dm
index 0bcd42feb60..a15900b1e6a 100644
--- a/code/modules/clothing/spacesuits/ert_hardsuits.dm
+++ b/code/modules/clothing/spacesuits/ert_hardsuits.dm
@@ -57,12 +57,11 @@
icon_state = "ert_commander"
item_state = "suit-command"
w_class = WEIGHT_CLASS_NORMAL
- allowed = list(/obj/item/gun,/obj/item/ammo_box,/obj/item/ammo_casing,/obj/item/melee/baton,/obj/item/melee/energy/sword/saber,/obj/item/restraints/handcuffs,/obj/item/tank/internals)
armor = list(MELEE = 40, BULLET = 15, LASER = 20, ENERGY = 5, BOMB = 15, RAD = 50, FIRE = 200, ACID = 200)
allowed = list(/obj/item/flashlight, /obj/item/tank/internals, /obj/item/t_scanner, /obj/item/rcd, /obj/item/crowbar, \
- /obj/item/screwdriver, /obj/item/weldingtool, /obj/item/wirecutters, /obj/item/wrench, /obj/item/multitool, \
- /obj/item/radio, /obj/item/analyzer, /obj/item/gun, /obj/item/melee/baton, /obj/item/reagent_containers/spray/pepper, \
- /obj/item/ammo_box, /obj/item/ammo_casing, /obj/item/restraints/handcuffs)
+ /obj/item/screwdriver, /obj/item/weldingtool, /obj/item/wirecutters, /obj/item/wrench, /obj/item/multitool, \
+ /obj/item/radio, /obj/item/analyzer, /obj/item/gun, /obj/item/melee/baton, /obj/item/reagent_containers/spray/pepper, \
+ /obj/item/ammo_box, /obj/item/ammo_casing, /obj/item/restraints/handcuffs)
helmettype = /obj/item/clothing/head/helmet/space/hardsuit/ert
strip_delay = 130
resistance_flags = FIRE_PROOF
diff --git a/code/modules/clothing/spacesuits/syndi.dm b/code/modules/clothing/spacesuits/syndi.dm
index 3896aca1b32..72045a72e10 100644
--- a/code/modules/clothing/spacesuits/syndi.dm
+++ b/code/modules/clothing/spacesuits/syndi.dm
@@ -1,10 +1,9 @@
//Regular syndicate space suit
/obj/item/clothing/head/helmet/space/syndicate
name = "red space helmet"
- desc = "Top secret Spess Helmet."
+ desc = "Has a tag on it: Totally not property of a hostile corporation, honest!"
icon_state = "syndicate"
item_state = "syndicate"
- desc = "Has a tag on it: Totally not property of a hostile corporation, honest!"
armor = list(MELEE = 35, BULLET = 50, LASER = 20, ENERGY = 10, BOMB = 20, RAD = 20, FIRE = 200, ACID = 285)
sprite_sheets = list(
"Grey" = 'icons/mob/clothing/species/grey/helmet.dmi',
diff --git a/code/modules/clothing/under/costumes.dm b/code/modules/clothing/under/costumes.dm
index d24d0545a05..6593a1c96d6 100644
--- a/code/modules/clothing/under/costumes.dm
+++ b/code/modules/clothing/under/costumes.dm
@@ -173,7 +173,6 @@
name = "tourist outfit"
desc = "A light blue shirt with brown shorts. Feels oddly spooky."
icon_state = "tourist"
- icon_state = "tourist"
item_color = "tourist"
/obj/item/clothing/under/costume/singery
diff --git a/code/modules/hydroponics/grown/nettle.dm b/code/modules/hydroponics/grown/nettle.dm
index 07f9db551e3..d9c4adbd991 100644
--- a/code/modules/hydroponics/grown/nettle.dm
+++ b/code/modules/hydroponics/grown/nettle.dm
@@ -32,10 +32,9 @@
/obj/item/grown/nettle
name = "nettle"
desc = "It's probably not wise to touch it with bare hands..."
- icon = 'icons/obj/items.dmi'
+ icon = 'icons/obj/weapons/melee.dmi'
lefthand_file = 'icons/mob/inhands/weapons_lefthand.dmi'
righthand_file = 'icons/mob/inhands/weapons_righthand.dmi'
- icon = 'icons/obj/weapons/melee.dmi'
icon_state = "nettle"
damtype = "fire"
force = 15
diff --git a/code/modules/mining/equipment/explorer_gear.dm b/code/modules/mining/equipment/explorer_gear.dm
index a8dd6585c65..9eadbe5e2a7 100644
--- a/code/modules/mining/equipment/explorer_gear.dm
+++ b/code/modules/mining/equipment/explorer_gear.dm
@@ -109,7 +109,7 @@
gas_transfer_coefficient = 0.90
permeability_coefficient = 0.50
body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|FEET|ARMS|HANDS
- allowed = list(/obj/item/flashlight,/obj/item/tank/internals/emergency_oxygen,/obj/item/extinguisher)
+ allowed = list(/obj/item/flashlight, /obj/item/tank/internals, /obj/item/resonator, /obj/item/mining_scanner, /obj/item/t_scanner/adv_mining_scanner, /obj/item/gun/energy/kinetic_accelerator, /obj/item/pickaxe)
slowdown = 1
armor = list(MELEE = 10, BULLET = 5, LASER = 10, ENERGY = 5, BOMB = 50, RAD = 10, FIRE = 50, ACID = 50)
flags_inv = HIDEGLOVES|HIDESHOES|HIDEJUMPSUIT|HIDETAIL
@@ -119,7 +119,6 @@
min_cold_protection_temperature = FIRE_SUIT_MIN_TEMP_PROTECT
strip_delay = 60
put_on_delay = 60
- allowed = list(/obj/item/flashlight, /obj/item/tank/internals, /obj/item/resonator, /obj/item/mining_scanner, /obj/item/t_scanner/adv_mining_scanner, /obj/item/gun/energy/kinetic_accelerator, /obj/item/pickaxe)
resistance_flags = FIRE_PROOF
hide_tail_by_species = list("Vox" , "Vulpkanin" , "Unathi" , "Tajaran")
diff --git a/code/modules/mining/lavaland/loot/colossus_loot.dm b/code/modules/mining/lavaland/loot/colossus_loot.dm
index 7c2002d2706..f57453a9e30 100644
--- a/code/modules/mining/lavaland/loot/colossus_loot.dm
+++ b/code/modules/mining/lavaland/loot/colossus_loot.dm
@@ -258,7 +258,7 @@
response_help = "waves away"
response_disarm = "brushes aside"
response_harm = "disrupts"
- speak_emote = list("oscillates")
+ speak_emote = list("warps")
maxHealth = 2
health = 2
harm_intent_damage = 1
@@ -270,14 +270,13 @@
ventcrawler = VENTCRAWLER_ALWAYS
mob_size = MOB_SIZE_TINY
gold_core_spawnable = HOSTILE_SPAWN
- speak_emote = list("warps")
+
damage_coeff = list(BRUTE = 1, BURN = 1, TOX = 0, CLONE = 0, STAMINA = 0, OXY = 0)
luminosity = 4
faction = list("neutral")
universal_understand = TRUE
del_on_death = TRUE
unsuitable_atmos_damage = 0
- flying = TRUE
minbodytemp = 0
maxbodytemp = 1500
environment_smash = 0
diff --git a/code/modules/mob/living/brain/MMI.dm b/code/modules/mob/living/brain/MMI.dm
index 7a0acac7751..cf4d1c2570f 100644
--- a/code/modules/mob/living/brain/MMI.dm
+++ b/code/modules/mob/living/brain/MMI.dm
@@ -5,7 +5,6 @@
icon = 'icons/obj/assemblies.dmi'
icon_state = "mmi_empty"
w_class = WEIGHT_CLASS_NORMAL
- origin_tech = "biotech=3"
origin_tech = "biotech=2;programming=3;engineering=2"
//Revised. Brainmob is now contained directly within object of transfer. MMI in this case.
diff --git a/code/modules/mob/living/carbon/human/human_emote.dm b/code/modules/mob/living/carbon/human/human_emote.dm
index e45949bf0ca..a9a07b72d12 100644
--- a/code/modules/mob/living/carbon/human/human_emote.dm
+++ b/code/modules/mob/living/carbon/human/human_emote.dm
@@ -38,7 +38,6 @@
hands_use_check = TRUE
/datum/emote/living/carbon/human/clap
- key = "clap"
key = "clap"
key_third_person = "claps"
message = "claps."
diff --git a/code/modules/mob/living/living_emote.dm b/code/modules/mob/living/living_emote.dm
index 7b48d8c2142..8185010b6bc 100644
--- a/code/modules/mob/living/living_emote.dm
+++ b/code/modules/mob/living/living_emote.dm
@@ -73,10 +73,9 @@
muzzle_ignore = TRUE // makes sure that sound is played upon death
bypass_unintentional_cooldown = TRUE // again, this absolutely MUST play when a user dies, if it can.
message = "seizes up and falls limp, their eyes dead and lifeless..."
- message_alien = "seizes up and falls limp, their eyes dead and lifeless..."
+ message_alien = "lets out a waning guttural screech, green blood bubbling from its maw..."
message_robot = "shudders violently for a moment before falling still, its eyes slowly darkening."
message_AI = "screeches, its screen flickering as its systems slowly halt."
- message_alien = "lets out a waning guttural screech, green blood bubbling from its maw..."
message_larva = "lets out a sickly hiss of air and falls limply to the floor..."
message_monkey = "lets out a faint chimper as it collapses and stops moving..."
message_simple = "stops moving..."
diff --git a/code/modules/mob/living/simple_animal/hostile/megafauna/bubblegum.dm b/code/modules/mob/living/simple_animal/hostile/megafauna/bubblegum.dm
index 09585012a39..a57e877d5b0 100644
--- a/code/modules/mob/living/simple_animal/hostile/megafauna/bubblegum.dm
+++ b/code/modules/mob/living/simple_animal/hostile/megafauna/bubblegum.dm
@@ -589,7 +589,6 @@ Difficulty: Hard
maxHealth = 1
alpha = 127.5
crusher_loot = null
- loot = null
medal_type = null
score_type = null
deathmessage = "Explodes into a pool of blood!"
diff --git a/code/modules/mob/living/simple_animal/hostile/megafauna/legion.dm b/code/modules/mob/living/simple_animal/hostile/megafauna/legion.dm
index 0b81dff02c9..94e47e3e439 100644
--- a/code/modules/mob/living/simple_animal/hostile/megafauna/legion.dm
+++ b/code/modules/mob/living/simple_animal/hostile/megafauna/legion.dm
@@ -48,7 +48,6 @@ Difficulty: Medium
enraged_loot = /obj/item/disk/fauna_research/legion
vision_range = 13
elimination = TRUE
- appearance_flags = 0
mouse_opacity = MOUSE_OPACITY_ICON
stat_attack = UNCONSCIOUS // Overriden from /tg/ - otherwise Legion starts chasing its minions
appearance_flags = 512
diff --git a/code/modules/mob/living/simple_animal/hostile/mining/basilisk.dm b/code/modules/mob/living/simple_animal/hostile/mining/basilisk.dm
index 9ca58f640a4..6ead2543757 100644
--- a/code/modules/mob/living/simple_animal/hostile/mining/basilisk.dm
+++ b/code/modules/mob/living/simple_animal/hostile/mining/basilisk.dm
@@ -28,7 +28,6 @@
a_intent = INTENT_HARM
speak_emote = list("chitters")
attack_sound = 'sound/weapons/bladeslice.ogg'
- vision_range = 2
aggro_vision_range = 9
turns_per_move = 5
gold_core_spawnable = HOSTILE_SPAWN
diff --git a/code/modules/mob/living/simple_animal/hostile/mining/goliath.dm b/code/modules/mob/living/simple_animal/hostile/mining/goliath.dm
index cd401129be2..2134fcff55b 100644
--- a/code/modules/mob/living/simple_animal/hostile/mining/goliath.dm
+++ b/code/modules/mob/living/simple_animal/hostile/mining/goliath.dm
@@ -15,7 +15,6 @@
ranged_cooldown_time = 120
friendly = "wails at"
speak_emote = list("bellows")
- vision_range = 4
speed = 3
maxHealth = 300
health = 300
diff --git a/code/modules/mob/living/simple_animal/hostile/netherworld.dm b/code/modules/mob/living/simple_animal/hostile/netherworld.dm
index 9d2ddae7a65..c4088eb86fd 100644
--- a/code/modules/mob/living/simple_animal/hostile/netherworld.dm
+++ b/code/modules/mob/living/simple_animal/hostile/netherworld.dm
@@ -11,7 +11,6 @@
melee_damage_upper = 50
attacktext = "chomps"
attack_sound = 'sound/weapons/bladeslice.ogg'
- faction = list("creature")
speak_emote = list("screams")
gold_core_spawnable = HOSTILE_SPAWN
atmos_requirements = list("min_oxy" = 0, "max_oxy" = 0, "min_tox" = 0, "max_tox" = 0, "min_co2" = 0, "max_co2" = 0, "min_n2" = 0, "max_n2" = 0)
diff --git a/code/modules/mob/living/simple_animal/hostile/retaliate/clown.dm b/code/modules/mob/living/simple_animal/hostile/retaliate/clown.dm
index 087261f3959..efd63381926 100644
--- a/code/modules/mob/living/simple_animal/hostile/retaliate/clown.dm
+++ b/code/modules/mob/living/simple_animal/hostile/retaliate/clown.dm
@@ -6,7 +6,6 @@
icon_living = "clown"
icon_dead = "clown_dead"
icon_gib = "clown_gib"
- speak_chance = 0
mob_biotypes = MOB_ORGANIC | MOB_HUMANOID
turns_per_move = 5
response_help = "pokes the"
diff --git a/code/modules/mob/living/simple_animal/shade.dm b/code/modules/mob/living/simple_animal/shade.dm
index 2fecb79c254..ce0294ae6a5 100644
--- a/code/modules/mob/living/simple_animal/shade.dm
+++ b/code/modules/mob/living/simple_animal/shade.dm
@@ -22,7 +22,6 @@
atmos_requirements = list("min_oxy" = 0, "max_oxy" = 0, "min_tox" = 0, "max_tox" = 0, "min_co2" = 0, "max_co2" = 0, "min_n2" = 0, "max_n2" = 0)
speed = -1
stop_automated_movement = TRUE
- status_flags = 0
pull_force = 0
see_invisible = SEE_INVISIBLE_HIDDEN_RUNES
universal_speak = TRUE
diff --git a/code/modules/mob/living/simple_animal/slime/slime_mob.dm b/code/modules/mob/living/simple_animal/slime/slime_mob.dm
index 16e4a8773f9..dcad68cd578 100644
--- a/code/modules/mob/living/simple_animal/slime/slime_mob.dm
+++ b/code/modules/mob/living/simple_animal/slime/slime_mob.dm
@@ -25,7 +25,6 @@
maxHealth = 150
health = 150
healable = FALSE
- gender = NEUTER
see_in_dark = 8
diff --git a/code/modules/mod/mod_control.dm b/code/modules/mod/mod_control.dm
index 22ed38ee01a..94d6d02466c 100644
--- a/code/modules/mod/mod_control.dm
+++ b/code/modules/mod/mod_control.dm
@@ -8,7 +8,6 @@
/obj/item/mod/control
name = "MOD control unit"
desc = "The control unit of a Modular Outerwear Device, a powered suit that protects against various environments."
- icon_state = "standard-control"
icon_state = "mod_control"
item_state = "mod_control"
base_icon_state = "control"
diff --git a/code/modules/mod/modules/modules_antag.dm b/code/modules/mod/modules/modules_antag.dm
index 24d21dda348..8e034ea140b 100644
--- a/code/modules/mod/modules/modules_antag.dm
+++ b/code/modules/mod/modules/modules_antag.dm
@@ -331,7 +331,6 @@
icon_state = "cloak_ninja"
bumpoff = FALSE
stealth_alpha = 10
- cooldown_time = 5 SECONDS
active_power_cost = DEFAULT_CHARGE_DRAIN
use_power_cost = DEFAULT_CHARGE_DRAIN * 5
cooldown_time = 3 SECONDS
diff --git a/code/modules/power/cables/cable_coil.dm b/code/modules/power/cables/cable_coil.dm
index c8f1c6d7c50..74721e9e40a 100644
--- a/code/modules/power/cables/cable_coil.dm
+++ b/code/modules/power/cables/cable_coil.dm
@@ -11,7 +11,7 @@ GLOBAL_LIST_INIT(cable_coil_recipes, list (new/datum/stack_recipe/cable_restrain
singular_name = "cable"
icon = 'icons/obj/power.dmi'
icon_state = "coil"
- item_state = "coil_red"
+ item_state = "coil"
belt_icon = "cable_coil"
amount = MAXCOIL
max_amount = MAXCOIL
@@ -24,7 +24,6 @@ GLOBAL_LIST_INIT(cable_coil_recipes, list (new/datum/stack_recipe/cable_restrain
materials = list(MAT_METAL = 15, MAT_GLASS = 10)
flags = CONDUCT
slot_flags = SLOT_FLAG_BELT
- item_state = "coil"
attack_verb = list("whipped", "lashed", "disciplined", "flogged")
usesound = 'sound/items/deconstruct.ogg'
toolspeed = 1
diff --git a/code/modules/projectiles/projectile/beams.dm b/code/modules/projectiles/projectile/beams.dm
index 214698db282..b8687715762 100644
--- a/code/modules/projectiles/projectile/beams.dm
+++ b/code/modules/projectiles/projectile/beams.dm
@@ -119,7 +119,6 @@
muzzle_type = /obj/effect/projectile/muzzle/pulse
tracer_type = /obj/effect/projectile/tracer/pulse
impact_type = /obj/effect/projectile/impact/pulse
- impact_effect_type = null
hitscan_light_intensity = 3
hitscan_light_range = 0.75
hitscan_light_color_override = LIGHT_COLOR_DARKBLUE
diff --git a/code/modules/reagents/chemistry/reagents/toxins.dm b/code/modules/reagents/chemistry/reagents/toxins.dm
index 212f9095d28..bfc87638d23 100644
--- a/code/modules/reagents/chemistry/reagents/toxins.dm
+++ b/code/modules/reagents/chemistry/reagents/toxins.dm
@@ -473,7 +473,6 @@
drink_name = "Beer glass"
drink_desc = "A freezing pint of beer"
taste_description = "beer"
- taste_description = "piss water"
/datum/reagent/beer2/on_mob_life(mob/living/M)
var/update_flags = STATUS_UPDATE_NONE
diff --git a/code/modules/shuttle/shuttle.dm b/code/modules/shuttle/shuttle.dm
index 1f4a3af6c0b..7a54a505b89 100644
--- a/code/modules/shuttle/shuttle.dm
+++ b/code/modules/shuttle/shuttle.dm
@@ -201,7 +201,6 @@
return 1
/obj/docking_port/mobile
- icon_state = "mobile"
name = "shuttle"
icon_state = "pinonclose"
diff --git a/code/modules/surgery/organs/organ_datums/lung_datum.dm b/code/modules/surgery/organs/organ_datums/lung_datum.dm
index 1aaedb1a3ee..a07866eface 100644
--- a/code/modules/surgery/organs/organ_datums/lung_datum.dm
+++ b/code/modules/surgery/organs/organ_datums/lung_datum.dm
@@ -361,10 +361,6 @@
cold_level_2_threshold = 220
cold_level_3_threshold = 140
- heat_level_1_threshold = 505
- heat_level_2_threshold = 540
- heat_level_3_threshold = 600
-
/datum/organ/lungs/slime
cold_level_1_threshold = 280
cold_level_2_threshold = 240