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

Fixed vars getting set twice in the same class
2026-08-23 04:51:32 +01:00 · 2024-06-02 23:13:31 +00:00
parent 0dc6f03a46
commit aeb27e21e1
78 changed files with 93 additions and 132 deletions
@@ -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