From f46e3b0c2894bc26bf346fb98df81dd253dd305a Mon Sep 17 00:00:00 2001 From: Apogee-dev <60533805+Apogee-dev@users.noreply.github.com> Date: Tue, 13 Feb 2024 20:54:16 -0800 Subject: [PATCH] removes maid outfits from loadout --- _maps/shuttles/independent/independent_beluga.dmm | 5 ----- _maps/shuttles/inteq/inteq_valor.dmm | 1 - _maps/shuttles/nanotrasen/nanotrasen_skipper.dmm | 1 - _maps/shuttles/syndicate/syndicate_aegis.dmm | 7 ------- _maps/shuttles/syndicate/syndicate_gorlex_komodo.dmm | 4 ---- code/modules/client/loadout/loadout_accessories.dm | 9 --------- code/modules/client/loadout/loadout_hat.dm | 4 ---- code/modules/client/loadout/loadout_uniform.dm | 4 ---- 8 files changed, 35 deletions(-) diff --git a/_maps/shuttles/independent/independent_beluga.dmm b/_maps/shuttles/independent/independent_beluga.dmm index a46e4b0270e9..ef0e3a0ade97 100644 --- a/_maps/shuttles/independent/independent_beluga.dmm +++ b/_maps/shuttles/independent/independent_beluga.dmm @@ -3342,7 +3342,6 @@ dir = 1 }, /obj/machinery/light/small/directional/west, -/obj/item/clothing/gloves/combat/maid/inteq, /obj/item/clothing/under/suit/charcoal, /obj/item/clothing/glasses/monocle, /obj/item/clothing/shoes/laceup{ @@ -3454,10 +3453,6 @@ pixel_y = -3; pixel_x = -9 }, -/obj/item/storage/box/maid{ - pixel_x = -9; - pixel_y = 8 - }, /turf/open/floor/carpet/nanoweave/beige, /area/ship/crew/dorm) "Hc" = ( diff --git a/_maps/shuttles/inteq/inteq_valor.dmm b/_maps/shuttles/inteq/inteq_valor.dmm index b518e589dd29..aebe46afb678 100644 --- a/_maps/shuttles/inteq/inteq_valor.dmm +++ b/_maps/shuttles/inteq/inteq_valor.dmm @@ -1205,7 +1205,6 @@ dir = 4 }, /obj/structure/closet/crate/bin, -/obj/item/storage/box/inteqmaid, /obj/item/trash/chips, /obj/item/trash/energybar, /obj/item/trash/cheesie, diff --git a/_maps/shuttles/nanotrasen/nanotrasen_skipper.dmm b/_maps/shuttles/nanotrasen/nanotrasen_skipper.dmm index 1a1d843bbaff..81465759ba48 100644 --- a/_maps/shuttles/nanotrasen/nanotrasen_skipper.dmm +++ b/_maps/shuttles/nanotrasen/nanotrasen_skipper.dmm @@ -3710,7 +3710,6 @@ /obj/structure/closet/cardboard{ name = "pranking materials" }, -/obj/item/storage/box/maid, /obj/item/toy/katana, /obj/item/bikehorn, /obj/item/grown/bananapeel, diff --git a/_maps/shuttles/syndicate/syndicate_aegis.dmm b/_maps/shuttles/syndicate/syndicate_aegis.dmm index e3534485955f..d86cb9b23de7 100644 --- a/_maps/shuttles/syndicate/syndicate_aegis.dmm +++ b/_maps/shuttles/syndicate/syndicate_aegis.dmm @@ -2047,18 +2047,11 @@ /area/ship/engineering) "rf" = ( /obj/structure/table, -/obj/item/storage/box/maid{ - pixel_x = -5; - pixel_y = 7 - }, /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/siding/wood{ dir = 8 }, /obj/structure/bedsheetbin, -/obj/item/storage/box/maid{ - pixel_x = 6 - }, /obj/machinery/light_switch{ pixel_y = 22 }, diff --git a/_maps/shuttles/syndicate/syndicate_gorlex_komodo.dmm b/_maps/shuttles/syndicate/syndicate_gorlex_komodo.dmm index 1281b77d9b0a..35486f0a3759 100644 --- a/_maps/shuttles/syndicate/syndicate_gorlex_komodo.dmm +++ b/_maps/shuttles/syndicate/syndicate_gorlex_komodo.dmm @@ -992,10 +992,6 @@ /obj/structure/railing{ dir = 1 }, -/obj/item/clothing/under/syndicate/skirt/maid, -/obj/item/clothing/gloves/combat/maid, -/obj/item/clothing/head/maidheadband/syndicate, -/obj/item/clothing/accessory/maidapron/syndicate, /obj/structure/closet/crate/secure/loot, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 6 diff --git a/code/modules/client/loadout/loadout_accessories.dm b/code/modules/client/loadout/loadout_accessories.dm index b7f7944787db..40702e5fc2be 100644 --- a/code/modules/client/loadout/loadout_accessories.dm +++ b/code/modules/client/loadout/loadout_accessories.dm @@ -67,10 +67,6 @@ description = "Only the truly insane would wear this around their neck." path = /obj/item/clothing/neck/petcollar -/datum/gear/accessory/maidneckpiece - display_name = "maid neckpiece" - path = /obj/item/clothing/neck/maid - /datum/gear/accessory/gloves/black display_name = "black gloves" description = "Standard hand coverings for everyday use." @@ -87,11 +83,6 @@ path = /obj/item/clothing/gloves/color/evening slot = ITEM_SLOT_GLOVES -/datum/gear/accessory/gloves/maid - display_name = "maid arm covers" - path = /obj/item/clothing/gloves/maid - slot = ITEM_SLOT_GLOVES - /datum/gear/accessory/tiki display_name = "tiki mask" description = "A wooden mask, simple, really." diff --git a/code/modules/client/loadout/loadout_hat.dm b/code/modules/client/loadout/loadout_hat.dm index a3337038d9a2..d4ab1c858f26 100644 --- a/code/modules/client/loadout/loadout_hat.dm +++ b/code/modules/client/loadout/loadout_hat.dm @@ -80,10 +80,6 @@ display_name = "top hat" path = /obj/item/clothing/head/that -/datum/gear/hat/maidheadband - display_name = "maid headband" - path = /obj/item/clothing/head/maidheadband - /datum/gear/hat/fedora display_name = "fedora" path = /obj/item/clothing/head/fedora diff --git a/code/modules/client/loadout/loadout_uniform.dm b/code/modules/client/loadout/loadout_uniform.dm index 1410bdb0fe4d..616c4308b437 100644 --- a/code/modules/client/loadout/loadout_uniform.dm +++ b/code/modules/client/loadout/loadout_uniform.dm @@ -241,7 +241,3 @@ /datum/gear/uniform/tacticool display_name = "tacticool turtleneck" path = /obj/item/clothing/under/syndicate/tacticool - -/datum/gear/uniform/maid - display_name = "maid dress" - path = /obj/item/clothing/under/costume/maid