diff --git a/_maps/RandomRuins/LavaRuins/lavaland_surface_dwarffortress.dmm b/_maps/RandomRuins/LavaRuins/lavaland_surface_dwarffortress.dmm
index 999dddfea9f3..52a302920d24 100644
--- a/_maps/RandomRuins/LavaRuins/lavaland_surface_dwarffortress.dmm
+++ b/_maps/RandomRuins/LavaRuins/lavaland_surface_dwarffortress.dmm
@@ -282,11 +282,6 @@
/area/overmap_encounter/planetoid/cave/explored)
"UM" = (
/obj/structure/table/wood,
-/obj/item/clothing/shoes/cowboy/lizard,
-/obj/item/tailclub{
- pixel_x = 3;
- pixel_y = 9
- },
/turf/open/floor/plating/asteroid/basalt,
/area/overmap_encounter/planetoid/cave/explored)
"Vk" = (
diff --git a/_maps/RandomRuins/SpaceRuins/Fast_Food.dmm b/_maps/RandomRuins/SpaceRuins/Fast_Food.dmm
index 3c98825f7924..5c04f6ced446 100644
--- a/_maps/RandomRuins/SpaceRuins/Fast_Food.dmm
+++ b/_maps/RandomRuins/SpaceRuins/Fast_Food.dmm
@@ -1163,7 +1163,6 @@
/area/ruin/space/has_grav/powered/macspace)
"cz" = (
/obj/structure/table,
-/obj/item/reagent_containers/food/snacks/kebab/tail,
/obj/structure/table/wood/fancy/blue,
/turf/open/floor/carpet,
/area/ruin/space/has_grav/powered/macspace)
diff --git a/_maps/outpost/nanotrasen_asteroid.dmm b/_maps/outpost/nanotrasen_asteroid.dmm
index 39a1808839b2..c2d88fd69ea2 100644
--- a/_maps/outpost/nanotrasen_asteroid.dmm
+++ b/_maps/outpost/nanotrasen_asteroid.dmm
@@ -12926,7 +12926,6 @@
/obj/structure/closet/crate/trashcart/laundry,
/obj/effect/decal/cleanable/dirt,
/obj/effect/spawner/lootdrop/maintenance/two,
-/obj/effect/spawner/lootdrop/lizardboots,
/obj/effect/spawner/lootdrop/minor/kittyears_or_rabbitears,
/obj/structure/grille/broken,
/obj/effect/turf_decal/box/white,
diff --git a/_maps/shuttles/minutemen/minutemen_asclepius.dmm b/_maps/shuttles/minutemen/minutemen_asclepius.dmm
index b2b8bf8786f2..877e24727dfd 100644
--- a/_maps/shuttles/minutemen/minutemen_asclepius.dmm
+++ b/_maps/shuttles/minutemen/minutemen_asclepius.dmm
@@ -4935,10 +4935,6 @@
/obj/machinery/advanced_airlock_controller{
pixel_x = 24
},
-/obj/item/clothing/shoes/cowboy/lizard{
- pixel_x = 2;
- pixel_y = -8
- },
/obj/machinery/atmospherics/pipe/layer_manifold/visible,
/obj/structure/closet/emcloset/anchored,
/turf/open/floor/plasteel/tech/grid,
diff --git a/_maps/templates/holodeck_thunderdome1218.dmm b/_maps/templates/holodeck_thunderdome1218.dmm
index 353f77e4710d..94556b2bdc7d 100644
--- a/_maps/templates/holodeck_thunderdome1218.dmm
+++ b/_maps/templates/holodeck_thunderdome1218.dmm
@@ -101,7 +101,6 @@
/area/template_noop)
"T" = (
/obj/structure/table/wood,
-/obj/item/tailclub,
/obj/item/spear,
/turf/open/floor/holofloor/asteroid,
/area/template_noop)
diff --git a/code/controllers/subsystem/traumas.dm b/code/controllers/subsystem/traumas.dm
index ab220b4382b4..c2a7fc963e30 100644
--- a/code/controllers/subsystem/traumas.dm
+++ b/code/controllers/subsystem/traumas.dm
@@ -78,8 +78,8 @@ SUBSYSTEM_DEF(traumas)
/obj/item/spear, /obj/item/clothing/mask/gas)),
"lizards" = typecacheof(list(
- /obj/item/toy/plush/lizardplushie, /obj/item/reagent_containers/food/snacks/kebab/tail, /obj/item/organ/tail/lizard,
- /obj/item/reagent_containers/food/drinks/bottle/lizardwine, /obj/item/clothing/head/lizard, /obj/item/clothing/shoes/cowboy/lizard)),
+ /obj/item/toy/plush/lizardplushie, /obj/item/organ/tail/lizard,
+ /obj/item/reagent_containers/food/drinks/bottle/lizardwine)),
"skeletons" = typecacheof(list(
/obj/item/organ/tongue/bone, /obj/item/clothing/suit/armor/bone, /obj/item/stack/sheet/bone,
@@ -156,7 +156,7 @@ SUBSYSTEM_DEF(traumas)
/obj/item/clothing/under/costume/schoolgirl, /obj/item/katana, /obj/item/reagent_containers/food/snacks/sashimi,
/obj/item/reagent_containers/food/snacks/chawanmushi,
/obj/item/reagent_containers/food/drinks/bottle/sake, /obj/item/throwing_star,
- /obj/item/clothing/head/kitty/genuine, /obj/item/clothing/suit/space/space_ninja,
+ /obj/item/clothing/suit/space/space_ninja,
/obj/item/clothing/mask/gas/space_ninja, /obj/item/clothing/shoes/space_ninja, /obj/item/clothing/gloves/space_ninja,
/obj/item/vibro_weapon, /obj/item/nullrod/scythe/vibro, /obj/item/energy_katana, /obj/item/toy/katana,
/obj/item/nullrod/claymore/katana, /obj/structure/window/paperframe, /obj/structure/mineral_door/paperframe))
diff --git a/code/datums/components/crafting/recipes.dm b/code/datums/components/crafting/recipes.dm
index 0961aa484a1d..9ec90bf09eac 100644
--- a/code/datums/components/crafting/recipes.dm
+++ b/code/datums/components/crafting/recipes.dm
@@ -113,35 +113,6 @@
category= CAT_WEAPONRY
subcategory = CAT_WEAPON
-/datum/crafting_recipe/tailclub
- name = "Tail Club"
- result = /obj/item/tailclub
- reqs = list(/obj/item/organ/tail/lizard = 1,
- /obj/item/stack/sheet/metal = 1)
- blacklist = list(/obj/item/organ/tail/lizard/fake)
- time = 40
- category = CAT_WEAPONRY
- subcategory = CAT_WEAPON
-
-/datum/crafting_recipe/tailwhip
- name = "Liz O' Nine Tails"
- result = /obj/item/melee/chainofcommand/tailwhip
- reqs = list(/obj/item/organ/tail/lizard = 1,
- /obj/item/stack/cable_coil = 1)
- blacklist = list(/obj/item/organ/tail/lizard/fake)
- time = 40
- category = CAT_WEAPONRY
- subcategory = CAT_WEAPON
-
-/datum/crafting_recipe/catwhip
- name = "Cat O' Nine Tails"
- result = /obj/item/melee/chainofcommand/tailwhip/kitty
- reqs = list(/obj/item/organ/tail/cat = 1,
- /obj/item/stack/cable_coil = 1)
- time = 40
- category = CAT_WEAPONRY
- subcategory = CAT_WEAPON
-
/datum/crafting_recipe/ed209
name = "ED209"
result = /mob/living/simple_animal/bot/secbot/ed209
@@ -372,28 +343,6 @@
parts = list(/obj/item/camera = 1)
category = CAT_MISC
-/datum/crafting_recipe/lizardhat
- name = "lizard Cloche Hat"
- result = /obj/item/clothing/head/lizard
- time = 10
- reqs = list(/obj/item/organ/tail/lizard = 1)
- category = CAT_CLOTHING
-
-/datum/crafting_recipe/lizardhat_alternate
- name = "lizard Cloche Hat"
- result = /obj/item/clothing/head/lizard
- time = 10
- reqs = list(/obj/item/stack/sheet/animalhide/lizard = 1)
- category = CAT_CLOTHING
-
-/datum/crafting_recipe/kittyears
- name = "Kitty Ears"
- result = /obj/item/clothing/head/kitty/genuine
- time = 10
- reqs = list(/obj/item/organ/tail/cat = 1,
- /obj/item/organ/ears/cat = 1)
- category = CAT_CLOTHING
-
/datum/crafting_recipe/skateboard
name = "Skateboard"
result = /obj/vehicle/ridden/scooter/skateboard
diff --git a/code/datums/components/crafting/tailoring.dm b/code/datums/components/crafting/tailoring.dm
index d02a60c0178f..4caaa55ded29 100644
--- a/code/datums/components/crafting/tailoring.dm
+++ b/code/datums/components/crafting/tailoring.dm
@@ -236,13 +236,3 @@
reqs = list(/obj/item/stack/sheet/leather = 2)
time = 45
category = CAT_CLOTHING
-
-/datum/crafting_recipe/lizardboots
- name = "lizard Skin Boots"
- result = /obj/effect/spawner/lootdrop/lizardboots
- reqs = list(
- /obj/item/stack/sheet/animalhide/lizard = 1,
- /obj/item/stack/sheet/leather = 1
- )
- time = 60
- category = CAT_CLOTHING
diff --git a/code/game/objects/effects/spawners/lootdrop.dm b/code/game/objects/effects/spawners/lootdrop.dm
index 8d46f5bfa7d8..c4555b7d92a1 100644
--- a/code/game/objects/effects/spawners/lootdrop.dm
+++ b/code/game/objects/effects/spawners/lootdrop.dm
@@ -105,7 +105,6 @@
/obj/item/paper/fluff/jobs/prisoner/letter = 1,
/obj/item/grenade/smokebomb = 1,
/obj/item/flashlight/seclite = 1,
- /obj/item/tailclub = 1, //want to buy makeshift wooden club sprite
/obj/item/kitchen/knife/shiv = 4,
/obj/item/kitchen/knife/shiv/carrot = 1,
/obj/item/kitchen/knife = 1,
diff --git a/code/game/objects/items/implants/implantchair.dm b/code/game/objects/items/implants/implantchair.dm
index 504c07299c45..8247d02cb549 100644
--- a/code/game/objects/items/implants/implantchair.dm
+++ b/code/game/objects/items/implants/implantchair.dm
@@ -158,23 +158,6 @@
if(auto_inject && ready && ready_implants > 0)
implant(user,null)
-/obj/machinery/implantchair/genepurge
- name = "Genetic purifier"
- desc = "Used to purge a human genome of foreign influences."
- special = TRUE
- special_name = "Purge genome"
- injection_cooldown = 0
- replenish_cooldown = 300
-
-/obj/machinery/implantchair/genepurge/implant_action(mob/living/carbon/human/H,mob/user)
- if(!istype(H))
- return 0
- H.set_species(/datum/species/human, 1)//lizards go home
- H.purrbation_remove()//remove cats
- H.dna.remove_all_mutations()//hulks out
- return 1
-
-
/obj/machinery/implantchair/brainwash
name = "Neural Imprinter"
desc = "Used to indoctrinate rehabilitate hardened recidivists."
diff --git a/code/game/objects/items/weaponry.dm b/code/game/objects/items/weaponry.dm
index 7749f6d50274..c019471e3cdd 100644
--- a/code/game/objects/items/weaponry.dm
+++ b/code/game/objects/items/weaponry.dm
@@ -523,29 +523,6 @@ for further reading, please see: https://github.com/tgstation/tgstation/pull/301
icon_state = "hippocratic"
impressiveness = 50
-/obj/item/tailclub
- name = "tail club"
- desc = "For the beating to death of lizards with their own tails."
- icon_state = "tailclub"
- force = 14
- throwforce = 1 // why are you throwing a club do you even weapon
- throw_speed = 1
- throw_range = 1
- attack_verb = list("clubbed", "bludgeoned")
-
-/obj/item/melee/chainofcommand/tailwhip
- name = "liz o' nine tails"
- desc = "A whip fashioned from the severed tails of lizards."
- icon_state = "tailwhip"
- item_state = "tailwhip"
- item_flags = NONE
-
-/obj/item/melee/chainofcommand/tailwhip/kitty
- name = "cat o' nine tails"
- desc = "A whip fashioned from the severed tails of cats."
- icon_state = "catwhip"
- item_state = "catwhip"
-
/obj/item/melee/skateboard
name = "improvised skateboard"
desc = "A skateboard. It can be placed on its wheels and ridden, or used as a strong weapon."
diff --git a/code/game/objects/structures/mirror.dm b/code/game/objects/structures/mirror.dm
index 2e540611f343..c07dbe92f990 100644
--- a/code/game/objects/structures/mirror.dm
+++ b/code/game/objects/structures/mirror.dm
@@ -200,23 +200,23 @@
H.update_mutations_overlay() // no hulk lizard
if("gender")
- if(!(H.gender in list("male", "female"))) //blame the patriarchy
+ if(!(H.gender in list("male", "female")))
return
if(H.gender == "male")
- if(alert(H, "Become a Witch?", "Confirmation", "Yes", "No") == "Yes")
+ if(alert(H, "Become a Woman?", "Confirmation", "Yes", "No") == "Yes")
if(!user.canUseTopic(src, BE_CLOSE, FALSE, NO_TK))
return
H.gender = "female"
- to_chat(H, "Man, you feel like a woman!")
+ to_chat(H, "You trans your gender. You're now a woman.")
else
return
else
- if(alert(H, "Become a Warlock?", "Confirmation", "Yes", "No") == "Yes")
+ if(alert(H, "Become a Man?", "Confirmation", "Yes", "No") == "Yes")
if(!user.canUseTopic(src, BE_CLOSE, FALSE, NO_TK))
return
H.gender = "male"
- to_chat(H, "Whoa man, you feel like a man!")
+ to_chat(H, "You trans your gender. You're now a man.")
else
return
H.dna.update_ui_block(DNA_GENDER_BLOCK)
diff --git a/code/modules/cargo/bounties/assistant.dm b/code/modules/cargo/bounties/assistant.dm
index 32c9d167f92d..3ddc15dfa33b 100644
--- a/code/modules/cargo/bounties/assistant.dm
+++ b/code/modules/cargo/bounties/assistant.dm
@@ -211,12 +211,6 @@
required_count = 5
wanted_types = list(/obj/item/toy/figure)
-/datum/bounty/item/assistant/tail_whip
- name = "Nine Tails whip"
- description = "Commander Jackson is looking for a fine addition to her exotic weapons collection. She will reward you handsomely for either a Cat or Liz o' Nine Tails."
- reward = 4000
- wanted_types = list(/obj/item/melee/chainofcommand/tailwhip)
-
/datum/bounty/item/assistant/dead_mice
name = "Dead Mice"
description = "Station 14 ran out of freeze-dried mice. Ship some fresh ones so their janitor doesn't go on strike."
diff --git a/code/modules/cargo/bounties/medical.dm b/code/modules/cargo/bounties/medical.dm
index 38f1fea99906..c0bcb1bd6f69 100644
--- a/code/modules/cargo/bounties/medical.dm
+++ b/code/modules/cargo/bounties/medical.dm
@@ -45,15 +45,3 @@
reward = 10000
required_count = 3
wanted_types = list(/obj/item/organ/tongue)
-
-/datum/bounty/item/medical/lizard_tail
- name = "lizard Tail"
- description = "The Wizard Federation has made off with Nanotrasen's supply of lizard tails. While CentCom is dealing with the wizards, can the station spare a tail of their own?"
- reward = 3000
- wanted_types = list(/obj/item/organ/tail/lizard)
-
-/datum/bounty/item/medical/cat_tail
- name = "Cat Tail"
- description = "Central Command has run out of heavy duty pipe cleaners. Can you ship over a cat tail to help us out?"
- reward = 3000
- wanted_types = list(/obj/item/organ/tail/cat)
diff --git a/code/modules/cargo/exports/gear.dm b/code/modules/cargo/exports/gear.dm
index 1282d52b5a58..8af6b567fef5 100644
--- a/code/modules/cargo/exports/gear.dm
+++ b/code/modules/cargo/exports/gear.dm
@@ -15,7 +15,6 @@
unit_name = "riot shield"
export_types = list(/obj/item/shield/riot)
-
/datum/export/gear/mask/breath
cost = 2
unit_name = "breath mask"
@@ -27,7 +26,6 @@
export_types = list(/obj/item/clothing/mask/gas)
include_subtypes = FALSE
-
/datum/export/gear/space/helmet
cost = 75
unit_name = "space helmet"
@@ -51,7 +49,6 @@
unit_name = "Syndicate space suit"
export_types = list(/obj/item/clothing/suit/space/syndicate)
-
/datum/export/gear/radhelmet
cost = 50
unit_name = "radsuit hood"
@@ -82,17 +79,6 @@
unit_name = "bomb suit"
export_types = list(/obj/item/clothing/suit/bomb_suit)
-/datum/export/gear/lizardboots
- cost = 350
- unit_name = "lizard skin boots"
- export_types = list(/obj/item/clothing/shoes/cowboy/lizard)
- include_subtypes = FALSE
-
-/datum/export/gear/lizardmasterwork
- cost = 1000
- unit_name = "Hugs-the-Feet lizard boots"
- export_types = list(/obj/item/clothing/shoes/cowboy/lizard/masterwork)
-
/datum/export/gear/bilton
cost = 2500
unit_name = "bilton wrangler boots"
diff --git a/code/modules/clothing/head/misc.dm b/code/modules/clothing/head/misc.dm
index d63003422e29..50e895148218 100644
--- a/code/modules/clothing/head/misc.dm
+++ b/code/modules/clothing/head/misc.dm
@@ -122,7 +122,7 @@
/obj/item/clothing/head/rabbitears
name = "rabbit ears"
- desc = "Wearing these makes you look useless, and only good for your sex appeal."
+ desc = "A headband with a pair of faux rabbit ears."
icon_state = "bunny"
dynamic_hair_suffix = ""
@@ -313,11 +313,6 @@
desc = "Welcome to the rice fields, motherfucker."
icon_state = "rice_hat"
-/obj/item/clothing/head/lizard
- name = "lizardskin cloche hat"
- desc = "How many lizards died to make this hat? Not enough."
- icon_state = "lizard"
-
/obj/item/clothing/head/papersack
name = "paper sack hat"
desc = "A paper sack with crude holes cut out for eyes. Useful for hiding one's identity or ugliness."
@@ -423,11 +418,6 @@
desc = "Signals that you follow the Jewish Halakha. Keeps the head covered and the soul extra-Orthodox."
icon_state = "kippah"
-/obj/item/clothing/head/medievaljewhat
- name = "medieval Jewish hat"
- desc = "A silly looking hat, intended to be placed on the heads of oppressed religious minorities."
- icon_state = "medievaljewhat"
-
/obj/item/clothing/head/taqiyahwhite
name = "white taqiyah"
desc = "An extra-mustahabb way of showing your devotion to Allah."
diff --git a/code/modules/clothing/head/misc_special.dm b/code/modules/clothing/head/misc_special.dm
index 3e188c253169..f0ef95aca729 100644
--- a/code/modules/clothing/head/misc_special.dm
+++ b/code/modules/clothing/head/misc_special.dm
@@ -182,9 +182,6 @@
if(ishuman(user))
add_atom_colour("#[user.hair_color]", FIXED_COLOUR_PRIORITY)
-/obj/item/clothing/head/kitty/genuine
- desc = "A pair of kitty ears. A tag on the inside says \"Hand made from real cats.\""
-
/obj/item/clothing/head/hardhat/reindeer
name = "novelty reindeer hat"
desc = "Some fake antlers and a very fake red nose."
diff --git a/code/modules/clothing/shoes/miscellaneous.dm b/code/modules/clothing/shoes/miscellaneous.dm
index 03abdf1325f8..8d9cab360203 100644
--- a/code/modules/clothing/shoes/miscellaneous.dm
+++ b/code/modules/clothing/shoes/miscellaneous.dm
@@ -438,26 +438,6 @@
icon_state = "cowboy_fancy"
permeability_coefficient = 0.08
-/obj/item/clothing/shoes/cowboy/lizard
- name = "lizard skin boots"
- desc = "You can hear a faint hissing from inside the boots; you hope it is just a mournful ghost."
- icon_state = "lizardboots_green"
- armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 40, "acid" = 0) //lizards like to stay warm
-
-/obj/item/clothing/shoes/cowboy/lizard/masterwork
- name = "\improper Hugs-The-Feet lizard skin boots"
- desc = "A pair of masterfully crafted lizard skin boots. Finally a good application for the sector's most bothersome inhabitants."//:c
- icon_state = "lizardboots_blue"
-
-/obj/effect/spawner/lootdrop/lizardboots
- name = "random lizard boot quality"
- desc = "Which ever gets picked, the lizard race loses"
- icon = 'icons/obj/clothing/shoes.dmi'
- icon_state = "lizardboots_green"
- loot = list(
- /obj/item/clothing/shoes/cowboy/lizard = 7,
- /obj/item/clothing/shoes/cowboy/lizard/masterwork = 1)
-
/obj/item/clothing/shoes/cookflops
desc = "All this talk of antags, greytiding, and griefing... I just wanna grill for god's sake!"
name = "grilling sandals"
diff --git a/code/modules/clothing/suits/armor.dm b/code/modules/clothing/suits/armor.dm
index d0eba4833ea5..9a6e0687ccb5 100644
--- a/code/modules/clothing/suits/armor.dm
+++ b/code/modules/clothing/suits/armor.dm
@@ -46,7 +46,7 @@
min_cold_protection_temperature = ARMOR_MIN_TEMP_PROTECT
heat_protection = CHEST|GROIN|LEGS|FEET|ARMS|HANDS
resistance_flags = FIRE_PROOF | ACID_PROOF
- supports_variations = VOX_VARIATION
+ supports_variations = VOX_VARIATION | DIGITIGRADE_VARIATION_NO_NEW_ICON
/obj/item/clothing/suit/armor/vest/marine/medium
name = "medium tactical armor vest"
diff --git a/code/modules/food_and_drinks/food/snacks_meat.dm b/code/modules/food_and_drinks/food/snacks_meat.dm
index 7151c3fd9811..510130ce08be 100644
--- a/code/modules/food_and_drinks/food/snacks_meat.dm
+++ b/code/modules/food_and_drinks/food/snacks_meat.dm
@@ -430,14 +430,6 @@
tastes = list("tofu" = 3, "metal" = 1)
foodtype = VEGETABLES
-
-/obj/item/reagent_containers/food/snacks/kebab/tail
- name = "lizard-tail kebab"
- desc = "Severed lizard tail on a stick."
- bonus_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/consumable/nutriment/vitamin = 4)
- tastes = list("meat" = 8, "metal" = 4, "scales" = 1)
- foodtype = MEAT // NOT GORE, tastes delicious!
-
/obj/item/reagent_containers/food/snacks/kebab/rat
name = "rat-kebab"
desc = "Not so delicious rat meat, on a stick."
diff --git a/code/modules/food_and_drinks/recipes/tablecraft/recipes_meat.dm b/code/modules/food_and_drinks/recipes/tablecraft/recipes_meat.dm
index bd7aec4ed422..72f2046a3b84 100644
--- a/code/modules/food_and_drinks/recipes/tablecraft/recipes_meat.dm
+++ b/code/modules/food_and_drinks/recipes/tablecraft/recipes_meat.dm
@@ -29,15 +29,6 @@
result = /obj/item/reagent_containers/food/snacks/kebab/tofu
subcategory = CAT_MEAT
-/datum/crafting_recipe/food/tailkebab
- name = "lizard tail kebab"
- reqs = list(
- /obj/item/stack/rods = 1,
- /obj/item/organ/tail/lizard = 1
- )
- result = /obj/item/reagent_containers/food/snacks/kebab/tail
- subcategory = CAT_MEAT
-
/datum/crafting_recipe/food/fiestaskewer
name = "Fiesta Skewer"
reqs = list(
diff --git a/code/modules/mining/lavaland/necropolis_chests.dm b/code/modules/mining/lavaland/necropolis_chests.dm
index a291811d5e83..fe446513c521 100644
--- a/code/modules/mining/lavaland/necropolis_chests.dm
+++ b/code/modules/mining/lavaland/necropolis_chests.dm
@@ -1385,7 +1385,7 @@
switch(random)
if(1)
- to_chat(user, "Your appearance morphs to that of a very small humanoid ash dragon! You get to look like a freak without the cool abilities.")
+ to_chat(user, "Your appearance morphs to that of a very small humanoid ash dragon! You get to look like a dragon without the cool abilities.")
H.dna.features = list("mcolor" = "A02720", "tail_lizard" = "Dark Tiger", "tail_human" = "None", "face_markings" = "None", "horns" = "Curled", "ears" = "None", "wings" = "None", "frills" = "None", "spines" = "Long", "body_markings" = "Dark Tiger Body", "legs" = "Digitigrade Legs")
H.eye_color = "fee5a3"
H.set_species(/datum/species/lizard)
diff --git a/code/modules/vending/wardrobes.dm b/code/modules/vending/wardrobes.dm
index a774f048f443..9c4f7c376425 100644
--- a/code/modules/vending/wardrobes.dm
+++ b/code/modules/vending/wardrobes.dm
@@ -319,7 +319,7 @@
name = "JaniDrobe"
desc = "A self cleaning vending machine capable of dispensing clothing for janitors."
icon_state = "janidrobe"
- product_ads = "Come and get your janitorial clothing, now endorsed by lizard janitors everywhere!"
+ product_ads = "Come and get your janitorial clothing, now endorsed by janitors everywhere!"
vend_reply = "Thank you for using the JaniDrobe!"
products = list(/obj/item/clothing/under/rank/civilian/janitor = 2,
/obj/item/cartridge/janitor = 2,
@@ -410,8 +410,7 @@
/obj/item/clothing/accessory/armband/med = 4,
/obj/item/clothing/head/beanie/rasta = 1)
contraband = list(/obj/item/toy/plush/plushvar = 1,
- /obj/item/toy/plush/narplush = 1,
- /obj/item/clothing/head/medievaljewhat = 3)
+ /obj/item/toy/plush/narplush = 1)
premium = list(/obj/item/clothing/suit/chaplainsuit/bishoprobe = 1,
/obj/item/clothing/head/bishopmitre = 1)
refill_canister = /obj/item/vending_refill/wardrobe/chap_wardrobe
diff --git a/html/changelogs/archive/2023-11.yml b/html/changelogs/archive/2023-11.yml
index f0a0fe9d2e06..d15d377eecd2 100644
--- a/html/changelogs/archive/2023-11.yml
+++ b/html/changelogs/archive/2023-11.yml
@@ -152,3 +152,14 @@
2023-11-26:
meemofcourse:
- tweak: Fancy pens now write in Adobe Garamond.
+2023-11-29:
+ GenericDM:
+ - rscdel: removes tail club
+ - rscdel: removes all flavors of tail whip
+ - rscdel: removes lizardskin clothing
+ - rscdel: removes 'Genetic Purifier'
+ - tweak: makes bunny ears desc not incredibly sexist
+ - tweak: change up wording in magic mirror gender change
+ - rscdel: removes 'genuine' cat ears
+ thgvr:
+ - bugfix: Marine armor and its subtypes will no longer break digitigrade
diff --git a/icons/mob/clothing/feet.dmi b/icons/mob/clothing/feet.dmi
index d9580eff1b42..e9e6444a4795 100644
Binary files a/icons/mob/clothing/feet.dmi and b/icons/mob/clothing/feet.dmi differ
diff --git a/icons/mob/clothing/head.dmi b/icons/mob/clothing/head.dmi
index b009afd12d26..9e43956fcfd3 100644
Binary files a/icons/mob/clothing/head.dmi and b/icons/mob/clothing/head.dmi differ
diff --git a/icons/mob/inhands/weapons/melee_lefthand.dmi b/icons/mob/inhands/weapons/melee_lefthand.dmi
index 9ddba4cf47e7..557f281d1502 100644
Binary files a/icons/mob/inhands/weapons/melee_lefthand.dmi and b/icons/mob/inhands/weapons/melee_lefthand.dmi differ
diff --git a/icons/obj/clothing/hats.dmi b/icons/obj/clothing/hats.dmi
index 957fe60cc5c5..4816c2bb666f 100644
Binary files a/icons/obj/clothing/hats.dmi and b/icons/obj/clothing/hats.dmi differ
diff --git a/icons/obj/clothing/shoes.dmi b/icons/obj/clothing/shoes.dmi
index a17d4b5b2bff..7123ae5ab1c2 100644
Binary files a/icons/obj/clothing/shoes.dmi and b/icons/obj/clothing/shoes.dmi differ
diff --git a/icons/obj/items_and_weapons.dmi b/icons/obj/items_and_weapons.dmi
index 56246df09ad9..5748d2dec958 100644
Binary files a/icons/obj/items_and_weapons.dmi and b/icons/obj/items_and_weapons.dmi differ
diff --git a/tgui/packages/tgui-dev-server/package.json b/tgui/packages/tgui-dev-server/package.json
index 2477641c7e79..56951b14846f 100644
--- a/tgui/packages/tgui-dev-server/package.json
+++ b/tgui/packages/tgui-dev-server/package.json
@@ -4,7 +4,7 @@
"version": "4.3.1",
"type": "module",
"dependencies": {
- "axios": "^0.21.1",
+ "axios": "^1.6.0",
"glob": "^7.1.7",
"source-map": "^0.7.3",
"stacktrace-parser": "^0.1.10",
diff --git a/tgui/yarn.lock b/tgui/yarn.lock
index c591be003fa9..47ac510750be 100644
--- a/tgui/yarn.lock
+++ b/tgui/yarn.lock
@@ -2737,12 +2737,14 @@ __metadata:
languageName: node
linkType: hard
-"axios@npm:^0.21.1":
- version: 0.21.1
- resolution: "axios@npm:0.21.1"
+"axios@npm:^1.6.0":
+ version: 1.6.1
+ resolution: "axios@npm:1.6.1"
dependencies:
- follow-redirects: ^1.10.0
- checksum: c87915fa0b18c15c63350112b6b3563a3e2ae524d7707de0a73d2e065e0d30c5d3da8563037bc29d4cc1b7424b5a350cb7274fa52525c6c04a615fe561c6ab11
+ follow-redirects: ^1.15.0
+ form-data: ^4.0.0
+ proxy-from-env: ^1.1.0
+ checksum: 573f03f59b7487d54551b16f5e155d1d130ad4864ed32d1da93d522b78a57123b34e3bde37f822a65ee297e79f1db840f9ad6514addff50d3cbf5caeed39e8dc
languageName: node
linkType: hard
@@ -4533,13 +4535,13 @@ __metadata:
languageName: node
linkType: hard
-"follow-redirects@npm:^1.10.0":
- version: 1.15.2
- resolution: "follow-redirects@npm:1.15.2"
+"follow-redirects@npm:^1.15.0":
+ version: 1.15.3
+ resolution: "follow-redirects@npm:1.15.3"
peerDependenciesMeta:
debug:
optional: true
- checksum: faa66059b66358ba65c234c2f2a37fcec029dc22775f35d9ad6abac56003268baf41e55f9ee645957b32c7d9f62baf1f0b906e68267276f54ec4b4c597c2b190
+ checksum: 584da22ec5420c837bd096559ebfb8fe69d82512d5585004e36a3b4a6ef6d5905780e0c74508c7b72f907d1fa2b7bd339e613859e9c304d0dc96af2027fd0231
languageName: node
linkType: hard
@@ -4561,6 +4563,17 @@ __metadata:
languageName: node
linkType: hard
+"form-data@npm:^4.0.0":
+ version: 4.0.0
+ resolution: "form-data@npm:4.0.0"
+ dependencies:
+ asynckit: ^0.4.0
+ combined-stream: ^1.0.8
+ mime-types: ^2.1.12
+ checksum: 01135bf8675f9d5c61ff18e2e2932f719ca4de964e3be90ef4c36aacfc7b9cb2fceb5eca0b7e0190e3383fe51c5b37f4cb80b62ca06a99aaabfcfd6ac7c9328c
+ languageName: node
+ linkType: hard
+
"form-data@npm:~2.3.2":
version: 2.3.3
resolution: "form-data@npm:2.3.3"
@@ -7339,6 +7352,13 @@ __metadata:
languageName: node
linkType: hard
+"proxy-from-env@npm:^1.1.0":
+ version: 1.1.0
+ resolution: "proxy-from-env@npm:1.1.0"
+ checksum: ed7fcc2ba0a33404958e34d95d18638249a68c430e30fcb6c478497d72739ba64ce9810a24f53a7d921d0c065e5b78e3822759800698167256b04659366ca4d4
+ languageName: node
+ linkType: hard
+
"psl@npm:^1.1.28, psl@npm:^1.1.33":
version: 1.8.0
resolution: "psl@npm:1.8.0"
@@ -8546,7 +8566,7 @@ resolve@^2.0.0-next.3:
version: 0.0.0-use.local
resolution: "tgui-dev-server@workspace:packages/tgui-dev-server"
dependencies:
- axios: ^0.21.1
+ axios: ^1.6.0
glob: ^7.1.7
source-map: ^0.7.3
stacktrace-parser: ^0.1.10