From aeb27e21e1d1954c7d7366eb944c33d623b8a62e Mon Sep 17 00:00:00 2001
From: Fluffy <65877598+FluffyGhoster@users.noreply.github.com>
Date: Mon, 3 Jun 2024 01:13:31 +0200
Subject: [PATCH] Fixed vars getting set twice in the same class (#19294)
Fixed vars getting set twice in the same class
---
code/__DEFINES/access.dm | 1 +
code/datums/outfits/ert/biesel.dm | 3 +-
code/datums/outfits/ert/fsf.dm | 3 +-
code/game/antagonist/station/renegade.dm | 5 +-
.../technomancer/spells/audible_deception.dm | 3 +-
code/game/jobs/job/ship_crew.dm | 1 -
code/game/machinery/computer/camera.dm | 1 -
code/game/machinery/computer/guestpass.dm | 3 +-
.../objects/items/devices/radio/headset.dm | 1 -
.../objects/items/stacks/sheets/leather.dm | 3 +-
.../objects/items/weapons/material/kitchen.dm | 3 +-
code/game/objects/structures/grille.dm | 3 +-
.../structures/stool_bed_chair_nest/stools.dm | 5 +-
code/game/objects/structures/window.dm | 3 +-
code/game/turfs/simulated/wall_types.dm | 1 -
code/modules/background/citizenship/human.dm | 1 -
code/modules/battlemonsters/datum_monsters.dm | 3 +-
code/modules/clothing/head/helmet.dm | 1 -
.../clothing/spacesuits/rig/suits/alien.dm | 6 +-
.../clothing/spacesuits/rig/suits/skrell.dm | 3 +-
.../clothing/spacesuits/rig/suits/station.dm | 1 -
code/modules/clothing/spacesuits/void/misc.dm | 1 -
code/modules/clothing/suits/modular_armor.dm | 1 -
code/modules/clothing/suits/utility.dm | 6 +-
code/modules/clothing/suits/wiz_robe.dm | 1 -
code/modules/clothing/suits/xeno/tajara.dm | 1 -
.../clothing/under/accessories/armor.dm | 2 -
.../clothing/under/accessories/lockets.dm | 3 +-
.../clothing/under/accessories/storage.dm | 1 -
code/modules/clothing/under/jobs/civilian.dm | 1 -
.../recipes/cultural/recipes_skrell.dm | 1 -
.../hydroponics/seed_datums/vegetables.dm | 1 -
code/modules/materials/materials.dm | 2 -
code/modules/mining/mine_items.dm | 1 -
.../abstract/new_player/sprite_accessories.dm | 1 -
code/modules/mob/language/station.dm | 1 -
.../station/tajara/tajaran_subspecies.dm | 2 +-
.../mob/living/carbon/human/unarmed_attack.dm | 3 +-
.../living/simple_animal/friendly/adhomai.dm | 2 -
.../mob/living/simple_animal/friendly/cat.dm | 1 -
.../mob/living/simple_animal/friendly/crab.dm | 1 -
.../mob/living/simple_animal/friendly/fish.dm | 2 -
.../living/simple_animal/friendly/moghes.dm | 3 +-
.../living/simple_animal/friendly/mushroom.dm | 1 -
.../living/simple_animal/hostile/faithless.dm | 3 +-
.../simple_animal/hostile/giant_spider.dm | 3 +-
.../simple_animal/hostile/retaliate/clown.dm | 3 +-
.../mob/living/simple_animal/parrot.dm | 3 +-
.../modules/mob/living/simple_animal/shade.dm | 3 +-
code/modules/organs/subtypes/diona.dm | 6 +-
.../projectiles/guns/energy/blaster.dm | 1 -
.../projectiles/guns/projectile/automatic.dm | 7 +--
.../projectiles/guns/projectile/dartgun.dm | 1 -
.../projectiles/guns/projectile/rifle.dm | 3 +-
.../Chemistry-Reagents-Dispenser.dm | 1 -
.../Chemistry-Reagents-Food-Drinks.dm | 7 ---
.../Chemistry-Reagents-Medicine.dm | 3 +-
.../reagents/reagent_containers/food/cans.dm | 1 -
.../reagent_containers/food/drinks/bottle.dm | 4 +-
.../reagent_containers/food/snacks/breads.dm | 1 -
.../food/snacks/confections.dm | 1 -
.../reagents/reagent_containers/inhaler.dm | 1 -
.../spell_list/self/conjure/radiant_aura.dm | 3 +-
code/modules/vehicles/bike.dm | 1 -
.../fluffyghost-fixdoublevarsettings.yml | 58 +++++++++++++++++++
maps/_common/areas/station/security.dm | 1 -
maps/aurora/code/aurora_lifts.dm | 4 --
maps/aurora/code/aurora_shuttles.dm | 2 -
.../abandoned_diner/abandoned_diner.dm | 1 -
.../abandoned_industrial_station_.dm | 1 -
.../abandoned_propellant_depot_.dm | 1 -
.../orion/orion_automated_station.dm | 1 -
.../coc/coc_scarab/coc_scarab_ghostroles.dm | 1 -
.../coc_surveyor/coc_surveyor_ghostroles.dm | 1 -
.../gadpathur_patrol_ghostroles.dm | 1 -
.../einstein_shuttle/einstein_shuttle.dm | 1 -
.../adhomai/adhomai_sole_rock_nomad.dm | 1 -
.../code/sccv_horizon_shuttles.dm | 2 -
78 files changed, 93 insertions(+), 132 deletions(-)
create mode 100644 html/changelogs/fluffyghost-fixdoublevarsettings.yml
diff --git a/code/__DEFINES/access.dm b/code/__DEFINES/access.dm
index 9f586864e90..167dbe7a2f7 100644
--- a/code/__DEFINES/access.dm
+++ b/code/__DEFINES/access.dm
@@ -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"
diff --git a/code/datums/outfits/ert/biesel.dm b/code/datums/outfits/ert/biesel.dm
index 3a66b67f492..0e2684ec834 100644
--- a/code/datums/outfits/ert/biesel.dm
+++ b/code/datums/outfits/ert/biesel.dm
@@ -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,
diff --git a/code/datums/outfits/ert/fsf.dm b/code/datums/outfits/ert/fsf.dm
index b5e37cbbf87..e1d13eff328 100644
--- a/code/datums/outfits/ert/fsf.dm
+++ b/code/datums/outfits/ert/fsf.dm
@@ -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(
diff --git a/code/game/antagonist/station/renegade.dm b/code/game/antagonist/station/renegade.dm
index c65b197e813..97ef184f47c 100644
--- a/code/game/antagonist/station/renegade.dm
+++ b/code/game/antagonist/station/renegade.dm
@@ -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
diff --git a/code/game/gamemodes/technomancer/spells/audible_deception.dm b/code/game/gamemodes/technomancer/spells/audible_deception.dm
index 46c3e29a3a4..0170ebd790d 100644
--- a/code/game/gamemodes/technomancer/spells/audible_deception.dm
+++ b/code/game/gamemodes/technomancer/spells/audible_deception.dm
@@ -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
diff --git a/code/game/jobs/job/ship_crew.dm b/code/game/jobs/job/ship_crew.dm
index 3fa8b5d90e9..a76c97d52c6 100644
--- a/code/game/jobs/job/ship_crew.dm
+++ b/code/game/jobs/job/ship_crew.dm
@@ -69,5 +69,4 @@
access = list()
minimal_access = list()
outfit = /obj/outfit/job/visitor/passenger
- blacklisted_species = null
blacklisted_species = list(SPECIES_VAURCA_BREEDER)
diff --git a/code/game/machinery/computer/camera.dm b/code/game/machinery/computer/camera.dm
index ad17b4bf86f..eb70597f227 100644
--- a/code/game/machinery/computer/camera.dm
+++ b/code/game/machinery/computer/camera.dm
@@ -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"
diff --git a/code/game/machinery/computer/guestpass.dm b/code/game/machinery/computer/guestpass.dm
index 9b4331e4fc0..441b01107d3 100644
--- a/code/game/machinery/computer/guestpass.dm
+++ b/code/game/machinery/computer/guestpass.dm
@@ -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
diff --git a/code/game/objects/items/devices/radio/headset.dm b/code/game/objects/items/devices/radio/headset.dm
index f29f4ae0e87..4ee8c5f915e 100644
--- a/code/game/objects/items/devices/radio/headset.dm
+++ b/code/game/objects/items/devices/radio/headset.dm
@@ -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
diff --git a/code/game/objects/items/stacks/sheets/leather.dm b/code/game/objects/items/stacks/sheets/leather.dm
index 29ff4f3215c..36ea18f4833 100644
--- a/code/game/objects/items/stacks/sheets/leather.dm
+++ b/code/game/objects/items/stacks/sheets/leather.dm
@@ -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.
diff --git a/code/game/objects/items/weapons/material/kitchen.dm b/code/game/objects/items/weapons/material/kitchen.dm
index d7241c29b53..4e8b2a09203 100644
--- a/code/game/objects/items/weapons/material/kitchen.dm
+++ b/code/game/objects/items/weapons/material/kitchen.dm
@@ -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
diff --git a/code/game/objects/structures/grille.dm b/code/game/objects/structures/grille.dm
index 48309cea518..dcbad401da1 100644
--- a/code/game/objects/structures/grille.dm
+++ b/code/game/objects/structures/grille.dm
@@ -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
diff --git a/code/game/objects/structures/stool_bed_chair_nest/stools.dm b/code/game/objects/structures/stool_bed_chair_nest/stools.dm
index 4d388b96112..e02ae9b38b0 100644
--- a/code/game/objects/structures/stool_bed_chair_nest/stools.dm
+++ b/code/game/objects/structures/stool_bed_chair_nest/stools.dm
@@ -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
diff --git a/code/game/objects/structures/window.dm b/code/game/objects/structures/window.dm
index a14d696c64a..043cc6ae88c 100644
--- a/code/game/objects/structures/window.dm
+++ b/code/game/objects/structures/window.dm
@@ -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
diff --git a/code/game/turfs/simulated/wall_types.dm b/code/game/turfs/simulated/wall_types.dm
index 7f36597094c..38fe7d6be92 100644
--- a/code/game/turfs/simulated/wall_types.dm
+++ b/code/game/turfs/simulated/wall_types.dm
@@ -1,5 +1,4 @@
/turf/simulated/wall/r_wall
- icon_state = "map_dark"
desc_info = "You can deconstruct this by with the following steps:
\
Cut the outer grill with wirecutters, then unscrew them.
\
Slice the cover with a welder, then pry it off with a crowbar.
\
diff --git a/code/modules/background/citizenship/human.dm b/code/modules/background/citizenship/human.dm
index 5657e9a9271..460d7d23bbc 100644
--- a/code/modules/background/citizenship/human.dm
+++ b/code/modules/background/citizenship/human.dm
@@ -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(
diff --git a/code/modules/battlemonsters/datum_monsters.dm b/code/modules/battlemonsters/datum_monsters.dm
index 8e1c39cdff8..1a7e13ff6fc 100644
--- a/code/modules/battlemonsters/datum_monsters.dm
+++ b/code/modules/battlemonsters/datum_monsters.dm
@@ -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
diff --git a/code/modules/clothing/head/helmet.dm b/code/modules/clothing/head/helmet.dm
index d216f2e2fd2..15bf18bcce2 100644
--- a/code/modules/clothing/head/helmet.dm
+++ b/code/modules/clothing/head/helmet.dm
@@ -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,
diff --git a/code/modules/clothing/spacesuits/rig/suits/alien.dm b/code/modules/clothing/spacesuits/rig/suits/alien.dm
index eb17dae3ba6..e7f30639c5d 100644
--- a/code/modules/clothing/spacesuits/rig/suits/alien.dm
+++ b/code/modules/clothing/spacesuits/rig/suits/alien.dm
@@ -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)
diff --git a/code/modules/clothing/spacesuits/rig/suits/skrell.dm b/code/modules/clothing/spacesuits/rig/suits/skrell.dm
index f276ecf2169..b9afd34d7fe 100644
--- a/code/modules/clothing/spacesuits/rig/suits/skrell.dm
+++ b/code/modules/clothing/spacesuits/rig/suits/skrell.dm
@@ -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
diff --git a/code/modules/clothing/spacesuits/rig/suits/station.dm b/code/modules/clothing/spacesuits/rig/suits/station.dm
index d787f9c2115..f6c746a8118 100644
--- a/code/modules/clothing/spacesuits/rig/suits/station.dm
+++ b/code/modules/clothing/spacesuits/rig/suits/station.dm
@@ -47,7 +47,6 @@
req_one_access = list()
helm_type = null
- suit_type = null
glove_type = null
boot_type = null
diff --git a/code/modules/clothing/spacesuits/void/misc.dm b/code/modules/clothing/spacesuits/void/misc.dm
index e3a98f19506..00e69ef6b11 100644
--- a/code/modules/clothing/spacesuits/void/misc.dm
+++ b/code/modules/clothing/spacesuits/void/misc.dm
@@ -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'
diff --git a/code/modules/clothing/suits/modular_armor.dm b/code/modules/clothing/suits/modular_armor.dm
index 46d99d3aa48..1e695d06005 100644
--- a/code/modules/clothing/suits/modular_armor.dm
+++ b/code/modules/clothing/suits/modular_armor.dm
@@ -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,
diff --git a/code/modules/clothing/suits/utility.dm b/code/modules/clothing/suits/utility.dm
index 8e6673f5ab9..308db149fe2 100644
--- a/code/modules/clothing/suits/utility.dm
+++ b/code/modules/clothing/suits/utility.dm
@@ -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
diff --git a/code/modules/clothing/suits/wiz_robe.dm b/code/modules/clothing/suits/wiz_robe.dm
index cbfadf31cf7..1e37a193ee9 100644
--- a/code/modules/clothing/suits/wiz_robe.dm
+++ b/code/modules/clothing/suits/wiz_robe.dm
@@ -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"
diff --git a/code/modules/clothing/suits/xeno/tajara.dm b/code/modules/clothing/suits/xeno/tajara.dm
index fc51a761c6e..6dab220e409 100644
--- a/code/modules/clothing/suits/xeno/tajara.dm
+++ b/code/modules/clothing/suits/xeno/tajara.dm
@@ -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"
diff --git a/code/modules/clothing/under/accessories/armor.dm b/code/modules/clothing/under/accessories/armor.dm
index 85706343ae0..c30c5558b17 100644
--- a/code/modules/clothing/under/accessories/armor.dm
+++ b/code/modules/clothing/under/accessories/armor.dm
@@ -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'
diff --git a/code/modules/clothing/under/accessories/lockets.dm b/code/modules/clothing/under/accessories/lockets.dm
index 8b67ff02b90..e41674ae654 100644
--- a/code/modules/clothing/under/accessories/lockets.dm
+++ b/code/modules/clothing/under/accessories/lockets.dm
@@ -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.
diff --git a/code/modules/clothing/under/accessories/storage.dm b/code/modules/clothing/under/accessories/storage.dm
index 6cea6456756..24236379f76 100644
--- a/code/modules/clothing/under/accessories/storage.dm
+++ b/code/modules/clothing/under/accessories/storage.dm
@@ -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"
diff --git a/code/modules/clothing/under/jobs/civilian.dm b/code/modules/clothing/under/jobs/civilian.dm
index 876b11f30e8..1b7eff31519 100644
--- a/code/modules/clothing/under/jobs/civilian.dm
+++ b/code/modules/clothing/under/jobs/civilian.dm
@@ -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"
diff --git a/code/modules/cooking/recipes/cultural/recipes_skrell.dm b/code/modules/cooking/recipes/cultural/recipes_skrell.dm
index 4c101881017..210d65af470 100644
--- a/code/modules/cooking/recipes/cultural/recipes_skrell.dm
+++ b/code/modules/cooking/recipes/cultural/recipes_skrell.dm
@@ -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
diff --git a/code/modules/hydroponics/seed_datums/vegetables.dm b/code/modules/hydroponics/seed_datums/vegetables.dm
index 6d691499bef..9c127937351 100644
--- a/code/modules/hydroponics/seed_datums/vegetables.dm
+++ b/code/modules/hydroponics/seed_datums/vegetables.dm
@@ -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()
..()
diff --git a/code/modules/materials/materials.dm b/code/modules/materials/materials.dm
index 81f6f87ae84..3c8e3f6c71d 100644
--- a/code/modules/materials/materials.dm
+++ b/code/modules/materials/materials.dm
@@ -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
diff --git a/code/modules/mining/mine_items.dm b/code/modules/mining/mine_items.dm
index 850baea54e0..443818db490 100644
--- a/code/modules/mining/mine_items.dm
+++ b/code/modules/mining/mine_items.dm
@@ -288,7 +288,6 @@
can_wield = 0
force = 25
- digspeed = 2
digspeed_unwielded = 3
force_unwielded = 20.0
diff --git a/code/modules/mob/abstract/new_player/sprite_accessories.dm b/code/modules/mob/abstract/new_player/sprite_accessories.dm
index c6c06b9f821..f516190b442 100644
--- a/code/modules/mob/abstract/new_player/sprite_accessories.dm
+++ b/code/modules/mob/abstract/new_player/sprite_accessories.dm
@@ -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"
diff --git a/code/modules/mob/language/station.dm b/code/modules/mob/language/station.dm
index 1aa8d03d845..c29b329fecb 100644
--- a/code/modules/mob/language/station.dm
+++ b/code/modules/mob/language/station.dm
@@ -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
diff --git a/code/modules/mob/living/carbon/human/species/station/tajara/tajaran_subspecies.dm b/code/modules/mob/living/carbon/human/species/station/tajara/tajaran_subspecies.dm
index 4d69a29f61b..60181ffb072 100644
--- a/code/modules/mob/living/carbon/human/species/station/tajara/tajaran_subspecies.dm
+++ b/code/modules/mob/living/carbon/human/species/station/tajara/tajaran_subspecies.dm
@@ -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; \
diff --git a/code/modules/mob/living/carbon/human/unarmed_attack.dm b/code/modules/mob/living/carbon/human/unarmed_attack.dm
index eec181b54c6..04288aec5d8 100644
--- a/code/modules/mob/living/carbon/human/unarmed_attack.dm
+++ b/code/modules/mob/living/carbon/human/unarmed_attack.dm
@@ -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"
diff --git a/code/modules/mob/living/simple_animal/friendly/adhomai.dm b/code/modules/mob/living/simple_animal/friendly/adhomai.dm
index 5e49cbfa49a..9f99fe06c1f 100644
--- a/code/modules/mob/living/simple_animal/friendly/adhomai.dm
+++ b/code/modules/mob/living/simple_animal/friendly/adhomai.dm
@@ -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,
diff --git a/code/modules/mob/living/simple_animal/friendly/cat.dm b/code/modules/mob/living/simple_animal/friendly/cat.dm
index 80e0cd29e10..100e844b72a 100644
--- a/code/modules/mob/living/simple_animal/friendly/cat.dm
+++ b/code/modules/mob/living/simple_animal/friendly/cat.dm
@@ -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"
diff --git a/code/modules/mob/living/simple_animal/friendly/crab.dm b/code/modules/mob/living/simple_animal/friendly/crab.dm
index 501e4e40448..6363e403cd6 100644
--- a/code/modules/mob/living/simple_animal/friendly/crab.dm
+++ b/code/modules/mob/living/simple_animal/friendly/crab.dm
@@ -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
diff --git a/code/modules/mob/living/simple_animal/friendly/fish.dm b/code/modules/mob/living/simple_animal/friendly/fish.dm
index aa230df4dae..5c6a935a425 100644
--- a/code/modules/mob/living/simple_animal/friendly/fish.dm
+++ b/code/modules/mob/living/simple_animal/friendly/fish.dm
@@ -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"
diff --git a/code/modules/mob/living/simple_animal/friendly/moghes.dm b/code/modules/mob/living/simple_animal/friendly/moghes.dm
index 70e4a06fd67..a59a51d76fa 100644
--- a/code/modules/mob/living/simple_animal/friendly/moghes.dm
+++ b/code/modules/mob/living/simple_animal/friendly/moghes.dm
@@ -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
diff --git a/code/modules/mob/living/simple_animal/friendly/mushroom.dm b/code/modules/mob/living/simple_animal/friendly/mushroom.dm
index cbde6c1b701..752cb02d7bd 100644
--- a/code/modules/mob/living/simple_animal/friendly/mushroom.dm
+++ b/code/modules/mob/living/simple_animal/friendly/mushroom.dm
@@ -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
diff --git a/code/modules/mob/living/simple_animal/hostile/faithless.dm b/code/modules/mob/living/simple_animal/hostile/faithless.dm
index 0ed293c4d64..93292f859f4 100644
--- a/code/modules/mob/living/simple_animal/hostile/faithless.dm
+++ b/code/modules/mob/living/simple_animal/hostile/faithless.dm
@@ -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"
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 b1759b4bd20..fe6a6bd5778 100644
--- a/code/modules/mob/living/simple_animal/hostile/giant_spider.dm
+++ b/code/modules/mob/living/simple_animal/hostile/giant_spider.dm
@@ -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()
..()
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 d6566e7a9eb..ad2478c7a7b 100644
--- a/code/modules/mob/living/simple_animal/hostile/retaliate/clown.dm
+++ b/code/modules/mob/living/simple_animal/hostile/retaliate/clown.dm
@@ -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
diff --git a/code/modules/mob/living/simple_animal/parrot.dm b/code/modules/mob/living/simple_animal/parrot.dm
index d1694b6a184..efaca594c30 100644
--- a/code/modules/mob/living/simple_animal/parrot.dm
+++ b/code/modules/mob/living/simple_animal/parrot.dm
@@ -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
diff --git a/code/modules/mob/living/simple_animal/shade.dm b/code/modules/mob/living/simple_animal/shade.dm
index 618a4226a10..e519dafe25b 100644
--- a/code/modules/mob/living/simple_animal/shade.dm
+++ b/code/modules/mob/living/simple_animal/shade.dm
@@ -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
diff --git a/code/modules/organs/subtypes/diona.dm b/code/modules/organs/subtypes/diona.dm
index 427800d3361..dd51d3cf2eb 100644
--- a/code/modules/organs/subtypes/diona.dm
+++ b/code/modules/organs/subtypes/diona.dm
@@ -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"
diff --git a/code/modules/projectiles/guns/energy/blaster.dm b/code/modules/projectiles/guns/energy/blaster.dm
index 2bbb347b11b..6c9865ba8f4 100644
--- a/code/modules/projectiles/guns/energy/blaster.dm
+++ b/code/modules/projectiles/guns/energy/blaster.dm
@@ -91,7 +91,6 @@
knife_x_offset = 23
knife_y_offset = 13
fire_delay = 25
- w_class = ITEMSIZE_LARGE
accuracy = -3
scoped_accuracy = 4
diff --git a/code/modules/projectiles/guns/projectile/automatic.dm b/code/modules/projectiles/guns/projectile/automatic.dm
index 2bfac99bb02..25e5400e862 100644
--- a/code/modules/projectiles/guns/projectile/automatic.dm
+++ b/code/modules/projectiles/guns/projectile/automatic.dm
@@ -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()
..()
diff --git a/code/modules/projectiles/guns/projectile/dartgun.dm b/code/modules/projectiles/guns/projectile/dartgun.dm
index 653037a9715..c7e0fa65364 100644
--- a/code/modules/projectiles/guns/projectile/dartgun.dm
+++ b/code/modules/projectiles/guns/projectile/dartgun.dm
@@ -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"
diff --git a/code/modules/projectiles/guns/projectile/rifle.dm b/code/modules/projectiles/guns/projectile/rifle.dm
index 3c46c2d7921..0fda74bdb74 100644
--- a/code/modules/projectiles/guns/projectile/rifle.dm
+++ b/code/modules/projectiles/guns/projectile/rifle.dm
@@ -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
diff --git a/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Dispenser.dm b/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Dispenser.dm
index dcf77d1dc43..ce8af4cece9 100644
--- a/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Dispenser.dm
+++ b/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Dispenser.dm
@@ -588,6 +588,5 @@
reagent_state = SOLID
color = "#DCDCDC"
taste_mult = 0 //no taste
- fallback_specific_heat = 18
fallback_specific_heat = 0.859
diff --git a/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm b/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm
index edae4f064cc..b3d94ef784d 100644
--- a/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm
+++ b/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm
@@ -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"
diff --git a/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Medicine.dm b/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Medicine.dm
index c82b7d2a4b0..7e9ce5c7afc 100644
--- a/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Medicine.dm
+++ b/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Medicine.dm
@@ -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.")
diff --git a/code/modules/reagents/reagent_containers/food/cans.dm b/code/modules/reagents/reagent_containers/food/cans.dm
index da476dbae25..bd27ffbe090 100644
--- a/code/modules/reagents/reagent_containers/food/cans.dm
+++ b/code/modules/reagents/reagent_containers/food/cans.dm
@@ -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)
diff --git a/code/modules/reagents/reagent_containers/food/drinks/bottle.dm b/code/modules/reagents/reagent_containers/food/drinks/bottle.dm
index f205f6c6d14..7e1776475fa 100644
--- a/code/modules/reagents/reagent_containers/food/drinks/bottle.dm
+++ b/code/modules/reagents/reagent_containers/food/drinks/bottle.dm
@@ -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)
diff --git a/code/modules/reagents/reagent_containers/food/snacks/breads.dm b/code/modules/reagents/reagent_containers/food/snacks/breads.dm
index 479934b5d51..2601a000179 100644
--- a/code/modules/reagents/reagent_containers/food/snacks/breads.dm
+++ b/code/modules/reagents/reagent_containers/food/snacks/breads.dm
@@ -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"
diff --git a/code/modules/reagents/reagent_containers/food/snacks/confections.dm b/code/modules/reagents/reagent_containers/food/snacks/confections.dm
index 8901e567993..d60d2761557 100644
--- a/code/modules/reagents/reagent_containers/food/snacks/confections.dm
+++ b/code/modules/reagents/reagent_containers/food/snacks/confections.dm
@@ -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()
diff --git a/code/modules/reagents/reagent_containers/inhaler.dm b/code/modules/reagents/reagent_containers/inhaler.dm
index 227e04f5148..40e43c0cd6c 100644
--- a/code/modules/reagents/reagent_containers/inhaler.dm
+++ b/code/modules/reagents/reagent_containers/inhaler.dm
@@ -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)
diff --git a/code/modules/spell_system/spells/spell_list/self/conjure/radiant_aura.dm b/code/modules/spell_system/spells/spell_list/self/conjure/radiant_aura.dm
index 5c9883672f5..88524648157 100644
--- a/code/modules/spell_system/spells/spell_list/self/conjure/radiant_aura.dm
+++ b/code/modules/spell_system/spells/spell_list/self/conjure/radiant_aura.dm
@@ -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)
diff --git a/code/modules/vehicles/bike.dm b/code/modules/vehicles/bike.dm
index 83d12d1f45b..6510906d1f8 100644
--- a/code/modules/vehicles/bike.dm
+++ b/code/modules/vehicles/bike.dm
@@ -409,7 +409,6 @@
icon_state = "snow_on"
bike_icon = "snow"
- land_speed = 2
land_speed = 4
protection_percent = 10
can_hover = FALSE
diff --git a/html/changelogs/fluffyghost-fixdoublevarsettings.yml b/html/changelogs/fluffyghost-fixdoublevarsettings.yml
new file mode 100644
index 00000000000..b66558bea85
--- /dev/null
+++ b/html/changelogs/fluffyghost-fixdoublevarsettings.yml
@@ -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."
diff --git a/maps/_common/areas/station/security.dm b/maps/_common/areas/station/security.dm
index 7ebd52f8221..d817793ef46 100644
--- a/maps/_common/areas/station/security.dm
+++ b/maps/_common/areas/station/security.dm
@@ -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
diff --git a/maps/aurora/code/aurora_lifts.dm b/maps/aurora/code/aurora_lifts.dm
index 4b57708c175..3e039c9840b 100644
--- a/maps/aurora/code/aurora_lifts.dm
+++ b/maps/aurora/code/aurora_lifts.dm
@@ -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"
diff --git a/maps/aurora/code/aurora_shuttles.dm b/maps/aurora/code/aurora_shuttles.dm
index 250558180c1..594abdfe136 100644
--- a/maps/aurora/code/aurora_shuttles.dm
+++ b/maps/aurora/code/aurora_shuttles.dm
@@ -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."
diff --git a/maps/away/away_site/abandoned_diner/abandoned_diner.dm b/maps/away/away_site/abandoned_diner/abandoned_diner.dm
index e45e2c8eb31..090e06506f4 100644
--- a/maps/away/away_site/abandoned_diner/abandoned_diner.dm
+++ b/maps/away/away_site/abandoned_diner/abandoned_diner.dm
@@ -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
diff --git a/maps/away/away_site/abandoned_industrial/abandoned_industrial_station_.dm b/maps/away/away_site/abandoned_industrial/abandoned_industrial_station_.dm
index cb9bf966f34..dd62f005c53 100644
--- a/maps/away/away_site/abandoned_industrial/abandoned_industrial_station_.dm
+++ b/maps/away/away_site/abandoned_industrial/abandoned_industrial_station_.dm
@@ -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
diff --git a/maps/away/away_site/abandoned_propellant_depot/abandoned_propellant_depot_.dm b/maps/away/away_site/abandoned_propellant_depot/abandoned_propellant_depot_.dm
index d5fd582121f..46f14005874 100644
--- a/maps/away/away_site/abandoned_propellant_depot/abandoned_propellant_depot_.dm
+++ b/maps/away/away_site/abandoned_propellant_depot/abandoned_propellant_depot_.dm
@@ -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'
diff --git a/maps/away/away_site/orion/orion_automated_station.dm b/maps/away/away_site/orion/orion_automated_station.dm
index 751ee553809..1d51fa08ed5 100644
--- a/maps/away/away_site/orion/orion_automated_station.dm
+++ b/maps/away/away_site/orion/orion_automated_station.dm
@@ -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
diff --git a/maps/away/ships/coc/coc_scarab/coc_scarab_ghostroles.dm b/maps/away/ships/coc/coc_scarab/coc_scarab_ghostroles.dm
index a63955327c6..08897e1fcc8 100644
--- a/maps/away/ships/coc/coc_scarab/coc_scarab_ghostroles.dm
+++ b/maps/away/ships/coc/coc_scarab/coc_scarab_ghostroles.dm
@@ -15,7 +15,6 @@
assigned_role = "Scarab Salvager"
special_role = "Scarab Salvager"
- respawn_flag = null
culture_restriction = list(/singleton/origin_item/culture/coalition)
diff --git a/maps/away/ships/coc/coc_surveyor/coc_surveyor_ghostroles.dm b/maps/away/ships/coc/coc_surveyor/coc_surveyor_ghostroles.dm
index fd3453513d7..5570ee36037 100644
--- a/maps/away/ships/coc/coc_surveyor/coc_surveyor_ghostroles.dm
+++ b/maps/away/ships/coc/coc_surveyor/coc_surveyor_ghostroles.dm
@@ -16,7 +16,6 @@
assigned_role = "Coalition Surveyor"
special_role = "Coalition Surveyor"
- respawn_flag = null
/obj/outfit/admin/coc_surveyor_crew
name = "Coalition Surveyor"
diff --git a/maps/away/ships/coc/gadpathur_patrol/gadpathur_patrol_ghostroles.dm b/maps/away/ships/coc/gadpathur_patrol/gadpathur_patrol_ghostroles.dm
index 765864741cf..2be45f0d494 100644
--- a/maps/away/ships/coc/gadpathur_patrol/gadpathur_patrol_ghostroles.dm
+++ b/maps/away/ships/coc/gadpathur_patrol/gadpathur_patrol_ghostroles.dm
@@ -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)
diff --git a/maps/away/ships/konyang/einstein_shuttle/einstein_shuttle.dm b/maps/away/ships/konyang/einstein_shuttle/einstein_shuttle.dm
index 81753770946..65db5d1297f 100644
--- a/maps/away/ships/konyang/einstein_shuttle/einstein_shuttle.dm
+++ b/maps/away/ships/konyang/einstein_shuttle/einstein_shuttle.dm
@@ -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
diff --git a/maps/random_ruins/exoplanets/adhomai/adhomai_sole_rock_nomad.dm b/maps/random_ruins/exoplanets/adhomai/adhomai_sole_rock_nomad.dm
index 5a18be64b2e..f2e71ff4973 100644
--- a/maps/random_ruins/exoplanets/adhomai/adhomai_sole_rock_nomad.dm
+++ b/maps/random_ruins/exoplanets/adhomai/adhomai_sole_rock_nomad.dm
@@ -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")
diff --git a/maps/sccv_horizon/code/sccv_horizon_shuttles.dm b/maps/sccv_horizon/code/sccv_horizon_shuttles.dm
index d858e893fa6..5ea3a62bdd1 100644
--- a/maps/sccv_horizon/code/sccv_horizon_shuttles.dm
+++ b/maps/sccv_horizon/code/sccv_horizon_shuttles.dm
@@ -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. "