From bf0b9cb56917a20c98a7c4e5d4a81d956f7b7627 Mon Sep 17 00:00:00 2001 From: FreeStylaLT Date: Mon, 9 Mar 2020 15:27:20 +0200 Subject: [PATCH 1/3] removes cat ears from the autodrobe vendor --- code/datums/supplypacks.dm | 1 - code/game/machinery/vending.dm | 1 - 2 files changed, 2 deletions(-) diff --git a/code/datums/supplypacks.dm b/code/datums/supplypacks.dm index 8e20ebb7a93..628b020f6a4 100644 --- a/code/datums/supplypacks.dm +++ b/code/datums/supplypacks.dm @@ -1627,7 +1627,6 @@ var/list/all_supply_groups = list(supply_emergency,supply_security,supply_engine /obj/item/clothing/head/collectable/welding, /obj/item/clothing/head/collectable/flatcap, /obj/item/clothing/head/collectable/pirate, - /obj/item/clothing/head/collectable/kitty, /obj/item/clothing/head/crown/fancy, /obj/item/clothing/head/collectable/rabbitears, /obj/item/clothing/head/collectable/wizard, diff --git a/code/game/machinery/vending.dm b/code/game/machinery/vending.dm index 00d9f94a356..b796bcede2b 100644 --- a/code/game/machinery/vending.dm +++ b/code/game/machinery/vending.dm @@ -1390,7 +1390,6 @@ /obj/item/clothing/glasses/gglasses = 1, /obj/item/clothing/shoes/jackboots = 1, /obj/item/clothing/under/schoolgirl = 1, - /obj/item/clothing/head/kitty = 1, /obj/item/clothing/under/blackskirt = 1, /obj/item/clothing/suit/toggle/owlwings = 1, /obj/item/clothing/under/owl = 1, From ddbf3d3872a4b0e8e8452bacd8460d9dab2d9a01 Mon Sep 17 00:00:00 2001 From: FreeStylaLT Date: Mon, 9 Mar 2020 15:32:06 +0200 Subject: [PATCH 2/3] Also removes from loadout --- code/modules/client/preference/loadout/loadout_hat.dm | 4 ---- 1 file changed, 4 deletions(-) diff --git a/code/modules/client/preference/loadout/loadout_hat.dm b/code/modules/client/preference/loadout/loadout_hat.dm index 7d6275e09e4..d81f1f7e02c 100644 --- a/code/modules/client/preference/loadout/loadout_hat.dm +++ b/code/modules/client/preference/loadout/loadout_hat.dm @@ -152,7 +152,3 @@ /datum/gear/hat/flowerpin display_name = "hair flower" path = /obj/item/clothing/head/hairflower - -/datum/gear/hat/kitty - display_name = "kitty headband" - path = /obj/item/clothing/head/kitty From 6edc58a1df8d1552187b75cbc956e3d5513751c9 Mon Sep 17 00:00:00 2001 From: FreeStylaLT Date: Mon, 9 Mar 2020 15:43:19 +0200 Subject: [PATCH 3/3] adds collectible kitty ears back to the random hat crate --- code/datums/supplypacks.dm | 1 + 1 file changed, 1 insertion(+) diff --git a/code/datums/supplypacks.dm b/code/datums/supplypacks.dm index 628b020f6a4..8e20ebb7a93 100644 --- a/code/datums/supplypacks.dm +++ b/code/datums/supplypacks.dm @@ -1627,6 +1627,7 @@ var/list/all_supply_groups = list(supply_emergency,supply_security,supply_engine /obj/item/clothing/head/collectable/welding, /obj/item/clothing/head/collectable/flatcap, /obj/item/clothing/head/collectable/pirate, + /obj/item/clothing/head/collectable/kitty, /obj/item/clothing/head/crown/fancy, /obj/item/clothing/head/collectable/rabbitears, /obj/item/clothing/head/collectable/wizard,