Cleans up after /accessory breakup.

NebulaSS13 · Apr 26, 2024 · b629b36 · b629b36
1 parent 108beb7
commit b629b36
Show file tree

Hide file tree

Showing 47 changed files with 813 additions and 747 deletions.
diff --git a/code/datums/trading/traders/ai.dm b/code/datums/trading/traders/ai.dm
@@ -26,14 +26,14 @@ They sell generic supplies and ask for generic supplies.
 		TRADER_BRIBE_REFUSAL     = "You have given me money to stay, however, I am a station. I do not leave.",
 	)
 	possible_wanted_items = list(
-		/obj/item                                          = TRADER_SUBTYPES_ONLY,
-		/obj/item/assembly                                 = TRADER_BLACKLIST_ALL,
-		/obj/item/assembly_holder                          = TRADER_BLACKLIST_ALL,
-		/obj/item/encryptionkey/hacked                     = TRADER_BLACKLIST,
-		/obj/item/tank/onetankbomb                         = TRADER_BLACKLIST,
-		/obj/item/radio                                    = TRADER_BLACKLIST_ALL,
-		/obj/item/modular_computer/pda                     = TRADER_BLACKLIST_SUB,
-		/obj/item/uplink                                   = TRADER_BLACKLIST
+		/obj/item                                  = TRADER_SUBTYPES_ONLY,
+		/obj/item/assembly                         = TRADER_BLACKLIST_ALL,
+		/obj/item/assembly_holder                  = TRADER_BLACKLIST_ALL,
+		/obj/item/encryptionkey/hacked             = TRADER_BLACKLIST,
+		/obj/item/tank/onetankbomb                 = TRADER_BLACKLIST,
+		/obj/item/radio                            = TRADER_BLACKLIST_ALL,
+		/obj/item/modular_computer/pda             = TRADER_BLACKLIST_SUB,
+		/obj/item/uplink                           = TRADER_BLACKLIST
 	)
 	possible_trading_items = list(
 		/obj/item/bag                              = TRADER_SUBTYPES_ONLY,
@@ -50,16 +50,16 @@ They sell generic supplies and ask for generic supplies.
 		/obj/item/briefcase                        = TRADER_THIS_TYPE,
 		/obj/item/box/fancy                        = TRADER_SUBTYPES_ONLY,
 		/obj/item/laundry_basket                   = TRADER_THIS_TYPE,
-		/obj/item/secure_storage/briefcase                 = TRADER_THIS_TYPE,
+		/obj/item/secure_storage/briefcase         = TRADER_THIS_TYPE,
 		/obj/item/plants                           = TRADER_THIS_TYPE,
 		/obj/item/ore                              = TRADER_THIS_TYPE,
 		/obj/item/toolbox                          = TRADER_ALL,
 		/obj/item/wallet                           = TRADER_THIS_TYPE,
 		/obj/item/photo_album                      = TRADER_THIS_TYPE,
-		/obj/item/clothing/glasses                         = TRADER_SUBTYPES_ONLY,
-		/obj/item/clothing/glasses/hud                     = TRADER_BLACKLIST_ALL,
-		/obj/item/clothing/glasses/blindfold/tape          = TRADER_BLACKLIST,
-		/obj/item/clothing/glasses/chameleon               = TRADER_BLACKLIST
+		/obj/item/clothing/glasses                 = TRADER_SUBTYPES_ONLY,
+		/obj/item/clothing/glasses/hud             = TRADER_BLACKLIST_ALL,
+		/obj/item/clothing/glasses/blindfold/tape  = TRADER_BLACKLIST,
+		/obj/item/clothing/glasses/chameleon       = TRADER_BLACKLIST
 	)
 
 	insult_drop = 0
@@ -97,25 +97,25 @@ They sell generic supplies and ask for generic supplies.
 	origin = "Manifacturing Beacon"
 
 	possible_trading_items = list(
-		/obj/structure/aicore            = TRADER_THIS_TYPE,
-		/obj/structure/girder            = TRADER_THIS_TYPE,
-		/obj/structure/grille            = TRADER_THIS_TYPE,
-		/obj/structure/mopbucket         = TRADER_THIS_TYPE,
-		/obj/structure/ore_box           = TRADER_THIS_TYPE,
-		/obj/structure/coatrack          = TRADER_THIS_TYPE,
-		/obj/structure/bookcase          = TRADER_THIS_TYPE,
-		/obj/item/bee_pack               = TRADER_THIS_TYPE,
-		/obj/item/bee_smoker             = TRADER_THIS_TYPE,
-		/obj/item/beehive_assembly       = TRADER_THIS_TYPE,
-		/obj/item/glass_jar              = TRADER_THIS_TYPE,
-		/obj/item/honey_frame            = TRADER_THIS_TYPE,
-		/obj/item/target                 = TRADER_ALL,
-		/obj/structure/tank_rack         = TRADER_SUBTYPES_ONLY,
-		/obj/structure/filing_cabinet    = TRADER_THIS_TYPE,
-		/obj/structure/safe              = TRADER_THIS_TYPE,
-		/obj/structure/plushie           = TRADER_SUBTYPES_ONLY,
-		/obj/structure/sign              = TRADER_SUBTYPES_ONLY,
-		/obj/structure/sign/double       = TRADER_BLACKLIST_ALL,
+		/obj/structure/aicore             = TRADER_THIS_TYPE,
+		/obj/structure/girder             = TRADER_THIS_TYPE,
+		/obj/structure/grille             = TRADER_THIS_TYPE,
+		/obj/structure/mopbucket          = TRADER_THIS_TYPE,
+		/obj/structure/ore_box            = TRADER_THIS_TYPE,
+		/obj/structure/coatrack           = TRADER_THIS_TYPE,
+		/obj/structure/bookcase           = TRADER_THIS_TYPE,
+		/obj/item/bee_pack                = TRADER_THIS_TYPE,
+		/obj/item/bee_smoker              = TRADER_THIS_TYPE,
+		/obj/item/beehive_assembly        = TRADER_THIS_TYPE,
+		/obj/item/glass_jar               = TRADER_THIS_TYPE,
+		/obj/item/honey_frame             = TRADER_THIS_TYPE,
+		/obj/item/target                  = TRADER_ALL,
+		/obj/structure/tank_rack          = TRADER_SUBTYPES_ONLY,
+		/obj/structure/filing_cabinet     = TRADER_THIS_TYPE,
+		/obj/structure/safe               = TRADER_THIS_TYPE,
+		/obj/structure/plushie            = TRADER_SUBTYPES_ONLY,
+		/obj/structure/sign               = TRADER_SUBTYPES_ONLY,
+		/obj/structure/sign/double        = TRADER_BLACKLIST_ALL,
 		/obj/structure/sign/plaque/golden = TRADER_BLACKLIST_ALL,
-		/obj/structure/sign/poster       = TRADER_BLACKLIST
+		/obj/structure/sign/poster        = TRADER_BLACKLIST
 	)
diff --git a/code/datums/trading/traders/food.dm b/code/datums/trading/traders/food.dm
@@ -13,7 +13,9 @@
 	)
 	trade_flags = TRADER_MONEY
 	possible_wanted_items = list() //They are a pizza shop, not a bargainer.
-	possible_trading_items = list(/obj/item/chems/food/sliceable/pizza = TRADER_SUBTYPES_ONLY)
+	possible_trading_items = list(
+		/obj/item/chems/food/sliceable/pizza = TRADER_SUBTYPES_ONLY
+	)
 
 	speech = list(
 		TRADER_HAIL_GENERIC      = "Hello! Welcome to " + TRADER_TOKEN_ORIGIN + ", may I take your order?",

diff --git a/code/datums/trading/traders/goods.dm b/code/datums/trading/traders/goods.dm
@@ -43,7 +43,7 @@
 		/obj/item/energy_blade/sword/toy = TRADER_THIS_TYPE,
 		/obj/item/toy/bosunwhistle       = TRADER_THIS_TYPE,
 		/obj/item/board                  = TRADER_THIS_TYPE,
-		/obj/item/box/checkers   = TRADER_ALL,
+		/obj/item/box/checkers           = TRADER_ALL,
 		/obj/item/deck                   = TRADER_SUBTYPES_ONLY,
 		/obj/item/pack                   = TRADER_SUBTYPES_ONLY,
 		/obj/item/dice                   = TRADER_ALL,
@@ -174,34 +174,38 @@
 		"Space Fashion"
 	)
 	possible_trading_items = list(
-		/obj/item/clothing/accessory                 = TRADER_ALL,
-		/obj/item/clothing/badge                     = TRADER_BLACKLIST_ALL,
-		/obj/item/clothing/webbing/holster = TRADER_BLACKLIST_ALL,
-		/obj/item/clothing/medal                     = TRADER_BLACKLIST_ALL,
-		/obj/item/clothing/webbing         = TRADER_BLACKLIST_ALL,
-		/obj/item/clothing/gloves                    = TRADER_SUBTYPES_ONLY,
-		/obj/item/clothing/gloves/lightrig           = TRADER_BLACKLIST_ALL,
-		/obj/item/clothing/gloves/rig                = TRADER_BLACKLIST_ALL,
-		/obj/item/clothing/gloves/thick/swat         = TRADER_BLACKLIST,
-		/obj/item/clothing/gloves/chameleon          = TRADER_BLACKLIST,
-		/obj/item/clothing/head                      = TRADER_SUBTYPES_ONLY,
-		/obj/item/clothing/head/HoS                  = TRADER_BLACKLIST_ALL,
-		/obj/item/clothing/head/bio_hood             = TRADER_BLACKLIST_ALL,
-		/obj/item/clothing/head/bomb_hood            = TRADER_BLACKLIST_ALL,
-		/obj/item/clothing/head/caphat               = TRADER_BLACKLIST_ALL,
-		/obj/item/clothing/head/centhat              = TRADER_BLACKLIST,
-		/obj/item/clothing/head/chameleon            = TRADER_BLACKLIST,
-		/obj/item/clothing/head/collectable          = TRADER_BLACKLIST,
-		/obj/item/clothing/head/culthood             = TRADER_BLACKLIST_ALL,
-		/obj/item/clothing/head/helmet               = TRADER_BLACKLIST_ALL,
-		/obj/item/clothing/head/lightrig             = TRADER_BLACKLIST_ALL,
-		/obj/item/clothing/head/radiation            = TRADER_BLACKLIST,
-		/obj/item/clothing/head/warden               = TRADER_BLACKLIST,
-		/obj/item/clothing/head/welding              = TRADER_BLACKLIST
+		/obj/item/clothing/neck                       = TRADER_ALL,
+		/obj/item/clothing/suit/jacket                = TRADER_ALL,
+		/obj/item/clothing/suit/robe                  = TRADER_ALL,
+		/obj/item/clothing/shoes/legbrace             = TRADER_ALL,
+		/obj/item/clothing/shoes/kneepads             = TRADER_ALL,
+		/obj/item/clothing/armor_attachment/tag       = TRADER_ALL,
+		/obj/item/clothing/armor_attachment/helmcover = TRADER_ALL,
+		/obj/item/clothing/badge                      = TRADER_BLACKLIST_ALL,
+		/obj/item/clothing/medal                      = TRADER_BLACKLIST_ALL,
+		/obj/item/clothing/webbing                    = TRADER_BLACKLIST_ALL,
+		/obj/item/clothing/webbing/holster            = TRADER_BLACKLIST_ALL,
+		/obj/item/clothing/gloves                     = TRADER_SUBTYPES_ONLY,
+		/obj/item/clothing/gloves/lightrig            = TRADER_BLACKLIST_ALL,
+		/obj/item/clothing/gloves/rig                 = TRADER_BLACKLIST_ALL,
+		/obj/item/clothing/gloves/thick/swat          = TRADER_BLACKLIST,
+		/obj/item/clothing/gloves/chameleon           = TRADER_BLACKLIST,
+		/obj/item/clothing/head                       = TRADER_SUBTYPES_ONLY,
+		/obj/item/clothing/head/HoS                   = TRADER_BLACKLIST_ALL,
+		/obj/item/clothing/head/bio_hood              = TRADER_BLACKLIST_ALL,
+		/obj/item/clothing/head/bomb_hood             = TRADER_BLACKLIST_ALL,
+		/obj/item/clothing/head/caphat                = TRADER_BLACKLIST_ALL,
+		/obj/item/clothing/head/centhat               = TRADER_BLACKLIST,
+		/obj/item/clothing/head/chameleon             = TRADER_BLACKLIST,
+		/obj/item/clothing/head/collectable           = TRADER_BLACKLIST,
+		/obj/item/clothing/head/culthood              = TRADER_BLACKLIST_ALL,
+		/obj/item/clothing/head/helmet                = TRADER_BLACKLIST_ALL,
+		/obj/item/clothing/head/lightrig              = TRADER_BLACKLIST_ALL,
+		/obj/item/clothing/head/radiation             = TRADER_BLACKLIST,
+		/obj/item/clothing/head/warden                = TRADER_BLACKLIST,
+		/obj/item/clothing/head/welding               = TRADER_BLACKLIST
 	)
 
-
-
 /*
 Sells devices, odds and ends, and medical stuff
 */
@@ -378,20 +382,20 @@ Sells devices, odds and ends, and medical stuff
 	)
 
 	possible_wanted_items = list(
-		/obj/item/chems/drinks/bottle           = TRADER_THIS_TYPE,
-		/obj/item/organ/internal/liver          = TRADER_THIS_TYPE,
-		/obj/item/organ/internal/kidneys        = TRADER_THIS_TYPE,
-		/obj/item/organ/internal/lungs          = TRADER_THIS_TYPE,
-		/obj/item/organ/internal/heart          = TRADER_THIS_TYPE,
-		/obj/item/box/fancy/cigarettes  = TRADER_ALL
+		/obj/item/chems/drinks/bottle    = TRADER_THIS_TYPE,
+		/obj/item/organ/internal/liver   = TRADER_THIS_TYPE,
+		/obj/item/organ/internal/kidneys = TRADER_THIS_TYPE,
+		/obj/item/organ/internal/lungs   = TRADER_THIS_TYPE,
+		/obj/item/organ/internal/heart   = TRADER_THIS_TYPE,
+		/obj/item/box/fancy/cigarettes   = TRADER_ALL
 	)
 
 	possible_trading_items = list(
-		/obj/item/pill_bottle           = TRADER_SUBTYPES_ONLY,
-		/obj/item/firstaid/fire         = TRADER_THIS_TYPE,
-		/obj/item/firstaid/toxin        = TRADER_THIS_TYPE,
-		/obj/item/firstaid/adv          = TRADER_THIS_TYPE,
-		/obj/item/box/bloodpacks        = TRADER_THIS_TYPE,
+		/obj/item/pill_bottle                   = TRADER_SUBTYPES_ONLY,
+		/obj/item/firstaid/fire                 = TRADER_THIS_TYPE,
+		/obj/item/firstaid/toxin                = TRADER_THIS_TYPE,
+		/obj/item/firstaid/adv                  = TRADER_THIS_TYPE,
+		/obj/item/box/bloodpacks                = TRADER_THIS_TYPE,
 		/obj/item/chems/ivbag                   = TRADER_SUBTYPES_ONLY,
 		/obj/item/retractor                     = TRADER_THIS_TYPE,
 		/obj/item/hemostat                      = TRADER_THIS_TYPE,
@@ -447,7 +451,7 @@ Sells devices, odds and ends, and medical stuff
 		/obj/machinery/mining/drill                                     = TRADER_THIS_TYPE,
 		/obj/machinery/mining/brace                                     = TRADER_THIS_TYPE,
 		/obj/machinery/floodlight                                       = TRADER_THIS_TYPE,
-		/obj/item/box/greenglowsticks                           = TRADER_THIS_TYPE,
+		/obj/item/box/greenglowsticks                                   = TRADER_THIS_TYPE,
 		/obj/item/clothing/suit/space/void/engineering/salvage/prepared = TRADER_THIS_TYPE,
 		/obj/item/stack/material/puck/mapped/uranium/ten                = TRADER_THIS_TYPE,
 		/obj/item/stack/material/sheet/reinforced/mapped/plasteel/fifty = TRADER_THIS_TYPE,

diff --git a/code/datums/trading/traders/misc.dm b/code/datums/trading/traders/misc.dm
@@ -111,7 +111,7 @@
 		/obj/item/clothing/shoes/clown_shoes       = TRADER_THIS_TYPE,
 		/obj/item/clothing/under/clown             = TRADER_THIS_TYPE,
 		/obj/item/stamp/clown                      = TRADER_THIS_TYPE,
-		/obj/item/backpack/clown           = TRADER_THIS_TYPE,
+		/obj/item/backpack/clown                   = TRADER_THIS_TYPE,
 		/obj/item/bananapeel                       = TRADER_THIS_TYPE,
 		/obj/item/gun/launcher/money               = TRADER_THIS_TYPE,
 		/obj/item/chems/food/pie                   = TRADER_THIS_TYPE,

diff --git a/code/datums/trading/traders/weaponry.dm b/code/datums/trading/traders/weaponry.dm
@@ -26,15 +26,15 @@
 	)
 
 	possible_trading_items = list(
-		/obj/item/gun/projectile/pistol/holdout      = TRADER_ALL,
-		/obj/item/gun/projectile/shotgun/pump        = TRADER_SUBTYPES_ONLY,
-		/obj/item/ammo_magazine                      = TRADER_SUBTYPES_ONLY,
-		/obj/item/ammo_magazine/rifle/empty          = TRADER_BLACKLIST,
-		/obj/item/ammo_magazine/pistol/small/empty   = TRADER_BLACKLIST,
-		/obj/item/ammo_magazine/pistol/empty         = TRADER_BLACKLIST,
-		/obj/item/ammo_magazine/box/pistol/empty     = TRADER_BLACKLIST,
-		/obj/item/ammo_magazine/smg/empty            = TRADER_BLACKLIST,
-		/obj/item/clothing/webbing/holster = TRADER_ALL
+		/obj/item/gun/projectile/pistol/holdout    = TRADER_ALL,
+		/obj/item/gun/projectile/shotgun/pump      = TRADER_SUBTYPES_ONLY,
+		/obj/item/ammo_magazine                    = TRADER_SUBTYPES_ONLY,
+		/obj/item/ammo_magazine/rifle/empty        = TRADER_BLACKLIST,
+		/obj/item/ammo_magazine/pistol/small/empty = TRADER_BLACKLIST,
+		/obj/item/ammo_magazine/pistol/empty       = TRADER_BLACKLIST,
+		/obj/item/ammo_magazine/box/pistol/empty   = TRADER_BLACKLIST,
+		/obj/item/ammo_magazine/smg/empty          = TRADER_BLACKLIST,
+		/obj/item/clothing/webbing/holster         = TRADER_ALL
 	)
 
 /datum/trader/ship/egunshop
@@ -65,15 +65,15 @@
 	)
 
 	possible_trading_items = list(
-		/obj/item/gun/energy/taser                   = TRADER_THIS_TYPE,
-		/obj/item/gun/energy/xray                    = TRADER_THIS_TYPE,
-		/obj/item/gun/energy/laser                   = TRADER_THIS_TYPE,
-		/obj/item/gun/energy/gun                     = TRADER_THIS_TYPE,
-		/obj/item/cell                               = TRADER_THIS_TYPE,
-		/obj/item/cell/crap                          = TRADER_THIS_TYPE,
-		/obj/item/cell/high                          = TRADER_THIS_TYPE,
-		/obj/item/cell/super                         = TRADER_THIS_TYPE,
-		/obj/item/cell/hyper                         = TRADER_THIS_TYPE,
+		/obj/item/gun/energy/taser         = TRADER_THIS_TYPE,
+		/obj/item/gun/energy/xray          = TRADER_THIS_TYPE,
+		/obj/item/gun/energy/laser         = TRADER_THIS_TYPE,
+		/obj/item/gun/energy/gun           = TRADER_THIS_TYPE,
+		/obj/item/cell                     = TRADER_THIS_TYPE,
+		/obj/item/cell/crap                = TRADER_THIS_TYPE,
+		/obj/item/cell/high                = TRADER_THIS_TYPE,
+		/obj/item/cell/super               = TRADER_THIS_TYPE,
+		/obj/item/cell/hyper               = TRADER_THIS_TYPE,
 		/obj/item/clothing/webbing/holster = TRADER_ALL
 	)
 
@@ -102,5 +102,5 @@
 		/obj/item/gun/projectile/bolt_action/sniper/ant = TRADER_THIS_TYPE,
 		/obj/item/gun/energy/laser/dogan                = TRADER_THIS_TYPE,
 		/obj/item/gun/projectile/automatic/smg/usi      = TRADER_THIS_TYPE,
-		/obj/item/clothing/webbing/holster    = TRADER_ALL
+		/obj/item/clothing/webbing/holster              = TRADER_ALL
 	)
diff --git a/code/game/gamemodes/wizard/servant_items/champion.dm b/code/game/gamemodes/wizard/servant_items/champion.dm
@@ -36,7 +36,9 @@
 	armor = list(
 		ARMOR_MELEE = ARMOR_MELEE_MINOR
 	)
-	starting_accessories = list(/obj/item/clothing/shirt/tunic/blue/champion)
+	starting_accessories = list(
+		/obj/item/clothing/shirt/tunic/blue/champion
+	)
 
 /obj/item/clothing/shoes/jackboots/medievalboots
 	name = "leather boots"

diff --git a/code/game/gamemodes/wizard/servant_items/familiar.dm b/code/game/gamemodes/wizard/servant_items/familiar.dm
@@ -6,7 +6,9 @@
 /obj/item/clothing/pants/familiar
 	name = "familiar's garb"
 	desc = "Some rough leather leggings, reinforced here and there. A hasty job."
-	starting_accessories = list(/obj/item/clothing/shirt/tunic/green/familiar)
+	starting_accessories = list(
+		/obj/item/clothing/shirt/tunic/green/familiar
+	)
 
 /obj/item/clothing/pants/familiar/Initialize()
 	. = ..()

diff --git a/code/game/objects/items/weapons/explosives.dm b/code/game/objects/items/weapons/explosives.dm
@@ -48,7 +48,7 @@
 /obj/item/plastique/afterattack(atom/movable/target, mob/user, flag)
 	if (!flag)
 		return
-	if (ismob(target) || target.storage || istype(target, /obj/item/clothing/webbing/) || istype(target, /obj/item/clothing/under))
+	if (ismob(target) || target.storage || istype(target, /obj/item/clothing/webbing) || istype(target, /obj/item/clothing/under))
 		return
 	if(isturf(target))
 		var/turf/target_turf = target