diff --git a/code/datums/components/storage/concrete/pockets.dm b/code/datums/components/storage/concrete/pockets.dm
index e159d926385..2e576998cff 100644
--- a/code/datums/components/storage/concrete/pockets.dm
+++ b/code/datums/components/storage/concrete/pockets.dm
@@ -12,9 +12,6 @@
else
to_chat(user, "You discreetly slip [I] into [parent].")
-/datum/component/storage/concrete/pockets
- max_w_class = WEIGHT_CLASS_NORMAL
-
/datum/component/storage/concrete/pockets/small
max_items = 1
max_w_class = WEIGHT_CLASS_SMALL
diff --git a/code/datums/mutations/hulk.dm b/code/datums/mutations/hulk.dm
index 899d9f49d38..5ce0f9be734 100644
--- a/code/datums/mutations/hulk.dm
+++ b/code/datums/mutations/hulk.dm
@@ -9,7 +9,6 @@
species_allowed = list("human") //no skeleton/lizard hulk
health_req = 25
instability = 40
- locked = TRUE
/datum/mutation/human/hulk/on_acquiring(mob/living/carbon/human/owner)
if(..())
diff --git a/code/datums/mutations/touch.dm b/code/datums/mutations/touch.dm
index e4efdd40796..7ff96e62a9f 100644
--- a/code/datums/mutations/touch.dm
+++ b/code/datums/mutations/touch.dm
@@ -8,7 +8,6 @@
text_lose_indication = "The energy in your hands subsides."
power = /obj/effect/proc_holder/spell/targeted/touch/shock
instability = 30
- locked = TRUE
/obj/effect/proc_holder/spell/targeted/touch/shock
name = "Shock Touch"
diff --git a/code/datums/shuttles.dm b/code/datums/shuttles.dm
index 9ec5ca09948..f92a2b08d16 100644
--- a/code/datums/shuttles.dm
+++ b/code/datums/shuttles.dm
@@ -108,6 +108,7 @@
/datum/map_template/shuttle/cargo
port_id = "cargo"
name = "Base Shuttle Template (Cargo)"
+ can_be_bought = FALSE
/datum/map_template/shuttle/ferry
port_id = "ferry"
@@ -128,10 +129,6 @@
port_id = "mining_common"
can_be_bought = FALSE
-/datum/map_template/shuttle/cargo
- port_id = "cargo"
- can_be_bought = FALSE
-
/datum/map_template/shuttle/arrival
port_id = "arrival"
can_be_bought = FALSE
@@ -442,10 +439,6 @@
suffix = "whiteship_pod"
name = "Salvage Pod"
-/datum/map_template/shuttle/cargo/box
- suffix = "box"
- name = "supply shuttle (Box)"
-
/datum/map_template/shuttle/cargo/kilo
suffix = "kilo"
name = "supply shuttle (Kilo)"
diff --git a/code/datums/status_effects/buffs.dm b/code/datums/status_effects/buffs.dm
index 82c8485b8aa..67a1ccb39ea 100644
--- a/code/datums/status_effects/buffs.dm
+++ b/code/datums/status_effects/buffs.dm
@@ -560,10 +560,9 @@
SEND_SIGNAL(owner, COMSIG_ADD_MOOD_EVENT, "goodmusic", /datum/mood_event/goodmusic)
/obj/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/area/Space_Station_13_areas.dm b/code/game/area/Space_Station_13_areas.dm
index 2b33bdfb3a6..2fea68f0ff3 100644
--- a/code/game/area/Space_Station_13_areas.dm
+++ b/code/game/area/Space_Station_13_areas.dm
@@ -985,9 +985,8 @@ NOTE: there are two lists of areas in the end of this file: centcom and station
// Vacant Rooms
/area/vacant_room
name = "Vacant Room"
- icon_state = "yellow"
- ambientsounds = MAINTENANCE
icon_state = "vacant_room"
+ ambientsounds = MAINTENANCE
/area/vacant_room/office
name = "Vacant Office"
diff --git a/code/game/mecha/working/ripley.dm b/code/game/mecha/working/ripley.dm
index b345ecd291c..6501c039e69 100644
--- a/code/game/mecha/working/ripley.dm
+++ b/code/game/mecha/working/ripley.dm
@@ -111,10 +111,8 @@
name = "\improper DEATH-RIPLEY"
icon_state = "deathripley"
fast_pressure_step_in = 2 //step_in while in low pressure conditions
- slow_pressure_step_in = 4 //step_in while in normal pressure conditions
+ slow_pressure_step_in = 3 //step_in while in normal pressure conditions
step_in = 4
- slow_pressure_step_in = 3
- opacity=0
lights_power = 7
wreckage = /obj/structure/mecha_wreckage/ripley/deathripley
step_energy_drain = 0
diff --git a/code/game/objects/effects/decals/cleanable/humans.dm b/code/game/objects/effects/decals/cleanable/humans.dm
index c82f7c8f73d..92aa0f0e20b 100644
--- a/code/game/objects/effects/decals/cleanable/humans.dm
+++ b/code/game/objects/effects/decals/cleanable/humans.dm
@@ -33,7 +33,6 @@
/obj/effect/decal/cleanable/blood/tracks
icon_state = "tracks"
desc = "They look like tracks left by wheels."
- icon_state = "tracks"
random_icon_states = null
beauty = -50
diff --git a/code/game/objects/effects/decals/turfdecal/tilecoloring.dm b/code/game/objects/effects/decals/turfdecal/tilecoloring.dm
index 66e03c6420e..7b5b4d9b4eb 100644
--- a/code/game/objects/effects/decals/turfdecal/tilecoloring.dm
+++ b/code/game/objects/effects/decals/turfdecal/tilecoloring.dm
@@ -234,5 +234,5 @@
/obj/effect/turf_decal/trimline/neutral/filled/corner
icon_state = "trimline_corner_fill"
-/obj/effect/turf_decal/trimline/brown/filled/end
+/obj/effect/turf_decal/trimline/neutral/filled/end
icon_state = "trimline_end_fill"
diff --git a/code/game/objects/items/circuitboards/machine_circuitboards.dm b/code/game/objects/items/circuitboards/machine_circuitboards.dm
index 847d280166c..90e05360f4a 100644
--- a/code/game/objects/items/circuitboards/machine_circuitboards.dm
+++ b/code/game/objects/items/circuitboards/machine_circuitboards.dm
@@ -414,20 +414,6 @@
/obj/item/stock_parts/manipulator = 2,
/obj/item/reagent_containers/glass/beaker = 2)
-/obj/item/circuitboard/machine/protolathe
- name = "Protolathe (Machine Board)"
- icon_state = "generic"
- build_path = /obj/machinery/rnd/production/protolathe
- req_components = list(
- /obj/item/stock_parts/matter_bin = 2,
- /obj/item/stock_parts/manipulator = 2,
- /obj/item/reagent_containers/glass/beaker = 2)
-
-/obj/item/circuitboard/machine/protolathe/department
- name = "Departmental Protolathe (Machine Board)"
- icon_state = "generic"
- build_path = /obj/machinery/rnd/production/protolathe/department
-
/obj/item/circuitboard/machine/protolathe/department
name = "Departmental Protolathe (Machine Board)"
icon_state = "generic"
diff --git a/code/game/objects/items/crab17.dm b/code/game/objects/items/crab17.dm
index a20b83e8d68..6cb0a22b5d4 100644
--- a/code/game/objects/items/crab17.dm
+++ b/code/game/objects/items/crab17.dm
@@ -28,11 +28,10 @@
desc = "This is good for spacecoin because"
icon = 'icons/obj/money_machine.dmi'
icon_state = "bogdanoff"
- layer = TABLE_LAYER //So that the crate inside doesn't appear underneath
+ layer = LARGE_MOB_LAYER
armor = list("melee" = 80, "bullet" = 30, "laser" = 30, "energy" = 60, "bomb" = 90, "bio" = 0, "rad" = 0, "fire" = 100, "acid" = 80)
density = TRUE
pixel_z = -8
- layer = LARGE_MOB_LAYER
max_integrity = 5000
var/list/accounts_to_rob
var/mob/living/carbon/human/bogdanoff
diff --git a/code/game/objects/items/plushes.dm b/code/game/objects/items/plushes.dm
index 9f70c98e223..15a91627886 100644
--- a/code/game/objects/items/plushes.dm
+++ b/code/game/objects/items/plushes.dm
@@ -523,7 +523,6 @@
attack_verb = list("blorbled", "slimed", "absorbed")
squeak_override = list('sound/effects/blobattack.ogg' = 1)
gender = FEMALE //given all the jokes and drawings, I'm not sure the xenobiologists would make a slimeboy
- squeak_override = list('sound/effects/blobattack.ogg' = 1)
/obj/item/toy/plush/awakenedplushie
name = "awakened plushie"
diff --git a/code/game/objects/items/pneumaticCannon.dm b/code/game/objects/items/pneumaticCannon.dm
index bbbc6e6f12f..4edc966daf3 100644
--- a/code/game/objects/items/pneumaticCannon.dm
+++ b/code/game/objects/items/pneumaticCannon.dm
@@ -233,9 +233,8 @@
name = "improvised pneumatic cannon"
desc = "A gas-powered, object-firing cannon made out of common parts."
force = 5
- maxWeightClass = 7
- gasPerThrow = 5
maxWeightClass = 10
+ gasPerThrow = 5
/obj/item/pneumatic_cannon/proc/updateTank(obj/item/tank/internals/thetank, removing = 0, mob/living/carbon/human/user)
if(removing)
diff --git a/code/game/objects/items/stacks/sheets/leather.dm b/code/game/objects/items/stacks/sheets/leather.dm
index 2df757b75f4..5ba57e26ff3 100644
--- a/code/game/objects/items/stacks/sheets/leather.dm
+++ b/code/game/objects/items/stacks/sheets/leather.dm
@@ -69,7 +69,7 @@ GLOBAL_LIST_INIT(corgi_recipes, list ( \
desc = "The by-product of monkey farming."
singular_name = "monkey hide piece"
icon_state = "sheet-monkey"
- icon_state = "sheet-monkey"
+ item_state = "sheet-monkey"
GLOBAL_LIST_INIT(monkey_recipes, list ( \
new/datum/stack_recipe("monkey mask", /obj/item/clothing/mask/gas/monkeymask, 1), \
diff --git a/code/game/objects/items/stacks/sheets/sheet_types.dm b/code/game/objects/items/stacks/sheets/sheet_types.dm
index 6dee7411852..4c1ddf5c442 100644
--- a/code/game/objects/items/stacks/sheets/sheet_types.dm
+++ b/code/game/objects/items/stacks/sheets/sheet_types.dm
@@ -693,7 +693,6 @@ new /datum/stack_recipe("paper frame door", /obj/structure/mineral_door/paperfra
item_state = "sheet-paper"
merge_type = /obj/item/stack/sheet/paperframes
resistance_flags = FLAMMABLE
- merge_type = /obj/item/stack/sheet/paperframes
/obj/item/stack/sheet/paperframes/get_main_recipes()
. = ..()
diff --git a/code/game/objects/items/storage/backpack.dm b/code/game/objects/items/storage/backpack.dm
index 105da615fb2..dd51ba5d1e1 100644
--- a/code/game/objects/items/storage/backpack.dm
+++ b/code/game/objects/items/storage/backpack.dm
@@ -542,15 +542,6 @@
new /obj/item/ammo_box/magazine/m12g(src)
new /obj/item/clothing/glasses/thermal/syndi(src)
-/obj/item/storage/backpack/duffelbag/syndie/med/medicalbundle
- desc = "A large duffel bag containing a tactical medkit, a Donksoft machine gun, a big jumbo box of riot darts, and a knock-off pair of magboots."
-
-/obj/item/storage/backpack/duffelbag/syndie/med/medicalbundle/PopulateContents()
- new /obj/item/clothing/shoes/magboots/syndie(src)
- new /obj/item/storage/firstaid/tactical(src)
- new /obj/item/gun/ballistic/automatic/l6_saw/toy(src)
- new /obj/item/ammo_box/foambox/riot(src)
-
/obj/item/storage/backpack/duffelbag/syndie/med/medicalbundle
desc = "A large duffel bag containing a medical equipment, a Donksoft LMG, a big jumbo box of riot darts, and a knock-off pair of magboots."
diff --git a/code/game/objects/items/storage/toolbox.dm b/code/game/objects/items/storage/toolbox.dm
index 57f1dc06939..96ee11af9fb 100644
--- a/code/game/objects/items/storage/toolbox.dm
+++ b/code/game/objects/items/storage/toolbox.dm
@@ -16,7 +16,6 @@
hitsound = 'sound/weapons/smash.ogg'
drop_sound = 'sound/items/handling/toolbox_drop.ogg'
pickup_sound = 'sound/items/handling/toolbox_pickup.ogg'
- custom_materials = list(/datum/material/iron = 500) //Toolboxes by default use iron as their core, custom material.
material_flags = MATERIAL_COLOR
var/latches = "single_latch"
var/has_latches = TRUE
diff --git a/code/game/objects/structures/crates_lockers/closets/cardboardbox.dm b/code/game/objects/structures/crates_lockers/closets/cardboardbox.dm
index 2f9ff4692c7..3e69977f367 100644
--- a/code/game/objects/structures/crates_lockers/closets/cardboardbox.dm
+++ b/code/game/objects/structures/crates_lockers/closets/cardboardbox.dm
@@ -9,7 +9,6 @@
integrity_failure = 0
can_weld_shut = 0
cutting_tool = /obj/item/wirecutters
- open_sound = "rustle"
material_drop = /obj/item/stack/sheet/cardboard
delivery_icon = "deliverybox"
anchorable = FALSE
diff --git a/code/game/objects/structures/flora.dm b/code/game/objects/structures/flora.dm
index 547a6de518c..ef189e01ae8 100644
--- a/code/game/objects/structures/flora.dm
+++ b/code/game/objects/structures/flora.dm
@@ -393,9 +393,8 @@
//Jungle rocks
/obj/structure/flora/rock/jungle
- icon_state = "pile of rocks"
- desc = "A pile of rocks."
icon_state = "rock"
+ desc = "A pile of rocks."
icon = 'icons/obj/flora/jungleflora.dmi'
density = FALSE
diff --git a/code/modules/atmospherics/machinery/portable/canister.dm b/code/modules/atmospherics/machinery/portable/canister.dm
index 7e960da6357..5bf612cdb69 100644
--- a/code/modules/atmospherics/machinery/portable/canister.dm
+++ b/code/modules/atmospherics/machinery/portable/canister.dm
@@ -169,7 +169,6 @@
name = "prototype canister"
desc = "The best way to fix an atmospheric emergency... or the best way to introduce one."
icon_state = "proto"
- icon_state = "proto"
volume = 5000
max_integrity = 300
temperature_resistance = 2000 + T0C
diff --git a/code/modules/clothing/head/collectable.dm b/code/modules/clothing/head/collectable.dm
index 5457d32e8ab..29a63c4260e 100644
--- a/code/modules/clothing/head/collectable.dm
+++ b/code/modules/clothing/head/collectable.dm
@@ -10,13 +10,6 @@
desc = "It smells faintly of plasma."
icon_state = "petehat"
-/obj/item/clothing/head/collectable/slime
- name = "collectable slime cap!"
- desc = "It just latches right in place!"
- clothing_flags = SNUG_FIT
- icon_state = "slime"
- dynamic_hair_suffix = ""
-
/obj/item/clothing/head/collectable/xenom
name = "collectable xenomorph helmet!"
desc = "Hiss hiss hiss!"
@@ -81,6 +74,7 @@
icon_state = "headslime"
item_state = "headslime"
clothing_flags = SNUG_FIT
+ dynamic_hair_suffix = ""
/obj/item/clothing/head/collectable/flatcap
name = "collectable flat cap"
diff --git a/code/modules/clothing/head/helmet.dm b/code/modules/clothing/head/helmet.dm
index b142b2ff633..95f430deb8c 100644
--- a/code/modules/clothing/head/helmet.dm
+++ b/code/modules/clothing/head/helmet.dm
@@ -4,7 +4,6 @@
icon_state = "helmet"
item_state = "helmet"
armor = list("melee" = 35, "bullet" = 30, "laser" = 30,"energy" = 10, "bomb" = 25, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 50)
- flags_inv = HIDEEARS
cold_protection = HEAD
min_cold_protection_temperature = HELMET_MIN_TEMP_PROTECT
heat_protection = HEAD
diff --git a/code/modules/clothing/head/misc.dm b/code/modules/clothing/head/misc.dm
index 1bfcad82178..321adf07e3e 100644
--- a/code/modules/clothing/head/misc.dm
+++ b/code/modules/clothing/head/misc.dm
@@ -119,14 +119,6 @@
dog_fashion = /datum/dog_fashion/head/rabbit
-
-/obj/item/clothing/head/flatcap
- name = "flat cap"
- desc = "A working man's cap."
- icon_state = "flat_cap"
- item_state = "detective"
-
-
/obj/item/clothing/head/pirate
name = "pirate hat"
desc = "Yarr."
@@ -356,7 +348,7 @@
name = "pharaoh hat"
desc = "Walk like an Egyptian."
icon_state = "pharoah_hat"
- icon_state = "pharoah_hat"
+ item_state = "pharoah_hat"
/obj/item/clothing/head/jester/alt
name = "jester hat"
diff --git a/code/modules/clothing/shoes/colour.dm b/code/modules/clothing/shoes/colour.dm
index e91f393d4e7..f6a6c14ce1a 100644
--- a/code/modules/clothing/shoes/colour.dm
+++ b/code/modules/clothing/shoes/colour.dm
@@ -33,10 +33,6 @@
name = "purple shoes"
icon_state = "purple"
-/obj/item/clothing/shoes/sneakers/brown
- name = "brown shoes"
- icon_state = "brown"
-
/obj/item/clothing/shoes/sneakers/red
name = "red shoes"
desc = "Stylish red shoes."
diff --git a/code/modules/clothing/shoes/miscellaneous.dm b/code/modules/clothing/shoes/miscellaneous.dm
index 5024eec68d6..47aeeabe97e 100644
--- a/code/modules/clothing/shoes/miscellaneous.dm
+++ b/code/modules/clothing/shoes/miscellaneous.dm
@@ -29,10 +29,9 @@
desc = "A pair of rather plain wooden sandals."
name = "sandals"
icon_state = "wizard"
- strip_delay = 50
+ strip_delay = 5
equip_delay_other = 50
permeability_coefficient = 0.9
- strip_delay = 5
/obj/item/clothing/shoes/sandal/marisa
desc = "A pair of magic black shoes."
diff --git a/code/modules/clothing/suits/miscellaneous.dm b/code/modules/clothing/suits/miscellaneous.dm
index 289b01bb7d5..6789f20ecf9 100644
--- a/code/modules/clothing/suits/miscellaneous.dm
+++ b/code/modules/clothing/suits/miscellaneous.dm
@@ -478,7 +478,7 @@
name = "pharoah tunic"
desc = "Lavish space tomb not included."
icon_state = "pharoah"
- icon_state = "pharoah"
+ item_state = "pharoah"
body_parts_covered = CHEST|GROIN
/obj/item/clothing/suit/caution
diff --git a/code/modules/clothing/under/costume.dm b/code/modules/clothing/under/costume.dm
index 9d32cb9bbb0..0d129833fda 100644
--- a/code/modules/clothing/under/costume.dm
+++ b/code/modules/clothing/under/costume.dm
@@ -249,6 +249,5 @@
alt_covers_chest = TRUE
armor = list("melee" = 10, "bullet" = 0, "laser" = 0,"energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 30, "acid" = 30)
strip_delay = 50
- alt_covers_chest = TRUE
sensor_mode = SENSOR_COORDS
random_sensor = FALSE
diff --git a/code/modules/holodeck/turfs.dm b/code/modules/holodeck/turfs.dm
index 6827f649e4c..3b9351a153e 100644
--- a/code/modules/holodeck/turfs.dm
+++ b/code/modules/holodeck/turfs.dm
@@ -54,8 +54,9 @@
bullet_sizzle = TRUE
/turf/open/floor/holofloor/asteroid
- name = "asteroid"
- icon_state = "asteroid0"
+ gender = PLURAL
+ name = "asteroid sand"
+ icon_state = "asteroid"
tiled_dirt = FALSE
/turf/open/floor/holofloor/asteroid/Initialize()
@@ -136,10 +137,3 @@
/turf/open/floor/holofloor/snow/cold
initial_gas_mix = "nob=7500;TEMP=2.7"
-
-/turf/open/floor/holofloor/asteroid
- gender = PLURAL
- name = "asteroid sand"
- icon = 'icons/turf/floors.dmi'
- icon_state = "asteroid"
- tiled_dirt = FALSE
diff --git a/code/modules/library/soapstone.dm b/code/modules/library/soapstone.dm
index 7de4c114fed..3f9f33e2fc0 100644
--- a/code/modules/library/soapstone.dm
+++ b/code/modules/library/soapstone.dm
@@ -112,11 +112,10 @@
desc = "A message from a past traveler."
icon = 'icons/obj/stationobjs.dmi'
icon_state = "soapstone_message"
- layer = HIGH_OBJ_LAYER
+ layer = LATTICE_LAYER
density = FALSE
anchored = TRUE
max_integrity = 30
- layer = LATTICE_LAYER
var/hidden_message
var/creator_key
diff --git a/code/modules/mining/ores_coins.dm b/code/modules/mining/ores_coins.dm
index f418f6268d0..dcce5db48a8 100644
--- a/code/modules/mining/ores_coins.dm
+++ b/code/modules/mining/ores_coins.dm
@@ -123,7 +123,7 @@ GLOBAL_LIST_INIT(sand_recipes, list(\
/obj/item/stack/ore/glass/basalt
name = "volcanic ash"
icon_state = "volcanic_sand"
- icon_state = "volcanic_sand"
+ item_state = "volcanic_sand"
singular_name = "volcanic ash pile"
/obj/item/stack/ore/plasma
@@ -152,7 +152,7 @@ GLOBAL_LIST_INIT(sand_recipes, list(\
/obj/item/stack/ore/gold
name = "gold ore"
icon_state = "Gold ore"
- icon_state = "Gold ore"
+ item_state = "Gold ore"
singular_name = "gold ore chunk"
points = 18
custom_materials = list(/datum/material/gold=MINERAL_MATERIAL_AMOUNT)
diff --git a/code/modules/mob/dead/new_player/sprite_accessories.dm b/code/modules/mob/dead/new_player/sprite_accessories.dm
index fa3cf66727f..0783f4766eb 100644
--- a/code/modules/mob/dead/new_player/sprite_accessories.dm
+++ b/code/modules/mob/dead/new_player/sprite_accessories.dm
@@ -207,14 +207,6 @@
name = "Bun (Tight)"
icon_state = "hair_tightbun"
-/datum/sprite_accessory/hair/bun2
- name = "Bun Head 2"
- icon_state = "hair_bunhead2"
-
-/datum/sprite_accessory/hair/bun3
- name = "Bun Head 3"
- icon_state = "hair_bun3"
-
/datum/sprite_accessory/hair/business
name = "Business Hair"
icon_state = "hair_business"
diff --git a/code/modules/mob/living/silicon/robot/emote.dm b/code/modules/mob/living/silicon/robot/emote.dm
index a385fb9e2b8..cf7d1699486 100644
--- a/code/modules/mob/living/silicon/robot/emote.dm
+++ b/code/modules/mob/living/silicon/robot/emote.dm
@@ -39,12 +39,6 @@
message_param = "pings at %t."
sound = 'sound/machines/ping.ogg'
-/datum/emote/silicon/chime
- key = "chime"
- key_third_person = "chimes"
- message = "chimes."
- sound = 'sound/machines/chime.ogg'
-
/datum/emote/silicon/sad
key = "sad"
message = "plays a sad trombone..."
diff --git a/code/modules/mob/living/simple_animal/friendly/penguin.dm b/code/modules/mob/living/simple_animal/friendly/penguin.dm
index c6f05cfd611..ba7789fa74b 100644
--- a/code/modules/mob/living/simple_animal/friendly/penguin.dm
+++ b/code/modules/mob/living/simple_animal/friendly/penguin.dm
@@ -32,7 +32,6 @@
icon_state = "penguin"
icon_living = "penguin"
icon_dead = "penguin_dead"
- butcher_results = list()
gold_core_spawnable = FRIENDLY_SPAWN
butcher_results = list(/obj/item/organ/ears/penguin = 1, /obj/item/reagent_containers/food/snacks/meat/slab/penguin = 3)
diff --git a/code/modules/mob/living/simple_animal/hostile/giant_spider.dm b/code/modules/mob/living/simple_animal/hostile/giant_spider.dm
index 8b7958528a5..26c58d06410 100644
--- a/code/modules/mob/living/simple_animal/hostile/giant_spider.dm
+++ b/code/modules/mob/living/simple_animal/hostile/giant_spider.dm
@@ -27,7 +27,7 @@
emote_hear = list("chitters")
speak_chance = 5
turns_per_move = 5
- see_in_dark = 10
+ see_in_dark = 4
butcher_results = list(/obj/item/reagent_containers/food/snacks/meat/slab/spider = 2, /obj/item/reagent_containers/food/snacks/spiderleg = 8)
response_help_continuous = "pets"
response_help_simple = "pet"
@@ -48,7 +48,6 @@
attack_sound = 'sound/weapons/bite.ogg'
unique_name = 1
gold_core_spawnable = HOSTILE_SPAWN
- see_in_dark = 4
lighting_alpha = LIGHTING_PLANE_ALPHA_MOSTLY_VISIBLE
var/playable_spider = FALSE
var/datum/action/innate/spider/lay_web/lay_web
diff --git a/code/modules/mob/living/simple_animal/hostile/gorilla/gorilla.dm b/code/modules/mob/living/simple_animal/hostile/gorilla/gorilla.dm
index 72c69123a86..9895fd105a2 100644
--- a/code/modules/mob/living/simple_animal/hostile/gorilla/gorilla.dm
+++ b/code/modules/mob/living/simple_animal/hostile/gorilla/gorilla.dm
@@ -6,7 +6,6 @@
desc = "A ground-dwelling, predominantly herbivorous ape that inhabits the forests of central Africa."
icon = 'icons/mob/gorilla.dmi'
icon_state = "crawling"
- icon_state = "crawling"
icon_living = "crawling"
icon_dead = "dead"
mob_biotypes = MOB_ORGANIC|MOB_HUMANOID
diff --git a/code/modules/mob/living/simple_animal/hostile/megafauna/colossus.dm b/code/modules/mob/living/simple_animal/hostile/megafauna/colossus.dm
index a93bd04182a..e51da845960 100644
--- a/code/modules/mob/living/simple_animal/hostile/megafauna/colossus.dm
+++ b/code/modules/mob/living/simple_animal/hostile/megafauna/colossus.dm
@@ -660,7 +660,6 @@ Difficulty: Very Hard
faction = list("neutral")
del_on_death = TRUE
unsuitable_atmos_damage = 0
- movement_type = FLYING
minbodytemp = 0
maxbodytemp = 1500
obj_damage = 0
diff --git a/code/modules/mob/living/simple_animal/hostile/mining_mobs/basilisk.dm b/code/modules/mob/living/simple_animal/hostile/mining_mobs/basilisk.dm
index 8ddb871fc47..cc9e967ffe3 100644
--- a/code/modules/mob/living/simple_animal/hostile/mining_mobs/basilisk.dm
+++ b/code/modules/mob/living/simple_animal/hostile/mining_mobs/basilisk.dm
@@ -29,7 +29,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_mobs/goliath.dm b/code/modules/mob/living/simple_animal/hostile/mining_mobs/goliath.dm
index 735b33a48d9..b9505be7471 100644
--- a/code/modules/mob/living/simple_animal/hostile/mining_mobs/goliath.dm
+++ b/code/modules/mob/living/simple_animal/hostile/mining_mobs/goliath.dm
@@ -16,7 +16,6 @@
friendly_verb_continuous = "wails at"
friendly_verb_simple = "wail 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 5d4299d8730..1b61fd27196 100644
--- a/code/modules/mob/living/simple_animal/hostile/netherworld.dm
+++ b/code/modules/mob/living/simple_animal/hostile/netherworld.dm
@@ -12,12 +12,11 @@
attack_verb_continuous = "slashes"
attack_verb_simple = "slash"
attack_sound = 'sound/weapons/bladeslice.ogg'
- faction = list("creature")
+ faction = list("nether")
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)
minbodytemp = 0
- faction = list("nether")
/mob/living/simple_animal/hostile/netherworld/migo
name = "mi-go"
diff --git a/code/modules/mob/living/simple_animal/hostile/tree.dm b/code/modules/mob/living/simple_animal/hostile/tree.dm
index 0dd6f114bc1..98766b5a089 100644
--- a/code/modules/mob/living/simple_animal/hostile/tree.dm
+++ b/code/modules/mob/living/simple_animal/hostile/tree.dm
@@ -13,7 +13,7 @@
response_help_simple = "brush"
response_disarm_continuous = "pushes"
response_disarm_simple = "push"
- faction = list("plants")
+ faction = list("hostile")
speed = 1
maxHealth = 250
health = 250
@@ -36,7 +36,6 @@
minbodytemp = 0
maxbodytemp = 1200
- faction = list("hostile")
deathmessage = "is hacked into pieces!"
loot = list(/obj/item/stack/sheet/mineral/wood)
gold_core_spawnable = HOSTILE_SPAWN
diff --git a/code/modules/mob/living/simple_animal/hostile/wumborian_fugu.dm b/code/modules/mob/living/simple_animal/hostile/wumborian_fugu.dm
index d553edea391..dc7ee7445a8 100644
--- a/code/modules/mob/living/simple_animal/hostile/wumborian_fugu.dm
+++ b/code/modules/mob/living/simple_animal/hostile/wumborian_fugu.dm
@@ -27,7 +27,6 @@
attack_verb_simple = "chomp"
attack_sound = 'sound/weapons/punch1.ogg'
throw_message = "is avoided by the"
- vision_range = 5
aggro_vision_range = 9
mob_size = MOB_SIZE_SMALL
environment_smash = ENVIRONMENT_SMASH_NONE
diff --git a/code/modules/mob/living/simple_animal/shade.dm b/code/modules/mob/living/simple_animal/shade.dm
index 16df7cc2feb..a3795de4cec 100644
--- a/code/modules/mob/living/simple_animal/shade.dm
+++ b/code/modules/mob/living/simple_animal/shade.dm
@@ -28,7 +28,6 @@
maxbodytemp = INFINITY
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)
stop_automated_movement = 1
- status_flags = 0
faction = list("cult")
status_flags = CANPUSH
movement_type = FLYING
diff --git a/code/modules/mob/living/simple_animal/slime/slime.dm b/code/modules/mob/living/simple_animal/slime/slime.dm
index bac694c7ded..ac8350da0cc 100644
--- a/code/modules/mob/living/simple_animal/slime/slime.dm
+++ b/code/modules/mob/living/simple_animal/slime/slime.dm
@@ -28,7 +28,6 @@
maxHealth = 150
health = 150
healable = 0
- gender = NEUTER
see_in_dark = 8
diff --git a/code/modules/ninja/energy_katana.dm b/code/modules/ninja/energy_katana.dm
index 092f078efa1..9a95b97ddb6 100644
--- a/code/modules/ninja/energy_katana.dm
+++ b/code/modules/ninja/energy_katana.dm
@@ -12,7 +12,6 @@
w_class = WEIGHT_CLASS_NORMAL
hitsound = 'sound/weapons/bladeslice.ogg'
attack_verb = list("attacked", "slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut")
- block_chance = 50
slot_flags = ITEM_SLOT_BACK|ITEM_SLOT_BELT
sharpness = IS_SHARP
max_integrity = 200
diff --git a/code/modules/projectiles/guns/ballistic/rifle.dm b/code/modules/projectiles/guns/ballistic/rifle.dm
index 19ef904ab44..43c93b8a166 100644
--- a/code/modules/projectiles/guns/ballistic/rifle.dm
+++ b/code/modules/projectiles/guns/ballistic/rifle.dm
@@ -2,7 +2,7 @@
name = "Bolt Rifle"
desc = "Some kind of bolt action rifle. You get the feeling you shouldn't have this."
icon_state = "moistnugget"
- icon_state = "moistnugget"
+ item_state = "moistnugget"
mag_type = /obj/item/ammo_box/magazine/internal/boltaction
bolt_wording = "bolt"
bolt_type = BOLT_TYPE_STANDARD
diff --git a/code/modules/projectiles/guns/magic.dm b/code/modules/projectiles/guns/magic.dm
index 7d02c431fc6..e027914545d 100644
--- a/code/modules/projectiles/guns/magic.dm
+++ b/code/modules/projectiles/guns/magic.dm
@@ -4,8 +4,8 @@
icon = 'icons/obj/guns/magic.dmi'
icon_state = "staffofnothing"
item_state = "staff"
- lefthand_file = 'icons/mob/inhands/weapons/staves_lefthand.dmi'
- righthand_file = 'icons/mob/inhands/weapons/staves_righthand.dmi'
+ lefthand_file = 'icons/mob/inhands/items_lefthand.dmi' //not really a gun and some toys use these inhands
+ righthand_file = 'icons/mob/inhands/items_righthand.dmi'
fire_sound = 'sound/weapons/emitter.ogg'
flags_1 = CONDUCT_1
w_class = WEIGHT_CLASS_HUGE
@@ -21,9 +21,6 @@
trigger_guard = TRIGGER_GUARD_ALLOW_ALL // Has no trigger at all, uses magic instead
pin = /obj/item/firing_pin/magic
- lefthand_file = 'icons/mob/inhands/items_lefthand.dmi' //not really a gun and some toys use these inhands
- righthand_file = 'icons/mob/inhands/items_righthand.dmi'
-
/obj/item/gun/magic/process_fire(atom/target, mob/living/user, message, params, zone_override, bonus_spread)
if(no_den_usage)
var/area/A = get_area(user)
diff --git a/code/modules/projectiles/projectile/bullets/sniper.dm b/code/modules/projectiles/projectile/bullets/sniper.dm
index cb6e4ad5c13..eab5e0f06cc 100644
--- a/code/modules/projectiles/projectile/bullets/sniper.dm
+++ b/code/modules/projectiles/projectile/bullets/sniper.dm
@@ -30,9 +30,8 @@
return ..()
/obj/projectile/bullet/p50/penetrator
- name =".50 penetrator bullet"
- icon_state = "gauss"
name = "penetrator round"
+ icon_state = "gauss"
damage = 60
movement_type = FLYING | UNSTOPPABLE
dismemberment = 0 //It goes through you cleanly.
diff --git a/code/modules/reagents/reagent_containers/bottle.dm b/code/modules/reagents/reagent_containers/bottle.dm
index 6c16a5d2cba..763261d2d02 100644
--- a/code/modules/reagents/reagent_containers/bottle.dm
+++ b/code/modules/reagents/reagent_containers/bottle.dm
@@ -72,11 +72,6 @@
desc = "A small bottle of synaptizine."
list_reagents = list(/datum/reagent/medicine/synaptizine = 30)
-/obj/item/reagent_containers/glass/bottle/formaldehyde
- name = "formaldehyde bottle"
- desc = "A small bottle of formaldehyde."
- list_reagents = list(/datum/reagent/toxin/formaldehyde = 30)
-
/obj/item/reagent_containers/glass/bottle/ammonia
name = "ammonia bottle"
desc = "A small bottle of ammonia."
diff --git a/code/modules/research/designs/telecomms_designs.dm b/code/modules/research/designs/telecomms_designs.dm
index eb4b404db4d..18c7b4a9caf 100644
--- a/code/modules/research/designs/telecomms_designs.dm
+++ b/code/modules/research/designs/telecomms_designs.dm
@@ -49,7 +49,6 @@
build_path = /obj/item/circuitboard/machine/telecomms/server
category = list("Subspace Telecomms")
departmental_flags = DEPARTMENTAL_FLAG_ENGINEERING | DEPARTMENTAL_FLAG_SCIENCE
- departmental_flags = DEPARTMENTAL_FLAG_ENGINEERING | DEPARTMENTAL_FLAG_SCIENCE
/datum/design/board/telecomms_messaging
name = "Machine Design (Messaging Server)"
diff --git a/code/modules/research/xenobiology/crossbreeding/_status_effects.dm b/code/modules/research/xenobiology/crossbreeding/_status_effects.dm
index 189f7ac976b..8cfda0bf7e4 100644
--- a/code/modules/research/xenobiology/crossbreeding/_status_effects.dm
+++ b/code/modules/research/xenobiology/crossbreeding/_status_effects.dm
@@ -195,11 +195,6 @@
/datum/status_effect/bloodchill/on_remove()
owner.remove_movespeed_modifier("bloodchilled")
-/obj/screen/alert/status_effect/bloodchill
- name = "Bloodchilled"
- desc = "You feel a shiver down your spine after getting hit with a glob of cold blood. You'll move slower and get frostbite for a while!"
- icon_state = "bloodchill"
-
/datum/status_effect/bonechill
id = "bonechill"
duration = 80
diff --git a/code/modules/ruins/lavaland_ruin_code.dm b/code/modules/ruins/lavaland_ruin_code.dm
index 1d210867b75..bf9482c1729 100644
--- a/code/modules/ruins/lavaland_ruin_code.dm
+++ b/code/modules/ruins/lavaland_ruin_code.dm
@@ -1,9 +1,5 @@
//If you're looking for spawners like ash walker eggs, check ghost_role_spawners.dm
-/obj/structure/fans/tiny/invisible //For blocking air in ruin doorways
- invisibility = INVISIBILITY_ABSTRACT
-
-
///Wizard tower item
/obj/item/disk/design_disk/adv/knight_gear
name = "Magic Disk of Smithing"
diff --git a/code/modules/spells/spell_types/wizard.dm b/code/modules/spells/spell_types/wizard.dm
index 5ef1c3865b7..63e71bdd5d7 100644
--- a/code/modules/spells/spell_types/wizard.dm
+++ b/code/modules/spells/spell_types/wizard.dm
@@ -136,7 +136,6 @@
name = "quickstep"
charge_max = 100
- clothes_req = FALSE
clothes_req = TRUE
/obj/effect/proc_holder/spell/targeted/area_teleport/teleport