Skip to content

Commit

Permalink
Assorted cringe removal pt.whatever (#2534)
Browse files Browse the repository at this point in the history
<!-- Write **BELOW** The Headers and **ABOVE** The comments else it may
not be viewable. -->
<!-- You can view Contributing.MD for a detailed description of the pull
request process. -->

## About The Pull Request
Removes more cringe I found laying around.
<!-- Describe The Pull Request. Please be sure every change is
documented or this can delay review and even discourage maintainers from
merging your PR! -->

## Why It's Good For The Game
/tg/ was on some WILD shit.
<!-- Please add a short description of why you think these changes would
benefit the game. If you can't justify it in words, it might not be
worth adding. -->

## Changelog

:cl:
del: removes tail club
del: removes all flavors of tail whip
del: removes lizardskin clothing
del: removes 'Genetic Purifier'
tweak: makes bunny ears desc not incredibly sexist
tweak: change up wording in magic mirror gender change
del: removes 'genuine' cat ears
/:cl:

<!-- Both :cl:'s are required for the changelog to work! You can put
your name to the right of the first :cl: if you want to overwrite your
GitHub username as author ingame. -->
<!-- You can use multiple of the same prefix (they're only used for the
icon ingame) and delete the unneeded ones. Despite some of the tags,
changelogs should generally represent how a player might be affected by
the changes rather than a summary of the PR's contents. -->
  • Loading branch information
GenericDM authored Nov 28, 2023
1 parent e561205 commit caa19d2
Show file tree
Hide file tree
Showing 28 changed files with 12 additions and 209 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -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" = (
Expand Down
1 change: 0 additions & 1 deletion _maps/RandomRuins/SpaceRuins/Fast_Food.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
1 change: 0 additions & 1 deletion _maps/outpost/nanotrasen_asteroid.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
4 changes: 0 additions & 4 deletions _maps/shuttles/minutemen/minutemen_asclepius.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
1 change: 0 additions & 1 deletion _maps/templates/holodeck_thunderdome1218.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
6 changes: 3 additions & 3 deletions code/controllers/subsystem/traumas.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down Expand Up @@ -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))
Expand Down
51 changes: 0 additions & 51 deletions code/datums/components/crafting/recipes.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
10 changes: 0 additions & 10 deletions code/datums/components/crafting/tailoring.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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
1 change: 0 additions & 1 deletion code/game/objects/effects/spawners/lootdrop.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
17 changes: 0 additions & 17 deletions code/game/objects/items/implants/implantchair.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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 <s>indoctrinate</s> rehabilitate hardened recidivists."
Expand Down
23 changes: 0 additions & 23 deletions code/game/objects/items/weaponry.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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."
Expand Down
10 changes: 5 additions & 5 deletions code/game/objects/structures/mirror.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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, "<span class='notice'>Man, you feel like a woman!</span>")
to_chat(H, "<span class='notice'>You trans your gender. You're now a woman.</span>")
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, "<span class='notice'>Whoa man, you feel like a man!</span>")
to_chat(H, "<span class='notice'>You trans your gender. You're now a man.</span>")
else
return
H.dna.update_ui_block(DNA_GENDER_BLOCK)
Expand Down
6 changes: 0 additions & 6 deletions code/modules/cargo/bounties/assistant.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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."
Expand Down
12 changes: 0 additions & 12 deletions code/modules/cargo/bounties/medical.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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)
14 changes: 0 additions & 14 deletions code/modules/cargo/exports/gear.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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"
Expand All @@ -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"
Expand Down Expand Up @@ -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"
Expand Down
12 changes: 1 addition & 11 deletions code/modules/clothing/head/misc.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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 = ""

Expand Down Expand Up @@ -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."
Expand Down Expand Up @@ -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."
Expand Down
3 changes: 0 additions & 3 deletions code/modules/clothing/head/misc_special.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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."
Expand Down
20 changes: 0 additions & 20 deletions code/modules/clothing/shoes/miscellaneous.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
8 changes: 0 additions & 8 deletions code/modules/food_and_drinks/food/snacks_meat.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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."
Expand Down
Loading

0 comments on commit caa19d2

Please sign in to comment.