Fixed vars getting set twice in the same class (#19294)

Fixed vars getting set twice in the same class
2026-08-26 14:31:59 +01:00 · 2024-06-02 23:13:31 +00:00
parent 0dc6f03a46
commit aeb27e21e1
78 changed files with 93 additions and 132 deletions
@@ -801,5 +801,6 @@
 	desc = "Guest Room 10"

 #define ACCESS_FISHING_LEAGUE 241
+/datum/access/unathi_trawler_access
 	id = ACCESS_FISHING_LEAGUE
 	desc = "General Fishing Trawler Access"
@@ -6,7 +6,7 @@
 	gloves = /obj/item/clothing/gloves/tcaf
 	glasses = /obj/item/clothing/glasses/safety/goggles/tactical/generic
 	shoes = /obj/item/clothing/shoes/jackboots
-	id = /obj/item/card/id
+	id = /obj/item/card/id/distress/legion/tcaf
 	accessory = /obj/item/clothing/accessory/holster/hip
 	l_ear = /obj/item/device/radio/headset/legion
 	r_pocket = /obj/item/crowbar/red
@@ -15,7 +15,6 @@
 	mask = /obj/item/clothing/mask/gas
 	suit_store = /obj/item/gun/energy/blaster/tcaf
 	accessory_contents = list(/obj/item/gun/energy/blaster/revolver = 1)
-	id = /obj/item/card/id/distress/legion/tcaf
 	belt = /obj/item/storage/belt/military
 	belt_contents = list(
 		/obj/item/melee/energy/sword/knife = 1,
@@ -68,10 +68,9 @@
 /obj/outfit/admin/ert/fsf/sapper
 	name = "Free Solarian Fleets Sapper"

-	back = /obj/item/storage/backpack/industrial
+	back = /obj/item/storage/backpack/duffel/eng
 	belt = /obj/item/storage/belt/utility/very_full
 	gloves = /obj/item/clothing/gloves/yellow
-	back = /obj/item/storage/backpack/duffel/eng
 	suit_store = /obj/item/gun/projectile/shotgun/pump/combat/sol
 	accessory = /obj/item/clothing/accessory/storage/brown_vest
 	accessory_contents = list(
@@ -6,11 +6,8 @@ var/datum/antagonist/renegade/renegades
 	welcome_text = "You're extremely paranoid today. For your entire life, you've theorized about a shadow corporation out for your blood and yours only. Something's here to kill you, but you don't know what... Remember that you're not a full antagonist. You can prepare to murder someone and kill, but you shouldn't actively seek conflict."
 	id = MODE_RENEGADE
 	flags = ANTAG_SUSPICIOUS | ANTAG_IMPLANT_IMMUNE | ANTAG_VOTABLE | ANTAG_NO_ROUNDSTART_SPAWN
-	hard_cap = 5
-	hard_cap_round = 7
-
-	hard_cap = 8
 	hard_cap_round = 12
+
 	initial_spawn_req = 3
 	initial_spawn_target = 6

@@ -4,9 +4,8 @@
 	enhancement_desc = "An extremely loud bike horn sound that costs  large amount of energy and instability becomes available, \
 	which will deafen and stun all who are near the targeted tile, including yourself if unprotected."
 	cost = 50
-	ability_icon_state = "boo"
-	obj_path = /obj/item/spell/audible_deception
 	ability_icon_state = "tech_audibledeception"
+	obj_path = /obj/item/spell/audible_deception
 	category = UTILITY_SPELLS

 /obj/item/spell/audible_deception
@@ -69,5 +69,4 @@
 	access = list()
 	minimal_access = list()
 	outfit = /obj/outfit/job/visitor/passenger
-	blacklisted_species = null
 	blacklisted_species = list(SPECIES_VAURCA_BREEDER)
@@ -275,7 +275,6 @@
 	light_color = LIGHT_COLOR_PURPLE
 	network = list("MINE")
 	circuit = /obj/item/circuitboard/security/mining
-	light_color = LIGHT_COLOR_PURPLE

 /obj/machinery/computer/security/engineering
 	name = "engineering camera monitor"
@@ -45,9 +45,8 @@
 	name = "guest pass terminal"
 	desc = "A guest pass terminal. It allows issuing temporary access passes to one or more areas."
 	icon = 'icons/obj/computer.dmi'
-	icon_state = "guestw"
-	light_color = LIGHT_COLOR_BLUE
 	icon_state = "altcomputerw"
+	light_color = LIGHT_COLOR_BLUE
 	icon_screen = "guest"
 	icon_scanline = "altcomputerw-scanline"
 	density = FALSE
@@ -287,7 +287,6 @@

 /obj/item/device/radio/headset/headset_service/alt
 	name = "service radio bowman headset"
-	icon_state = "srv_headset_alt"
 	icon_state = "headset_alt"

 /obj/item/device/radio/headset/alt/double/service
@@ -3,11 +3,10 @@
 	desc = "The by-product of some animal farming."
 	singular_name = "hide piece"
 	icon_state = "sheet-hide"
-	default_type = "hide"
+	default_type = MATERIAL_HIDE
 	icon_has_variants = TRUE
 	drop_sound = 'sound/items/drop/cloth.ogg'
 	pickup_sound = 'sound/items/pickup/cloth.ogg'
-	default_type = MATERIAL_HIDE
 	var/bare = FALSE //is this hair devoid of fur, hair, scales, carapace? Prevents re-stripping. Can also apply it to a hide type if we don't want to tan, like, xeno hide.
 	var/hide_type = "hair" //type of skin this animal has; scales for lizard, carapace for xeno.

@@ -10,13 +10,12 @@
 	pickup_sound = 'sound/items/pickup/knife.ogg'
 	hitsound = 'sound/weapons/bladeslice.ogg'
 	w_class = ITEMSIZE_TINY
-	thrown_force_divisor = 1
+	thrown_force_divisor = 0.25 // 5 when thrown with weight 20 (steel)
 	origin_tech = list(TECH_MATERIAL = 1)
 	attack_verb = list("attacked", "stabbed", "poked")
 	sharp = FALSE
 	edge = FALSE
 	force_divisor = 0.1 // 6 when wielded with hardness 60 (steel)
-	thrown_force_divisor = 0.25 // 5 when thrown with weight 20 (steel)
 	var/loaded      //Descriptive string for currently loaded food object.
 	var/is_liquid = FALSE //whether you've got liquid on your utensil
 	var/scoop_food = 1
@@ -8,10 +8,9 @@
 	icon_state = "grille"
 	density = TRUE
 	anchored = TRUE
-	obj_flags = OBJ_FLAG_CONDUCTABLE
+	obj_flags = OBJ_FLAG_CONDUCTABLE | OBJ_FLAG_MOVES_UNSUPPORTED
 	explosion_resistance = 1
 	layer = BELOW_OBJ_LAYER
-	obj_flags = OBJ_FLAG_MOVES_UNSUPPORTED
 	var/health = 10
 	var/destroyed = 0

@@ -151,10 +151,9 @@
 /obj/structure/bed/chair/stool/bamboo
 	name = "bamboo stool"
 	desc = "A makeshift bamboo stool with a rustic look."
-	icon_state = "bamboo_stool_item"
-	item_state = "bamboo_stool"
-	base_icon = "bamboo_stool"
 	icon_state = "bamboo_stool"
+	item_state = "bamboo_stool_item"
+	base_icon = "bamboo_stool"
 	material_alteration = MATERIAL_ALTERATION_NAME || MATERIAL_ALTERATION_DESC
 	held_item = /obj/item/material/stool/bamboo
 	can_pad = FALSE
@@ -553,12 +553,11 @@
 	desc = "It looks rather strong. Might take a few good hits to shatter it."
 	icon = 'icons/obj/smooth/shuttle_window.dmi'
 	icon_state = "shuttle_window"
-	basestate = "window"
+	basestate = "w"
 	atom_flags = 0
 	obj_flags = null
 	maxhealth = 40
 	reinf = TRUE
-	basestate = "w"
 	dir = 5
 	smoothing_flags = SMOOTH_TRUE
 	can_be_unanchored = TRUE
@@ -1,5 +1,4 @@
 /turf/simulated/wall/r_wall
-	icon_state = "map_dark"
 	desc_info = "You can deconstruct this by with the following steps:<br>\
 	Cut the outer grill with wirecutters, then unscrew them.<br>\
 	Slice the cover with a welder, then pry it off with a crowbar.<br>\
@@ -5,7 +5,6 @@
 	its large xeno population which enjoys various privileges compared to other space powers. With a very lax migration policy, virtually everyone is welcome to live here. However, \
 	unrest and gridlock undermine the government, and the aggressive attitude of the Sol Alliance against its former system has made many worried for the future of the Republic."
 	consular_outfit = /obj/outfit/job/representative/consular/ceti
-	consular_outfit = /obj/outfit/job/representative/consular/ceti
 	assistant_outfit = /obj/outfit/job/consular_assistant/ceti

 	job_species_blacklist = list(
@@ -126,11 +126,10 @@
 	power_add = BATTLE_MONSTERS_POWER_COMMON
 	defense_add = 4
 	attack_add = 1
-	rarity = 0.25
+	rarity = BATTLE_MONSTERS_RARITY_UNCOMMON
 	description = "a proud male %SPECIES %NAME dorned in heavy %ELEMENT_AND armor and wielding a decorative %WEAPON_AND. They're sworn to protect the Great Kingdom of Garoosh from Barbarians."
 	special_effects = "%SPECIES_C Protection: As long as %NAME is visible, all other %SPECIES monsters are attack immune."
 	attack_type = BATTLE_MONSTERS_ATTACKTYPE_SWORDSMAN
-	rarity = BATTLE_MONSTERS_RARITY_UNCOMMON
 	rarity_score = 0

 /datum/battle_monsters/monster/human/king
@@ -215,7 +215,6 @@
 	contained_sprite = TRUE
 	icon_state = "helm_heavy"
 	item_state = "helm_heavy"
-	contained_sprite = TRUE
 	armor = list(
 		melee = ARMOR_MELEE_VERY_HIGH,
 		bullet = ARMOR_BALLISTIC_RIFLE,
@@ -42,9 +42,8 @@
 		rad = ARMOR_RAD_SMALL
 	)
 	siemens_coefficient = 0.1
-	vision_restriction = 0
-	slowdown = 4
 	vision_restriction = TINT_NONE
+	slowdown = 4
 	glove_type = /obj/item/clothing/gloves/powerfist

 	allowed_module_types = MODULE_GENERAL | MODULE_LIGHT_COMBAT | MODULE_HEAVY_COMBAT | MODULE_SPECIAL
@@ -188,11 +187,10 @@
 		bio = ARMOR_BIO_SHIELDED,
 		rad = ARMOR_RAD_RESISTANT
 	)
-	siemens_coefficient = 0.1
+	siemens_coefficient = 0
 	vision_restriction = 0
 	slowdown = 2
 	offline_slowdown = 3
-	siemens_coefficient = 0

 	species_restricted = list(BODYTYPE_TAJARA)

@@ -18,10 +18,9 @@
 	)
 	siemens_coefficient = 0.1
 	emp_protection = 30
-	vision_restriction = 0
+	vision_restriction = TINT_NONE
 	slowdown = 0
 	offline_slowdown = 3
-	vision_restriction = TINT_NONE
 	species_restricted = list(BODYTYPE_SKRELL)

 	helm_type = /obj/item/clothing/head/helmet/space/rig/skrell
@@ -47,7 +47,6 @@
 	req_one_access = list()

 	helm_type = null
-	suit_type = null
 	glove_type = null
 	boot_type = null

@@ -623,7 +623,6 @@
 	refittable_species = list(BODYTYPE_HUMAN, BODYTYPE_TAJARA, BODYTYPE_IPC, BODYTYPE_UNATHI, BODYTYPE_SKRELL)

 /obj/item/clothing/suit/space/void/freelancer
-	icon_state = "freelancer"
 	name = "armored voidsuit"
 	desc = "A suit from a commercial combat voidsuit design. Acceptably well-armored and prolific thoughout the Orion Spur, it can be seen in use by everyone from mercenaries to militia groups to police forces."
 	icon = 'icons/obj/clothing/voidsuit/mercenary.dmi'
@@ -18,7 +18,6 @@
 	and weak lasers. It is significantly more comfortable to wear than a full steel plate, and many soldiers on Sun Reach only wear their flak vests — \
 	much to the dismay of officers."
 	icon_state = "dom_carrier"
-	icon_state = "dom_carrier"
 	armor = list(
 		melee = ARMOR_MELEE_KNIVES,
 		bullet = ARMOR_BALLISTIC_SMALL,
@@ -77,10 +77,9 @@
 		bomb = ARMOR_BOMB_SHIELDED
 	)
 	max_pressure_protection = FIRESUIT_MAX_PRESSURE
-	siemens_coefficient = 0.1
+	siemens_coefficient = 0
 	flags_inv = HIDEMASK|HIDEEARS|HIDEEYES
 	body_parts_covered = HEAD|FACE|EYES
-	siemens_coefficient = 0
 	tint = TINT_HEAVY


@@ -105,7 +104,7 @@
 		energy = ARMOR_ENERGY_RESISTANT,
 		bomb = ARMOR_BOMB_SHIELDED
 	)
-	siemens_coefficient = 0.1
+	siemens_coefficient = 0
 	item_flags = ITEM_FLAG_THICK_MATERIAL
 	flags_inv = HIDEJUMPSUIT|HIDETAIL
 	heat_protection = UPPER_TORSO|LOWER_TORSO|LEGS|FEET|ARMS
@@ -113,7 +112,6 @@
 	body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|FEET|ARMS
 	max_heat_protection_temperature = SPACE_SUIT_MAX_HEAT_PROTECTION_TEMPERATURE
 	max_pressure_protection = FIRESUIT_MAX_PRESSURE
-	siemens_coefficient = 0
 	var/mob/living/carbon/human/wearer = null
 	var/suit_temp = T20C

@@ -91,7 +91,6 @@
 	flags_inv = HIDEJUMPSUIT

 	body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS
-	flags_inv = 0

 /obj/item/clothing/suit/wizrobe/fake
 	name = "wizard robe"
@@ -313,7 +313,6 @@
 	icon_state = "capjacket"
 	item_state = "capjacket"
 	contained_sprite = TRUE
-	contained_sprite = TRUE

 /obj/item/clothing/suit/storage/tajaran/hunting
 	name = "adhomian hunting coat"
@@ -17,7 +17,6 @@
 		bomb = ARMOR_BOMB_PADDED
 	)
 	body_parts_covered = LEGS|FEET
-	contained_sprite = TRUE
 	drop_sound = 'sound/items/drop/boots.ogg'
 	pickup_sound = 'sound/items/pickup/boots.ogg'

@@ -158,7 +157,6 @@
 		bomb = ARMOR_BOMB_PADDED
 	)
 	w_class = ITEMSIZE_NORMAL
-	contained_sprite = TRUE
 	drop_sound = 'sound/items/drop/axe.ogg'
 	pickup_sound = 'sound/items/pickup/axe.ogg'

@@ -3,9 +3,8 @@
 	desc = "A silver locket that seems to have space for a photo within."
 	icon_state = "locket"
 	item_state = "locket"
-	slot_flags = 0
-	w_class = ITEMSIZE_SMALL
 	slot_flags = SLOT_MASK | SLOT_TIE
+	w_class = ITEMSIZE_SMALL
 	var/open
 	var/obj/item/held //Item inside locket.

@@ -174,7 +174,6 @@

 /obj/item/clothing/accessory/storage/pouches/colour
 	icon_state = "thigh_colour"
-	icon_state = "thigh_colour"

 /obj/item/clothing/accessory/storage/knifeharness
 	name = "decorated harness"
@@ -230,7 +230,6 @@
 	icon = 'icons/obj/item/clothing/department_uniforms/command.dmi'
 	icon_state = "bridge_crew"
 	item_state = "bridge_crew"
-	contained_sprite = TRUE

 /obj/item/clothing/under/rank/bridge_crew/alt
 	name = "bridge crew's skirt"
@@ -97,7 +97,6 @@
 	appliance = MIX
 	fruit = list("guami" = 4)
 	reagents = list(/singleton/reagent/drink/dynjuice = 10, /singleton/reagent/drink/milk = 10)
-	result = /obj/item/reagent_containers/food/snacks/qlguabi
 	reagent_mix = RECIPE_REAGENT_REPLACE //Simplify end product
 	result = /obj/item/reagent_containers/food/snacks/qlguabi

@@ -78,7 +78,6 @@
 	mutants = list("deathnettle")
 	chems = list(/singleton/reagent/nutriment = list(1,50), /singleton/reagent/acid = list(0,1))
 	kitchen_tag = "nettle"
-	kitchen_tag = "nettle"

 /datum/seed/nettle/setup_traits()
 	..()
@@ -646,8 +646,6 @@
 	created_window = /obj/structure/window/borosilicate/reinforced
 	hardness = 40
 	weight = 30
-	stack_origin_tech = list(TECH_MATERIAL = 2)
-	composite_material = list() //todo
 	rod_product = null

 /material/plastic
@@ -288,7 +288,6 @@

 	can_wield = 0
 	force = 25
-	digspeed = 2
 	digspeed_unwielded = 3
 	force_unwielded = 20.0

@@ -1479,7 +1479,6 @@ Follow by example and make good judgement based on length which list to include
 	chatname = "unshaved hair"
 	name = "Undercut 3"
 	icon_state = "hair_undercut3"
-	chatname = "unshaved hair"

 /datum/sprite_accessory/hair/undercut4
 	name = "Undercut 4"
@@ -47,7 +47,6 @@
 		"a",  "a",  "e",  "e",  "i",  "i",  "o",  "o",  "u",  "u",  "s",  "s"
 	)
 	partial_understanding = list(LANGUAGE_AZAZIBA = 25)
-	allow_accents = TRUE

 /datum/language/unathi_azaziba
 	name = LANGUAGE_AZAZIBA
@@ -96,7 +96,7 @@
 /datum/species/tajaran/tesla_body
 	name = SPECIES_TAJARA_TESLA_BODY
 	name_plural = "Tesla Rejuvenation Suit Tajara"
-	name_plural = "Created as part of the Tesla prosthetics program, the Tesla Rejuvenation Suit is a hulking suit that allows disabled Tajara to regain their vigor. \
+	blurb = "Created as part of the Tesla prosthetics program, the Tesla Rejuvenation Suit is a hulking suit that allows disabled Tajara to regain their vigor. \
 	Its users are surgically grafted in the machine; their limbs are replaced by large, industrial replacements; their organs are placed in a tank full of healing chemicals \
 	located inside their chest, and finally, a big tesla spine is installed. Only the head remains untouched. The suits are bulky and clumsy, restricting their wearers to jobs \
 	involving weight lifting and other menial tasks. Since this invention is still in its early stage, reports of it malfunctioning or causing pain to its user are not unheard off; \
@@ -345,9 +345,8 @@ GLOBAL_LIST_EMPTY(sparring_attack_cache)
 	attack_noun = list("tap","light strike")
 	attack_verb = list("tapped", "lightly struck")
 	desc = "Sparring: A light strike to your opponent. So light, it won't even leave a mark! They WILL feel this, but will suffer no dangerous side effect, unless you punch them into cardiac arrest!"
-	damage = 2
-	shredding = 0
 	damage = 0
+	shredding = 0
 	sharp = 0
 	edge = FALSE
 	attack_name = "light hit"
@@ -279,9 +279,7 @@

 	canbrush = TRUE

-	meat_type = /obj/item/reagent_containers/food/snacks/meat/adhomai
 	meat_amount = 4
-	faction = "Adhomai"
 	vehicle_version = /obj/vehicle/animal/climber
 	natural_armor = list(
 		melee = ARMOR_MELEE_MEDIUM,
@@ -349,7 +349,6 @@
 	named = TRUE
 	gender = FEMALE
 	icon_state = "crusher"
-	icon_state = "crusher"
 	icon_living = "crusher"
 	icon_dead = "crusher_dead"
 	icon_rest = "crusher_rest"
@@ -18,7 +18,6 @@
 	response_harm   = "stomps"
 	stop_automated_movement = 1
 	friendly = "pinches"
-	mob_size = 5
 	hunger_enabled = 0
 	var/obj/item/inventory_head
 	var/obj/item/inventory_mask
@@ -20,7 +20,6 @@
 	icon_living = "cod"
 	icon_dead = "cod_dead"
 	icon_rest = "cod_rest"
-	item_state = "cod"

 	holder_type = /obj/item/holder/fish/cod

@@ -30,4 +29,3 @@
 	icon_living = "gupper"
 	icon_dead = "gupper_dead"
 	icon_rest = "gupper_rest"
-	item_state = "gupper"
@@ -59,7 +59,7 @@
 	response_help  = "pets"
 	response_disarm = "gently pushes aside"
 	response_harm   = "kicks"
-	attacktext = "kicked"
+	attacktext = "gored"
 	faction = "Moghes"

 	maxHealth = 200
@@ -70,7 +70,6 @@
 	melee_damage_lower = 15
 	melee_damage_upper = 15
 	armor_penetration = 20
-	attacktext = "gored"
 	attack_sound = 'sound/weapons/pierce.ogg'
 	canbrush = TRUE
 	brush = /obj/item/reagent_containers/glass/rag
@@ -22,7 +22,6 @@
 	var/min_explode_time = 1200
 	density = 0
 	holder_type = /obj/item/holder/mushroom
-	mob_size = 2
 	canbrush = TRUE
 	brush = /obj/item/reagent_containers/glass/rag

@@ -11,7 +11,7 @@
 	response_help = "passes through"
 	response_disarm = "shoves"
 	response_harm = "hits"
-	speed = -1
+	speed = 4
 	maxHealth = 80
 	health = 80
 	environment_smash = 2
@@ -32,7 +32,6 @@
 	min_n2 = 0
 	max_n2 = 0
 	minbodytemp = 0
-	speed = 4

 	faction = "faithless"

@@ -83,14 +83,13 @@
 	poison_per_bite = 10
 	speed = -2
 	poison_type = /singleton/reagent/soporific
-	poison_per_bite = 3
-	var/playable = TRUE
 	fed = 1
 	minbodytemp = 0
 	maxbodytemp = 350
 	min_oxy = 0
 	max_co2 = 0
 	max_tox = 0
+	var/playable = TRUE

 /mob/living/simple_animal/hostile/giant_spider/nurse/servant/Life()
 	..()
@@ -6,14 +6,13 @@
 	icon_living = "clown"
 	icon_dead = "clown_dead"
 	icon_gib = "clown_gib"
-	speak_chance = 0
+	speak_chance = 1
 	turns_per_move = 5
 	response_help = "pokes"
 	response_disarm = "gently pushes aside"
 	response_harm = "hits"
 	speak = list("HONK", "Honk!", "Welcome to clown planet!")
 	emote_see = list("honks")
-	speak_chance = 1
 	universal_speak = FALSE
 	a_intent = I_HURT
 	stop_automated_movement_when_pulled = 0
@@ -41,7 +41,7 @@
 	emote_see = list("flutters its wings")

 	speak_chance = 1//1% (1 in 100) chance every tick; So about once per 150 seconds, assuming an average tick is 1.5s
-	universal_speak = FALSE
+	universal_speak = TRUE
 	turns_per_move = 5
 	meat_type = /obj/item/reagent_containers/food/snacks/cracker/

@@ -50,7 +50,6 @@
 	response_disarm = "gently moves aside"
 	response_harm   = "swats"
 	stop_automated_movement = 1
-	universal_speak = 1
 	canbrush = TRUE

 	flying = TRUE
@@ -25,9 +25,8 @@
 	max_tox = 0
 	speed = -1
 	stop_automated_movement = 1
-	status_flags = 0
-	faction = "cult"
 	status_flags = CANPUSH
+	faction = "cult"
 	hunger_enabled = 0
 	appearance_flags = NO_CLIENT_COLOR|KEEP_TOGETHER
 	var/obj/item/residue = /obj/item/ectoplasm
@@ -131,12 +131,10 @@
 	body_part = FOOT_RIGHT
 	icon_position = RIGHT
 	parent_organ = BP_R_LEG
-	joint = "right ankle"
-	amputation_point = "right ankle"
-	limb_flags = ORGAN_CAN_MAIM | ORGAN_CAN_AMPUTATE | ORGAN_CAN_STAND
-	dislocated = -1
 	joint = "structural ligament"
 	amputation_point = "branch"
+	limb_flags = ORGAN_CAN_MAIM | ORGAN_CAN_AMPUTATE | ORGAN_CAN_STAND
+	dislocated = -1

 /obj/item/organ/external/hand/diona
 	name = "left grasper"
@@ -91,7 +91,6 @@
 	knife_x_offset = 23
 	knife_y_offset = 13
 	fire_delay = 25
-	w_class = ITEMSIZE_LARGE
 	accuracy = -3
 	scoped_accuracy = 4

@@ -452,11 +452,10 @@
 	item_state = "l6closedmag"
 	w_class = ITEMSIZE_LARGE
 	force = 10
-	slot_flags = 0
+	slot_flags = SLOT_BACK
 	max_shells = 50
 	caliber = "a762"
 	origin_tech = list(TECH_COMBAT = 6, TECH_MATERIAL = 1, TECH_ILLEGAL = 2)
-	slot_flags = SLOT_BACK
 	ammo_type = "/obj/item/ammo_casing/a762"
 	allowed_magazines = list(/obj/item/ammo_magazine/a762)
 	fire_sound = 'sound/weapons/gunshot/gunshot_saw.ogg'
@@ -562,9 +561,6 @@

 	is_wieldable = TRUE

-	can_bayonet = TRUE
-
-
 	magazine_type = /obj/item/ammo_magazine/c762/dpra
 	allowed_magazines = list(/obj/item/ammo_magazine/c762/dpra)

@@ -639,7 +635,6 @@
 	suppressor_y_offset = null
 	handle_casings = DELETE_CASINGS
 	max_shells = 30
-	allowed_magazines = list(/obj/item/ammo_magazine/submachinemag/assassin)

 /obj/item/gun/projectile/automatic/tommygun/assassin/update_icon()
 	..()
@@ -46,7 +46,6 @@
 	desc = "A small gas-powered dartgun, capable of delivering chemical cocktails swiftly across short distances."
 	icon = 'icons/obj/guns/dartgun.dmi'
 	icon_state = "dartgun-empty"
-	icon_state = "dartgun-empty"
 	caliber = "dart"
 	fire_sound = 'sound/weapons/click.ogg'
 	fire_sound_text = "a metallic click"
@@ -329,7 +329,7 @@
 	name = "gauss thumper"
 	desc = "An outdated gauss weapon which sees sparing use in modern times."
 	w_class = ITEMSIZE_NORMAL
-	slot_flags = 0
+	slot_flags = SLOT_BACK
 	magazine_type = /obj/item/ammo_magazine/gauss
 	allowed_magazines = list(/obj/item/ammo_magazine/gauss)
 	icon = 'icons/obj/guns/gauss_thumper.dmi'
@@ -342,7 +342,6 @@
 	handle_casings = DELETE_CASINGS

 	force = 15
-	slot_flags = SLOT_BACK
 	can_bayonet = TRUE
 	knife_x_offset = 23
 	knife_y_offset = 13
@@ -588,6 +588,5 @@
 	reagent_state = SOLID
 	color = "#DCDCDC"
 	taste_mult = 0 //no taste
-	fallback_specific_heat = 18

 	fallback_specific_heat = 0.859
@@ -3375,7 +3375,6 @@
 	taste_description = "orange peel"
 	color = "#fc782b"
 	strength = 12
-	taste_description = "orange peel"

 	glass_icon_state = "glass_orange"
 	glass_name = "glass of triple sec"
@@ -5596,7 +5595,6 @@

 	glass_icon_state = "darmadhirbrew_glass"
 	glass_name = "glass of Darmadhir Brew"
-	description = "A rare and expensive brand of nm'shaan liquor."

 /singleton/reagent/alcohol/treebark_firewater
 	name = "Tree-Bark Firewater"
@@ -6044,7 +6042,6 @@
 	description = "A delicious seasonal flavoring."
 	color = "#AE771C"
 	taste_description = "autumn bliss"
-	condiment_name = "bottle of pumpkin spice"
 	condiment_name = "Pumpkin Spice"
 	condiment_desc = "Every teenager's favorite seasonal ingredient."
 	condiment_icon_state = "pumpkinspice"
@@ -6436,7 +6433,6 @@

 	glass_icon_state = "pulque_dyn"
 	glass_name = "dyn pulque"
-	description = "A traditional Mictlanian drink made from fermented sap of maguey. This one is dyn flavored."

 /singleton/reagent/alcohol/pulque/banana
 	name = "Banana Pulque"
@@ -6446,7 +6442,6 @@

 	glass_icon_state = "pulque_banana"
 	glass_name = "banana pulque"
-	description = "A traditional Mictlanian drink made from fermented sap of maguey. This one is banana flavored."

 /singleton/reagent/alcohol/pulque/berry
 	name = "Berry Pulque"
@@ -6456,7 +6451,6 @@

 	glass_icon_state = "pulque_berry"
 	glass_name = "berry pulque"
-	description = "A traditional Mictlanian drink made from fermented sap of maguey. This one is berry flavored."

 /singleton/reagent/alcohol/pulque/coffee
 	name = "Coffee Pulque"
@@ -6466,7 +6460,6 @@

 	glass_icon_state = "pulque_coffee"
 	glass_name = "coffee pulque"
-	description = "A traditional Mictlanian drink made from fermented sap of maguey. This one is coffee flavored."

 /singleton/reagent/drink/jyalra
 	name = "Jyalra"
@@ -384,12 +384,11 @@
 	color = "#5c4033"
 	overdose = 10
 	od_minimum_dose = 2
-	specific_heat = 1
+	specific_heat = 1.2
 	scannable = TRUE
 	metabolism = REM / 3.33 // 0.06ish units per tick
 	ingest_met = REM / 1.5 // Should be 0.13 units per tick
 	breathe_met = REM * 4 // .8 units per tick
-	specific_heat = 1.2

 /singleton/reagent/morphine/affect_blood(var/mob/living/carbon/M, var/alien, var/removed, var/datum/reagents/holder)
 	var/list/joy_messages = list("You feel soothed and at ease.", "You feel content and at peace.", "You feel a pleasant emptiness.", "You feel like sharing the wonderful memories and feelings you're experiencing.", "All your anxieties fade away.", "You feel like you're floating off the ground.", "You don't want this feeling to end.")
@@ -259,7 +259,6 @@
 	name = "getmore energy can"
 	desc = "An extremely ill-advised combination of excessive caffeine and alcohol. Getmore's most controversial product to date!"
 	icon_state = "thirteen_loko"
-	icon_state = "thirteen_loko"
 	center_of_mass = list("x"=16, "y"=10)

 	reagents_to_add = list(/singleton/reagent/alcohol/thirteenloko = 30)
@@ -789,8 +789,8 @@
 	name = "Boryeong '45 soju"
 	desc = "A rice-based liquor commonly consumed by the non-synthetic residents of Konyang. This particular brand originates from the city of Boreyeong, on Konyang."
 	desc_extended = "While most commonly associated with Konyang, soju can be found throughout the Sol Alliance thanks to the inexpensive cost of producing it and a successful \
-	marketing campaign carried out during the robotics boom on Konyang. It is traditionally consumed neat, or without mixing any other liquids into it. The '45 in this brand's \
-	name refers to its alcohol by volume content, and not a calendar year."
+	marketing campaign carried out during the robotics boom on Konyang. It is traditionally consumed neat, or without mixing any other liquids into it. The '45 in this brand's name \
+	refers to its alcohol by volume content, and not a calendar year."
 	icon_state = "sojubottle"
 	center_of_mass = list("x"=16, "y"=4)
 	reagents_to_add = list(/singleton/reagent/alcohol/soju = 100)
@@ -289,7 +289,6 @@
 	center_of_mass = list("x"=16, "y"=10)
 	reagents_to_add = list(/singleton/reagent/nutriment = 5)
 	reagent_data = list(/singleton/reagent/nutriment = list("poppy seeds" = 2, "pretzel" = 3))
-	bitesize = 2

 /obj/item/reagent_containers/food/snacks/bagel
 	name = "bagel"
@@ -61,7 +61,6 @@
 	filling_color = "#ffeb94"
 	reagents_to_add = list(/singleton/reagent/nutriment = 3, /singleton/reagent/nutriment/gelatin = 5)
 	reagent_data = list(/singleton/reagent/nutriment = list("pineapple sorbet" = 5, "cherry jello" = 5))
-	trash = /obj/item/trash/snack_bowl
 	bitesize = 2

 /obj/item/reagent_containers/food/snacks/floatingisland/update_icon()
@@ -15,7 +15,6 @@
 	possible_transfer_amounts = null
 	atom_flags = ATOM_FLAG_OPEN_CONTAINER
 	slot_flags = SLOT_BELT
-	center_of_mass = null
 	var/name_label
 	var/spent = FALSE
 	matter = list(MATERIAL_GLASS = 400, DEFAULT_WALL_MATERIAL = 200)
@@ -1,11 +1,10 @@
 /spell/radiant_aura
 	name = "Radiant Aura"
 	desc = "Form a protective layer of light around you, making you immune to laser fire."
-	school = "transmutation"
+	school = "conjuration"
 	feedback = "ra"
 	invocation_type = SpI_EMOTE
 	invocation = "conjures a sphere of fire around themselves."
-	school = "conjuration"
 	charge_max = 300
 	cooldown_min = 200
 	level_max = list(Sp_TOTAL = 2, Sp_SPEED = 2, Sp_POWER = 0)
@@ -409,7 +409,6 @@
 	icon_state = "snow_on"

 	bike_icon = "snow"
-	land_speed = 2
 	land_speed = 4
 	protection_percent = 10
 	can_hover = FALSE
@@ -0,0 +1,58 @@
+################################
+# Example Changelog File
+#
+# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb.
+#
+# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.)
+# When it is, any changes listed below will disappear.
+#
+# Valid Prefixes:
+#   bugfix
+#     - (fixes bugs)
+#   wip
+#     - (work in progress)
+#   qol
+#     - (quality of life)
+#   soundadd
+#     - (adds a sound)
+#   sounddel
+#     - (removes a sound)
+#   rscadd
+#     - (adds a feature)
+#   rscdel
+#     - (removes a feature)
+#   imageadd
+#     - (adds an image or sprite)
+#   imagedel
+#     - (removes an image or sprite)
+#   spellcheck
+#     - (fixes spelling or grammar)
+#   experiment
+#     - (experimental change)
+#   balance
+#     - (balance changes)
+#   code_imp
+#     - (misc internal code change)
+#   refactor
+#     - (refactors code)
+#   config
+#     - (makes a change to the config files)
+#   admin
+#     - (makes changes to administrator tools)
+#   server
+#     - (miscellaneous changes to server)
+#################################
+
+# Your name.
+author: FluffyGhost
+
+# Optional: Remove this file after generating master changelog.  Useful for PR changelogs that won't get used again.
+delete-after: True
+
+# Any changes you've made.  See valid prefix list above.
+# INDENT WITH TWO SPACES.  NOT TABS.  SPACES.
+# SCREW THIS UP AND IT WON'T WORK.
+# Also, this gets changed to [] after reading.  Just remove the brackets when you add new shit.
+# Please surround your changes in  double quotes ("). It works without them, but if you use certain characters it screws up compiling. The quotes will not show up in the changelog.
+changes:
+  - code_imp: "Fixed vars getting set twice in the same class."
@@ -210,7 +210,6 @@
 /area/security/penal_colony
 	name = "\improper Security - Penal Mining Colony"
 	icon_state = "security"
-	icon_state = "security"
 	holomap_color = null
 	area_flags = AREA_FLAG_HIDE_FROM_HOLOMAP | AREA_FLAG_PRISON
 	sound_environment = SOUND_AREA_LARGE_ENCLOSED
@@ -106,8 +106,6 @@
 	lift_floor_label = "Lower Sec"
 	lift_floor_name = "Lower Sec"

-	base_turf = /turf/simulated/floor/plating
-
 //Research
 /obj/turbolift_map_holder/aurora/research
 	name = "Aurora lift placeholder - Research"
@@ -137,8 +135,6 @@
 	lift_floor_label = "Sub-Level (Research)"
 	lift_floor_name = "Sub-Level (Research)"

-	base_turf = /turf/simulated/floor/plating
-
 //Engineering
 /obj/turbolift_map_holder/aurora/engineering
 	name = "Aurora lift placeholder - Engineering"
@@ -286,7 +286,6 @@ AURORA_ESCAPE_POD(4)
 		"nav_skipjack_toxins"
 		)

-	landmark_transition = "nav_skipjack_interim"
 	announcer = "NDV Icarus"
 	arrival_message = "Attention, we just tracked a small target bypassing our defensive perimeter. Can't fire on it without hitting the station - you've got incoming visitors, like it or not."
 	departure_message = "Attention, your guests are pulling away - moving too fast for us to draw a bead on them. Looks like they're heading out of the system at a rapid clip."
@@ -347,7 +346,6 @@ AURORA_ESCAPE_POD(4)
 		"nav_merc_caverns"
 		)

-	landmark_transition = "nav_merc_interim"
 	announcer = "NDV Icarus"
 	arrival_message = "Attention, you have a large signature approaching the station - looks unarmed to surface scans. We're too far out to intercept - brace for visitors."
 	departure_message = "Attention, your visitors are on their way out of the system, burning delta-v like it's nothing. Good riddance."
@@ -20,7 +20,6 @@
 	name = "Abandoned Space Diner"//This and desc is visible ingame when the object is scanned by any scanner
 	desc = "A former space diner once operated by Starjack, a chain of rest stops and diners on space stations throughout the Spur, partially owned by NanoTrasen. The company went bankrupt in 2447, forcing its over 60 stations to be vacated in a hurry. \
 	This one has no signs of life; however, scans do indicate power and a pressurized atmosphere."
-	icon_state = "outpost"

 	static_vessel = TRUE
 	generic_object = FALSE
@@ -18,7 +18,6 @@
 /obj/effect/overmap/visitable/sector/abandoned_industrial_station//This is the actual overmap object that spawns at roundstart
 	name = "Abandoned Industrial Station"//This and desc is visible ingame when the object is scanned by any scanner
 	desc = "Industrial station of unknown designation or origin. Scanners detect it to be mostly cold, likely no movement or life inside, although appears to be pressurized."
-	icon_state = "outpost"

 	static_vessel = TRUE
 	generic_object = FALSE
@@ -18,7 +18,6 @@
 /obj/effect/overmap/visitable/sector/abandoned_propellant_depot
 	name = "Abandoned Propellant Depot"
 	desc = "Industrial propellant depot of unknown designation or origin. Scanners detect it to be mostly cold, likely no movement or life inside, although appears to be pressurized."
-	icon_state = "outpost"
 	static_vessel = TRUE
 	generic_object = FALSE
 	icon = 'icons/obj/overmap/overmap_stationary.dmi'
@@ -29,7 +29,6 @@
 		with Orion Express only delivering to the automated stations and other distribution points. \
 		This particular station is of the smaller variety, with very few facilities.\
 		"
-	icon_state = "ox_auto_station"

 	static_vessel = TRUE
 	generic_object = FALSE
@@ -15,7 +15,6 @@

 	assigned_role = "Scarab Salvager"
 	special_role = "Scarab Salvager"
-	respawn_flag = null

 	culture_restriction = list(/singleton/origin_item/culture/coalition)

@@ -16,7 +16,6 @@

 	assigned_role = "Coalition Surveyor"
 	special_role = "Coalition Surveyor"
-	respawn_flag = null

 /obj/outfit/admin/coc_surveyor_crew
 	name = "Coalition Surveyor"
@@ -15,7 +15,6 @@

 	assigned_role = "Patrol Crew"
 	faction = "United Planetary Defense Council of Gadpathur"
-	respawn_flag = null

 	culture_restriction = list(/singleton/origin_item/culture/coalition)
 	origin_restriction = list(/singleton/origin_item/origin/gadpathur)
@@ -174,5 +174,4 @@
 	accessory = /obj/item/clothing/accessory/tie/black
 	shoes = /obj/item/clothing/shoes/laceup
 	back = /obj/item/storage/backpack/satchel/leather
-	accessory = null
 	belt = null
@@ -7,7 +7,6 @@
 	spawn_cost = 2
 	template_flags = TEMPLATE_FLAG_NO_RUINS|TEMPLATE_FLAG_RUIN_STARTS_DISALLOWED
 	sectors = list(SECTOR_SRANDMARR)
-	template_flags = TEMPLATE_FLAG_NO_RUINS|TEMPLATE_FLAG_RUIN_STARTS_DISALLOWED

 	prefix = "adhomai/"
 	suffixes = list("adhomai_sole_rock_nomad.dmm")
@@ -54,7 +54,6 @@
 		NAV_HORIZON_EXTERIOR_ALL_SNEAKY,
 		)

-	landmark_transition = "nav_skipjack_interim"
 	announcer = "SCCV Horizon Sensor Array"
 	arrival_message = "Attention, the radar systems have detected a small spacecraft approaching the ship's perimeter."
 	departure_message = "Attention, the radar systems have detected a small spacecraft leaving the ship's perimeter. "
@@ -87,7 +86,6 @@
 		NAV_HORIZON_EXTERIOR_ALL_SNEAKY,
 		)

-	landmark_transition = "nav_merc_interim"
 	announcer = "SCCV Horizon Sensor Array"
 	arrival_message = "Attention, the radar systems have detected a spacecraft approaching the ship's perimeter."
 	departure_message = "Attention, the radar systems have detected a spacecraft leaving the ship's perimeter. "