diff --git a/_maps/RandomRuins/BeachRuins/beach_fishing_hut.dmm b/_maps/RandomRuins/BeachRuins/beach_fishing_hut.dmm
index ed6c353d26d7c..ea1a18b11c4be 100644
--- a/_maps/RandomRuins/BeachRuins/beach_fishing_hut.dmm
+++ b/_maps/RandomRuins/BeachRuins/beach_fishing_hut.dmm
@@ -203,7 +203,6 @@
"kj" = (
/obj/structure/closet/cabinet,
/obj/item/pneumatic_cannon/speargun,
-/obj/item/storage/backpack/magspear_quiver,
/obj/item/melee/knife/hunting,
/turf/open/floor/wood,
/area/ruin/beach)
@@ -1051,7 +1050,6 @@
"PB" = (
/obj/structure/closet/cabinet,
/obj/item/pneumatic_cannon/speargun,
-/obj/item/storage/backpack/magspear_quiver,
/obj/item/melee/knife/hunting,
/obj/machinery/light/small/directional/east{
light_color = "#d8b1b1"
diff --git a/code/__DEFINES/species_clothing_defines.dm b/code/__DEFINES/species_clothing_defines.dm
index 937adf6b7cdda..592e2152291e9 100644
--- a/code/__DEFINES/species_clothing_defines.dm
+++ b/code/__DEFINES/species_clothing_defines.dm
@@ -30,6 +30,7 @@
///KEPORI PATHS
#define KEPORI_UNIFORM_PATH 'icons/mob/species/kepori/onmob_uniform_kepori.dmi'
+#define KEPORI_BACK_PATH 'icons/mob/species/kepori/onmob_back_kepori.dmi'
#define KEPORI_SHOES_PATH 'icons/mob/species/kepori/onmob_feet_kepori.dmi'
#define KEPORI_SUIT_PATH 'icons/mob/species/kepori/onmob_suit_kepori.dmi'
#define KEPORI_EARS_PATH 'icons/mob/species/kepori/onmob_ears_kepori.dmi'
diff --git a/code/datums/diseases/gastrolisis.dm b/code/datums/diseases/gastrolisis.dm
index 119ccc0c60e07..e2af13bd67428 100644
--- a/code/datums/diseases/gastrolisis.dm
+++ b/code/datums/diseases/gastrolisis.dm
@@ -38,23 +38,13 @@
"You scream in pain as your eyes are pushed out by your new snail eyes!")
affected_mob.emote("scream")
return
- var/obj/item/shell = affected_mob.get_item_by_slot(ITEM_SLOT_BACK)
- if(!istype(shell, /obj/item/storage/backpack/snail))
- shell = null
- if(!shell && prob(5))
- if(affected_mob.dropItemToGround(affected_mob.get_item_by_slot(ITEM_SLOT_BACK)))
- affected_mob.equip_to_slot_or_del(new /obj/item/storage/backpack/snail(affected_mob), ITEM_SLOT_BACK)
- affected_mob.visible_message("[affected_mob] grows a grotesque shell on their back!", \
- "You scream in pain as a shell pushes itself out from under your skin!")
- affected_mob.emote("scream")
- return
var/obj/item/organ/tongue/tongue = locate(/obj/item/organ/tongue/snail) in affected_mob.internal_organs
if(!tongue && prob(5))
var/obj/item/organ/tongue/snail/new_tongue = new()
new_tongue.Insert(affected_mob)
to_chat(affected_mob, "You feel your speech slow down...")
return
- if(shell && eyes && tongue && prob(5))
+ if(eyes && tongue && prob(5))
affected_mob.set_species(/datum/species/snail)
affected_mob.client?.give_award(/datum/award/achievement/misc/snail, affected_mob)
affected_mob.visible_message("[affected_mob] turns into a snail!", \
@@ -79,8 +69,3 @@
if(eyes)
var/obj/item/organ/eyes/new_eyes = new H.dna.species.mutanteyes ()
new_eyes.Insert(H)
- var/obj/item/storage/backpack/bag = H.get_item_by_slot(ITEM_SLOT_BACK)
- if(istype(bag, /obj/item/storage/backpack/snail))
- bag.emptyStorage()
- H.temporarilyRemoveItemFromInventory(bag, TRUE)
- qdel(bag)
diff --git a/code/game/gamemodes/clown_ops/clown_ops.dm b/code/game/gamemodes/clown_ops/clown_ops.dm
index 1db631f18aa7a..807f238de76b8 100644
--- a/code/game/gamemodes/clown_ops/clown_ops.dm
+++ b/code/game/gamemodes/clown_ops/clown_ops.dm
@@ -32,7 +32,6 @@
shoes = /obj/item/clothing/shoes/clown_shoes/combat
mask = /obj/item/clothing/mask/gas/clown_hat
gloves = /obj/item/clothing/gloves/combat
- back = /obj/item/storage/backpack/clown
ears = /obj/item/radio/headset/syndicate/alt
l_pocket = /obj/item/pinpointer/nuke/syndicate
r_pocket = /obj/item/bikehorn
diff --git a/code/game/objects/items.dm b/code/game/objects/items.dm
index a1302008cf89a..6e2e0def9c5e4 100644
--- a/code/game/objects/items.dm
+++ b/code/game/objects/items.dm
@@ -26,8 +26,7 @@ GLOBAL_VAR_INIT(embedpocalypse, FALSE) // if true, all items will be able to emb
var/supports_variations = null
///If set, kepori wearing this use this instead of their clothing file
- var/kepoi_override_icon
-
+ var/kepori_override_icon
///If set, vox wearing this use this instead of their clothing file
var/vox_override_icon
diff --git a/code/game/objects/items/pneumaticCannon.dm b/code/game/objects/items/pneumaticCannon.dm
index 5108a87136332..9122be0a5d6c3 100644
--- a/code/game/objects/items/pneumaticCannon.dm
+++ b/code/game/objects/items/pneumaticCannon.dm
@@ -326,23 +326,3 @@
/obj/item/pneumatic_cannon/speargun/Initialize()
. = ..()
allowed_typecache = magspear_typecache
-
-/obj/item/storage/backpack/magspear_quiver
- name = "quiver"
- desc = "A quiver for holding magspears."
- icon_state = "quiver"
- item_state = "quiver"
-
-/obj/item/storage/backpack/magspear_quiver/ComponentInitialize()
- . = ..()
- var/datum/component/storage/STR = GetComponent(/datum/component/storage)
- STR.max_items = 20
- STR.max_combined_w_class = 40
- STR.display_numerical_stacking = TRUE
- STR.set_holdable(list(
- /obj/item/throwing_star/magspear
- ))
-
-/obj/item/storage/backpack/magspear_quiver/PopulateContents()
- for(var/i in 1 to 20)
- new /obj/item/throwing_star/magspear(src)
diff --git a/code/game/objects/items/storage/backpack.dm b/code/game/objects/items/storage/backpack.dm
index 0076de0b81557..bc990164ca2cd 100644
--- a/code/game/objects/items/storage/backpack.dm
+++ b/code/game/objects/items/storage/backpack.dm
@@ -16,6 +16,8 @@
desc = "You wear this on your back and put items into it."
icon_state = "backpack"
item_state = "backpack"
+ icon = 'icons/obj/clothing/back/backpacks.dmi'
+ mob_overlay_icon = 'icons/mob/clothing/back/backpacks.dmi'
lefthand_file = 'icons/mob/inhands/equipment/backpack_lefthand.dmi'
righthand_file = 'icons/mob/inhands/equipment/backpack_righthand.dmi'
pickup_sound = "rustle"
@@ -26,7 +28,9 @@
max_integrity = 300
greyscale_icon_state = "backpack"
greyscale_colors = list(list(13, 17), list(12, 17), list(12, 21))
- supports_variations = VOX_VARIATION
+
+ supports_variations = VOX_VARIATION | KEPORI_VARIATION
+ kepori_override_icon = 'icons/mob/clothing/back/backpacks_kepori.dmi'
/obj/item/storage/backpack/ComponentInitialize()
. = ..()
@@ -61,51 +65,12 @@
STR.storage_flags = STORAGE_FLAGS_VOLUME_DEFAULT
STR.max_volume = STORAGE_VOLUME_BAG_OF_HOLDING
-/obj/item/storage/backpack/santabag
- name = "Santa's Gift Bag"
- desc = "Space Santa uses this to deliver presents to all the nice children in space in Christmas! Wow, it's pretty big!"
- icon_state = "giftbag0"
- item_state = "giftbag"
- w_class = WEIGHT_CLASS_BULKY
-
-/obj/item/storage/backpack/santabag/Initialize()
- . = ..()
- regenerate_presents()
-
-/obj/item/storage/backpack/santabag/ComponentInitialize()
- . = ..()
- var/datum/component/storage/STR = GetComponent(/datum/component/storage)
- STR.max_w_class = WEIGHT_CLASS_NORMAL
- STR.max_combined_w_class = 60
-
-/obj/item/storage/backpack/santabag/proc/regenerate_presents()
- addtimer(CALLBACK(src, PROC_REF(regenerate_presents)), 30 SECONDS)
-
- var/mob/M = get(loc, /mob)
- if(!istype(M))
- return
- if(M.mind && HAS_TRAIT(M.mind, TRAIT_CANNOT_OPEN_PRESENTS))
- var/datum/component/storage/STR = GetComponent(/datum/component/storage)
- var/turf/floor = get_turf(src)
- var/obj/item/I = new /obj/item/a_gift/anything(floor)
- if(STR.can_be_inserted(I, stop_messages=TRUE))
- STR.handle_item_insertion(I, prevent_warning=TRUE)
- else
- qdel(I)
-
-
/obj/item/storage/backpack/cultpack
name = "trophy rack"
desc = "It's useful for both carrying extra gear and proudly declaring your insanity."
icon_state = "cultpack"
item_state = "backpack"
-/obj/item/storage/backpack/clown
- name = "Giggles von Honkerton"
- desc = "It's a backpack made by Honk! Co."
- icon_state = "clownpack"
- item_state = "clownpack"
-
/obj/item/storage/backpack/explorer
name = "explorer bag"
desc = "A robust backpack for stashing your loot."
@@ -215,7 +180,6 @@
item_state = "satchel-norm"
greyscale_icon_state = "satchel"
greyscale_colors = list(list(11, 12), list(17, 18), list(10, 11))
- supports_variations = VOX_VARIATION
/obj/item/storage/backpack/satchel/ComponentInitialize()
. = ..()
@@ -226,7 +190,6 @@
/obj/item/storage/backpack/satchel/leather
name = "leather satchel"
desc = "It's a very fancy satchel made with fine leather."
- icon = 'icons/obj/storage.dmi'
icon_state = "satchel"
item_state = "satchel"
@@ -261,12 +224,6 @@
icon_state = "satchel-chem"
item_state = "satchel-chem"
-/obj/item/storage/backpack/satchel/gen
- name = "geneticist satchel"
- desc = "A sterile satchel with geneticist colours."
- icon_state = "satchel-gen"
- item_state = "satchel-gen"
-
/obj/item/storage/backpack/satchel/tox
name = "scientist satchel"
desc = "Useful for holding research materials."
@@ -354,8 +311,6 @@
/obj/item/storage/backpack/messenger
name = "messenger bag"
desc = "A sturdy backpack worn over one shoulder."
- icon = 'icons/obj/storage.dmi'
- mob_overlay_icon = 'icons/mob/clothing/back.dmi'
icon_state = "courierbag"
item_state = "courierbag"
greyscale_icon_state = "satchel"
diff --git a/code/game/objects/items/storage/uplink_kits.dm b/code/game/objects/items/storage/uplink_kits.dm
index 39e533f2a4a36..3ef2d547931a6 100644
--- a/code/game/objects/items/storage/uplink_kits.dm
+++ b/code/game/objects/items/storage/uplink_kits.dm
@@ -146,7 +146,6 @@
if("white_whale_holy_grail") //Unique items that don't appear anywhere else
new /obj/item/pneumatic_cannon/speargun(src)
- new /obj/item/storage/backpack/magspear_quiver(src)
new /obj/item/clothing/suit/space/hardsuit/carp(src)
new /obj/item/clothing/mask/gas/carp(src)
new /obj/item/grenade/spawnergrenade/spesscarp(src)
diff --git a/code/game/objects/structures/crates_lockers/closets/job_closets.dm b/code/game/objects/structures/crates_lockers/closets/job_closets.dm
index 39f65ca53a5bf..b19b0f46c9c31 100644
--- a/code/game/objects/structures/crates_lockers/closets/job_closets.dm
+++ b/code/game/objects/structures/crates_lockers/closets/job_closets.dm
@@ -249,8 +249,7 @@
/obj/item/clothing/under/rank/medical/geneticist = 2,
/obj/item/clothing/shoes/sneakers/white = 2,
/obj/item/clothing/suit/toggle/labcoat/genetics = 2,
- /obj/item/storage/backpack/genetics = 2,
- /obj/item/storage/backpack/satchel/gen = 2)
+ /obj/item/storage/backpack/genetics = 2)
generate_items_inside(items_inside,src)
return
diff --git a/code/modules/antagonists/santa/santa.dm b/code/modules/antagonists/santa/santa.dm
index 996a53f316dc8..2f1e874b28669 100644
--- a/code/modules/antagonists/santa/santa.dm
+++ b/code/modules/antagonists/santa/santa.dm
@@ -18,10 +18,6 @@
/datum/antagonist/santa/proc/give_equipment()
var/mob/living/carbon/human/H = owner.current
- if(istype(H))
- H.equipOutfit(/datum/outfit/santa)
- H.dna.update_dna_identity()
-
owner.AddSpell(new /obj/effect/proc_holder/spell/targeted/area_teleport/teleport/santa)
/datum/antagonist/santa/proc/give_objective()
diff --git a/code/modules/clothing/outfits/event.dm b/code/modules/clothing/outfits/event.dm
deleted file mode 100644
index 18af4e8b663f7..0000000000000
--- a/code/modules/clothing/outfits/event.dm
+++ /dev/null
@@ -1,26 +0,0 @@
-/datum/outfit/santa //ho ho ho!
- name = "Santa Claus"
-
- uniform = /obj/item/clothing/under/color/red
- shoes = /obj/item/clothing/shoes/sneakers/red
- suit = /obj/item/clothing/suit/space/santa
- head = /obj/item/clothing/head/santa
- back = /obj/item/storage/backpack/santabag
- r_pocket = /obj/item/flashlight
- gloves = /obj/item/clothing/gloves/color/red
-
- box = /obj/item/storage/box/survival/engineer
- backpack_contents = list(/obj/item/a_gift/anything = 5)
-
-/datum/outfit/santa/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
- if(visualsOnly)
- return
- H.fully_replace_character_name(H.real_name, "Santa Claus")
- H.mind.assigned_role = "Santa"
- H.mind.special_role = "Santa"
-
- H.hairstyle = "Long Hair 3"
- H.facial_hairstyle = "Beard (Full)"
- H.hair_color = "FFF"
- H.facial_hair_color = "FFF"
- H.update_hair()
diff --git a/code/modules/jobs/job_types/clown.dm b/code/modules/jobs/job_types/clown.dm
index d131d8ad4cd4b..ab84dace8087a 100644
--- a/code/modules/jobs/job_types/clown.dm
+++ b/code/modules/jobs/job_types/clown.dm
@@ -35,8 +35,6 @@
implants = list(/obj/item/implant/sad_trombone)
- backpack = /obj/item/storage/backpack/clown
- satchel = /obj/item/storage/backpack/clown
duffelbag = /obj/item/storage/backpack/duffelbag/clown //strangely has a duffel
box = /obj/item/storage/box/hug/survival
diff --git a/code/modules/jobs/job_types/geneticist.dm b/code/modules/jobs/job_types/geneticist.dm
index 2720dcf064fdc..dd8e5ef8f97ae 100644
--- a/code/modules/jobs/job_types/geneticist.dm
+++ b/code/modules/jobs/job_types/geneticist.dm
@@ -25,7 +25,6 @@
l_pocket = /obj/item/sequence_scanner
backpack = /obj/item/storage/backpack/genetics
- satchel = /obj/item/storage/backpack/satchel/gen
duffelbag = /obj/item/storage/backpack/duffelbag/med
courierbag = /obj/item/storage/backpack/messenger/med
diff --git a/code/modules/mob/living/carbon/human/species_types/snail.dm b/code/modules/mob/living/carbon/human/species_types/snail.dm
index 4d9d41bd411d2..5f47ab21e479c 100644
--- a/code/modules/mob/living/carbon/human/species_types/snail.dm
+++ b/code/modules/mob/living/carbon/human/species_types/snail.dm
@@ -12,7 +12,6 @@
siemens_coeff = 2 //snails are mostly water
changesource_flags = MIRROR_BADMIN | WABBAJACK | MIRROR_MAGIC | MIRROR_PRIDE | RACE_SWAP
sexes = FALSE //snails are hermaphrodites
- var/shell_type = /obj/item/storage/backpack/snail
mutanteyes = /obj/item/organ/eyes/snail
mutanttongue = /obj/item/organ/tongue/snail
@@ -41,38 +40,8 @@
/datum/species/snail/on_species_gain(mob/living/carbon/C, datum/species/old_species, pref_load)
. = ..()
- var/obj/item/storage/backpack/bag = C.get_item_by_slot(ITEM_SLOT_BACK)
- if(!istype(bag, /obj/item/storage/backpack/snail))
- if(C.dropItemToGround(bag)) //returns TRUE even if its null
- C.equip_to_slot_or_del(new /obj/item/storage/backpack/snail(C), ITEM_SLOT_BACK)
C.AddElement(/datum/element/snailcrawl)
/datum/species/snail/on_species_loss(mob/living/carbon/C)
. = ..()
C.RemoveElement(/datum/element/snailcrawl)
- var/obj/item/storage/backpack/bag = C.get_item_by_slot(ITEM_SLOT_BACK)
- if(istype(bag, /obj/item/storage/backpack/snail))
- bag.emptyStorage()
- C.temporarilyRemoveItemFromInventory(bag, TRUE)
- qdel(bag)
-
-/obj/item/storage/backpack/snail
- name = "snail shell"
- desc = "Worn by snails as armor and storage compartment."
- icon_state = "snailshell"
- item_state = "snailshell"
- lefthand_file = 'icons/mob/inhands/equipment/backpack_lefthand.dmi'
- righthand_file = 'icons/mob/inhands/equipment/backpack_righthand.dmi'
- armor = list("melee" = 40, "bullet" = 30, "laser" = 30, "energy" = 10, "bomb" = 25, "bio" = 0, "rad" = 0, "fire" = 0, "acid" = 50)
- max_integrity = 200
- resistance_flags = FIRE_PROOF | ACID_PROOF
-
-/obj/item/storage/backpack/snail/dropped(mob/user, silent)
- . = ..()
- emptyStorage()
- if(!QDELETED(src))
- qdel(src)
-
-/obj/item/storage/backpack/snail/Initialize()
- . = ..()
- ADD_TRAIT(src, TRAIT_NODROP, "snailshell")
diff --git a/code/modules/mob/living/carbon/human/update_icons.dm b/code/modules/mob/living/carbon/human/update_icons.dm
index 540dddb9a489b..1400d2c641caa 100644
--- a/code/modules/mob/living/carbon/human/update_icons.dm
+++ b/code/modules/mob/living/carbon/human/update_icons.dm
@@ -150,8 +150,8 @@ There are several things that need to be remembered:
else if(dna.species.bodytype & BODYTYPE_KEPORI)
if(U.supports_variations & KEPORI_VARIATION)
icon_file = KEPORI_UNIFORM_PATH
- if(U.kepoi_override_icon)
- icon_file = U.kepoi_override_icon
+ if(U.kepori_override_icon)
+ icon_file = U.kepori_override_icon
else
handled_by_bodytype = TRUE
@@ -243,8 +243,8 @@ There are several things that need to be remembered:
else if(dna.species.bodytype & BODYTYPE_KEPORI)
if(I.supports_variations & KEPORI_VARIATION)
icon_file = KEPORI_GLOVES_PATH
- if(I.kepoi_override_icon)
- icon_file = I.kepoi_override_icon
+ if(I.kepori_override_icon)
+ icon_file = I.kepori_override_icon
else
handled_by_bodytype = TRUE
@@ -295,8 +295,8 @@ There are several things that need to be remembered:
else if(dna.species.bodytype & BODYTYPE_KEPORI)
if(I.supports_variations & KEPORI_VARIATION)
icon_file = KEPORI_GLASSES_PATH
- if(I.kepoi_override_icon)
- icon_file = I.kepoi_override_icon
+ if(I.kepori_override_icon)
+ icon_file = I.kepori_override_icon
else
handled_by_bodytype = TRUE
@@ -346,8 +346,8 @@ There are several things that need to be remembered:
else if(dna.species.bodytype & BODYTYPE_KEPORI)
if(I.supports_variations & KEPORI_VARIATION)
icon_file = KEPORI_EARS_PATH
- if(I.kepoi_override_icon)
- icon_file = I.kepoi_override_icon
+ if(I.kepori_override_icon)
+ icon_file = I.kepori_override_icon
else
handled_by_bodytype = TRUE
@@ -407,8 +407,8 @@ There are several things that need to be remembered:
else if(dna.species.bodytype & BODYTYPE_KEPORI)
if(I.supports_variations & KEPORI_VARIATION)
icon_file = KEPORI_SHOES_PATH
- if(I.kepoi_override_icon)
- icon_file = I.kepoi_override_icon
+ if(I.kepori_override_icon)
+ icon_file = I.kepori_override_icon
else
handled_by_bodytype = TRUE
@@ -507,8 +507,8 @@ There are several things that need to be remembered:
else if(dna.species.bodytype & BODYTYPE_KEPORI)
if(I.supports_variations & KEPORI_VARIATION)
icon_file = KEPORI_HEAD_PATH
- if(I.kepoi_override_icon)
- icon_file = I.kepoi_override_icon
+ if(I.kepori_override_icon)
+ icon_file = I.kepori_override_icon
else
handled_by_bodytype = TRUE
@@ -557,8 +557,8 @@ There are several things that need to be remembered:
else if(dna.species.bodytype & BODYTYPE_KEPORI)
if(I.supports_variations & KEPORI_VARIATION)
icon_file = KEPORI_BELT_PATH
- if(I.kepoi_override_icon)
- icon_file = I.kepoi_override_icon
+ if(I.kepori_override_icon)
+ icon_file = I.kepori_override_icon
else
handled_by_bodytype = TRUE
@@ -615,8 +615,8 @@ There are several things that need to be remembered:
else if(dna.species.bodytype & BODYTYPE_KEPORI)
if(I.supports_variations & KEPORI_VARIATION)
icon_file = KEPORI_SUIT_PATH
- if(I.kepoi_override_icon)
- icon_file = I.kepoi_override_icon
+ if(I.kepori_override_icon)
+ icon_file = I.kepori_override_icon
else
handled_by_bodytype = TRUE
@@ -698,8 +698,8 @@ There are several things that need to be remembered:
else if(dna.species.bodytype & BODYTYPE_KEPORI)
if(I.supports_variations & KEPORI_VARIATION)
icon_file = KEPORI_MASK_PATH
- if(I.kepoi_override_icon)
- icon_file = I.kepoi_override_icon
+ if(I.kepori_override_icon)
+ icon_file = I.kepori_override_icon
else
handled_by_bodytype = TRUE
@@ -739,6 +739,7 @@ There are several things that need to be remembered:
update_hud_neck(I)
+
if(!(ITEM_SLOT_NECK in check_obscured_slots()))
if(dna.species.bodytype & BODYTYPE_VOX) // there is no kepori neck path, we just tell it to greyscale no matter what
@@ -798,10 +799,12 @@ There are several things that need to be remembered:
handled_by_bodytype = TRUE
else if(dna.species.bodytype & BODYTYPE_KEPORI)
-// if(I.supports_variations & KEPORI_VARIATION)
-// icon_file = KEPORI_BACK_PATH
-// else
- handled_by_bodytype = TRUE
+ if(I.supports_variations & KEPORI_VARIATION)
+ icon_file = KEPORI_BACK_PATH
+ if(I.kepori_override_icon)
+ icon_file = I.kepori_override_icon
+ else
+ handled_by_bodytype = TRUE
if(!icon_exists(icon_file, RESOLVE_ICON_STATE(I)))
icon_file = I.mob_overlay_icon ? I.mob_overlay_icon : DEFAULT_BACK_PATH
diff --git a/code/modules/vending/wardrobes.dm b/code/modules/vending/wardrobes.dm
index 4686c12da1ad1..557617f5defcf 100644
--- a/code/modules/vending/wardrobes.dm
+++ b/code/modules/vending/wardrobes.dm
@@ -432,8 +432,7 @@
/obj/item/clothing/shoes/sneakers/white = 2,
/obj/item/clothing/suit/toggle/labcoat/genetics = 2,
/obj/item/clothing/accessory/armband/medblue = 4,
- /obj/item/storage/backpack/genetics = 2,
- /obj/item/storage/backpack/satchel/gen = 2)
+ /obj/item/storage/backpack/genetics = 2)
refill_canister = /obj/item/vending_refill/wardrobe/gene_wardrobe
/obj/item/vending_refill/wardrobe/gene_wardrobe
machine_name = "GeneDrobe"
diff --git a/icons/mob/clothing/back.dmi b/icons/mob/clothing/back.dmi
index 5508bc67523cd..248b5ab878dcc 100644
Binary files a/icons/mob/clothing/back.dmi and b/icons/mob/clothing/back.dmi differ
diff --git a/icons/mob/clothing/back/backpacks.dmi b/icons/mob/clothing/back/backpacks.dmi
new file mode 100644
index 0000000000000..7138b440a4adb
Binary files /dev/null and b/icons/mob/clothing/back/backpacks.dmi differ
diff --git a/icons/mob/clothing/back/backpacks_kepori.dmi b/icons/mob/clothing/back/backpacks_kepori.dmi
new file mode 100644
index 0000000000000..557ee29267fd9
Binary files /dev/null and b/icons/mob/clothing/back/backpacks_kepori.dmi differ
diff --git a/icons/mob/species/kepori/onmob_back_kepori.dmi b/icons/mob/species/kepori/onmob_back_kepori.dmi
new file mode 100644
index 0000000000000..98218916f7c06
Binary files /dev/null and b/icons/mob/species/kepori/onmob_back_kepori.dmi differ
diff --git a/icons/obj/clothing/back/backpacks.dmi b/icons/obj/clothing/back/backpacks.dmi
new file mode 100644
index 0000000000000..01e2c1d6923bb
Binary files /dev/null and b/icons/obj/clothing/back/backpacks.dmi differ
diff --git a/icons/obj/storage.dmi b/icons/obj/storage.dmi
index 9ff37a4b7e0c7..5353677357cff 100644
Binary files a/icons/obj/storage.dmi and b/icons/obj/storage.dmi differ
diff --git a/shiptest.dme b/shiptest.dme
index 53b8c061b5fab..54a93e0476aef 100644
--- a/shiptest.dme
+++ b/shiptest.dme
@@ -2018,7 +2018,6 @@
#include "code\modules\clothing\masks\hailer.dm"
#include "code\modules\clothing\masks\miscellaneous.dm"
#include "code\modules\clothing\neck\_neck.dm"
-#include "code\modules\clothing\outfits\event.dm"
#include "code\modules\clothing\outfits\plasmaman.dm"
#include "code\modules\clothing\outfits\standard.dm"
#include "code\modules\clothing\outfits\vv_outfit.dm"