diff --git a/code/game/gamemodes/wizard/artefact.dm b/code/game/gamemodes/wizard/artefact.dm index 130579b3cb0..8ca622da167 100644 --- a/code/game/gamemodes/wizard/artefact.dm +++ b/code/game/gamemodes/wizard/artefact.dm @@ -86,8 +86,6 @@ /obj/singularity/wizard name = "tear in the fabric of reality" desc = "This isn't right." - icon = 'icons/obj/singularity.dmi' - icon_state = "singularity_s1" icon = 'icons/effects/224x224.dmi' icon_state = "reality" pixel_x = -96 @@ -569,4 +567,3 @@ var/global/list/multiverse = list() heal_brute = 25 heal_burn = 25 heal_oxy = 25 - diff --git a/code/game/objects/items/weapons/storage/boxes.dm b/code/game/objects/items/weapons/storage/boxes.dm index 919e58e1c08..7153790c489 100644 --- a/code/game/objects/items/weapons/storage/boxes.dm +++ b/code/game/objects/items/weapons/storage/boxes.dm @@ -127,7 +127,6 @@ /obj/item/weapon/storage/box/syringes name = "box of syringes" desc = "A box full of syringes." - desc = "A biohazard alert warning is printed on the box." icon_state = "syringe" /obj/item/weapon/storage/box/syringes/New() diff --git a/code/modules/clothing/head/jobs.dm b/code/modules/clothing/head/jobs.dm index c28acd10e73..687d3db6211 100644 --- a/code/modules/clothing/head/jobs.dm +++ b/code/modules/clothing/head/jobs.dm @@ -2,8 +2,6 @@ //Chef /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." - icon_state = "chef" item_state = "chef" desc = "The commander in chef's head wear." strip_delay = 10 diff --git a/code/modules/clothing/spacesuits/syndi.dm b/code/modules/clothing/spacesuits/syndi.dm index e16905ca28b..b1abd00ecc1 100644 --- a/code/modules/clothing/spacesuits/syndi.dm +++ b/code/modules/clothing/spacesuits/syndi.dm @@ -1,7 +1,6 @@ //Regular syndicate space suit /obj/item/clothing/head/helmet/space/syndicate name = "red space helmet" - desc = "Top secret spess helmet." icon_state = "syndicate" item_state = "syndicate" desc = "Has a tag: Totally not property of an enemy corporation, honest." @@ -146,4 +145,4 @@ /obj/item/clothing/suit/space/syndicate/black/engie name = "black engineering space suit" icon_state = "syndicate-black-engie" - item_state = "syndicate-black" \ No newline at end of file + item_state = "syndicate-black" diff --git a/code/modules/food_and_drinks/food/customizables.dm b/code/modules/food_and_drinks/food/customizables.dm index 820444a38cc..4aab7b60a77 100644 --- a/code/modules/food_and_drinks/food/customizables.dm +++ b/code/modules/food_and_drinks/food/customizables.dm @@ -294,8 +294,6 @@ // Bowl //////////////////////////////////////////////// /obj/item/weapon/reagent_containers/glass/bowl - name = "bowl" - icon_state = "snack_bowl" name = "bowl" desc = "A simple bowl, used for soups and salads." icon = 'icons/obj/food/soupsalad.dmi' diff --git a/code/modules/mining/lavaland/necropolis_chests.dm b/code/modules/mining/lavaland/necropolis_chests.dm index 752a39132ab..a191a88eda8 100644 --- a/code/modules/mining/lavaland/necropolis_chests.dm +++ b/code/modules/mining/lavaland/necropolis_chests.dm @@ -625,7 +625,6 @@ item_state = "staffofstorms" icon = 'icons/obj/guns/magic.dmi' slot_flags = SLOT_BACK - item_state = "staffofstorms" w_class = 4 force = 25 damtype = BURN diff --git a/code/modules/mining/minebot.dm b/code/modules/mining/minebot.dm index 234f3adfcaa..177c604c370 100644 --- a/code/modules/mining/minebot.dm +++ b/code/modules/mining/minebot.dm @@ -9,7 +9,6 @@ icon_state = "mining_drone" icon_living = "mining_drone" status_flags = CANSTUN|CANWEAKEN|CANPUSH - stop_automated_movement_when_pulled = 1 mouse_opacity = 1 faction = list("neutral") a_intent = "harm" @@ -282,4 +281,4 @@ origin_tech = "programming=6" #undef MINEDRONE_COLLECT -#undef MINEDRONE_ATTACK \ No newline at end of file +#undef MINEDRONE_ATTACK diff --git a/code/modules/mob/living/simple_animal/friendly/drone/_drone.dm b/code/modules/mob/living/simple_animal/friendly/drone/_drone.dm index 7b786bd8294..1ff7887c8ea 100644 --- a/code/modules/mob/living/simple_animal/friendly/drone/_drone.dm +++ b/code/modules/mob/living/simple_animal/friendly/drone/_drone.dm @@ -22,7 +22,6 @@ icon_state = "drone_maint_grey" icon_living = "drone_maint_grey" icon_dead = "drone_maint_dead" - gender = NEUTER health = 30 maxHealth = 30 unsuitable_atmos_damage = 0 diff --git a/code/modules/mob/living/simple_animal/friendly/lizard.dm b/code/modules/mob/living/simple_animal/friendly/lizard.dm index 98cc9b3d535..a9079e99134 100644 --- a/code/modules/mob/living/simple_animal/friendly/lizard.dm +++ b/code/modules/mob/living/simple_animal/friendly/lizard.dm @@ -9,7 +9,6 @@ maxHealth = 5 faction = list("Lizard") attacktext = "bites" - attacktext = "bites" melee_damage_lower = 1 melee_damage_upper = 2 response_help = "pets" @@ -38,4 +37,4 @@ target = null adjustBruteLoss(-2) else - ..() \ No newline at end of file + ..() diff --git a/code/modules/mob/living/simple_animal/hostile/creature.dm b/code/modules/mob/living/simple_animal/hostile/creature.dm index 566f1266adf..8faebd81a3c 100644 --- a/code/modules/mob/living/simple_animal/hostile/creature.dm +++ b/code/modules/mob/living/simple_animal/hostile/creature.dm @@ -1,7 +1,6 @@ /mob/living/simple_animal/hostile/creature name = "creature" desc = "A sanity-destroying otherthing." - speak_emote = list("gibbers") icon_state = "otherthing" icon_living = "otherthing" icon_dead = "otherthing-dead" 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 1409234b840..474293e144b 100644 --- a/code/modules/mob/living/simple_animal/hostile/megafauna/colossus.dm +++ b/code/modules/mob/living/simple_animal/hostile/megafauna/colossus.dm @@ -622,7 +622,6 @@ Difficulty: Very Hard languages_understood = ALL del_on_death = 1 unsuitable_atmos_damage = 0 - flying = 1 minbodytemp = 0 maxbodytemp = 1500 obj_damage = 0 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 fa7e0330f24..0fc7554a47a 100644 --- a/code/modules/mob/living/simple_animal/hostile/megafauna/legion.dm +++ b/code/modules/mob/living/simple_animal/hostile/megafauna/legion.dm @@ -147,7 +147,6 @@ Difficulty: Medium item_state = "staffofstorms" icon = 'icons/obj/guns/magic.dmi' slot_flags = SLOT_BACK - item_state = "staffofstorms" w_class = 4 force = 25 damtype = BURN @@ -192,4 +191,4 @@ Difficulty: Medium A.telegraph() storm_cooldown = world.time + 200 -#undef MEDAL_PREFIX \ No newline at end of file +#undef MEDAL_PREFIX diff --git a/code/modules/mob/living/simple_animal/hostile/mining_mobs.dm b/code/modules/mob/living/simple_animal/hostile/mining_mobs.dm index 7fe53150aed..68af4a647b7 100644 --- a/code/modules/mob/living/simple_animal/hostile/mining_mobs.dm +++ b/code/modules/mob/living/simple_animal/hostile/mining_mobs.dm @@ -413,7 +413,6 @@ icon_aggro = "Goliath_alert" icon_dead = "Goliath_dead" icon_gib = "syndicate_gib" - attack_sound = 'sound/weapons/punch4.ogg' mouse_opacity = 2 move_to_delay = 40 ranged = 1 @@ -575,7 +574,6 @@ icon_aggro = "Fugu" icon_dead = "Fugu_dead" icon_gib = "syndicate_gib" - attack_sound = 'sound/weapons/punch4.ogg' mouse_opacity = 2 move_to_delay = 5 friendly = "floats near" 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 1830ff0cd61..ee7af62269b 100644 --- a/code/modules/mob/living/simple_animal/hostile/retaliate/clown.dm +++ b/code/modules/mob/living/simple_animal/hostile/retaliate/clown.dm @@ -5,7 +5,6 @@ icon_living = "clown" icon_dead = "clown_dead" icon_gib = "clown_gib" - speak_chance = 0 turns_per_move = 5 response_help = "pokes" response_disarm = "gently pushes aside" @@ -40,4 +39,4 @@ /mob/living/simple_animal/hostile/retaliate/clown/attack_hand(mob/living/carbon/human/M) ..() - playsound(src.loc, 'sound/items/bikehorn.ogg', 50, 1) \ No newline at end of file + playsound(src.loc, 'sound/items/bikehorn.ogg', 50, 1) diff --git a/code/modules/projectiles/guns/energy/special.dm b/code/modules/projectiles/guns/energy/special.dm index eb8ca9a63c5..1c5eb09e9b4 100644 --- a/code/modules/projectiles/guns/energy/special.dm +++ b/code/modules/projectiles/guns/energy/special.dm @@ -264,8 +264,6 @@ /obj/item/weapon/gun/energy/gravity_gun name = "one-point bluespace-gravitational manipulator" - icon_state = "gravity_gun" - item_state = "gravity_gun" desc = "An experimental, multi-mode device that fires bolts of Zero-Point Energy, causing local distortions in gravity" ammo_type = list(/obj/item/ammo_casing/energy/gravityrepulse, /obj/item/ammo_casing/energy/gravityattract, /obj/item/ammo_casing/energy/gravitychaos) origin_tech = "combat=4;magnets=4;materials=6;powerstorage=4;bluespace=4" diff --git a/code/modules/shuttle/shuttle.dm b/code/modules/shuttle/shuttle.dm index c0a5b9ee189..ea714f2e8e6 100644 --- a/code/modules/shuttle/shuttle.dm +++ b/code/modules/shuttle/shuttle.dm @@ -188,7 +188,6 @@ /obj/docking_port/mobile - icon_state = "mobile" name = "shuttle" icon_state = "pinonclose" @@ -661,4 +660,3 @@ dst = destination . += " towards [dst ? dst.name : "unknown location"] ([timeLeft(600)] minutes)" #undef DOCKING_PORT_HIGHLIGHT -