Skip to content

Commit

Permalink
Removes roundstart maid outfits (#2732)
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 maid outfits from loadouts, as well as from a variety of faction
maps. The remaining ones are only on RP-focused independent ships and
event ships.

## Why It's Good For The Game

Lorema + admin request. Please be at least a little normal.

## Changelog

:cl:
del: Removed maid outfits from loadouts and faction ships
/: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
Apogee-dev authored Feb 15, 2024
1 parent 9c0d202 commit 11df16f
Show file tree
Hide file tree
Showing 8 changed files with 0 additions and 35 deletions.
5 changes: 0 additions & 5 deletions _maps/shuttles/independent/independent_beluga.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -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{
Expand Down Expand Up @@ -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" = (
Expand Down
1 change: 0 additions & 1 deletion _maps/shuttles/inteq/inteq_valor.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
1 change: 0 additions & 1 deletion _maps/shuttles/nanotrasen/nanotrasen_skipper.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
7 changes: 0 additions & 7 deletions _maps/shuttles/syndicate/syndicate_aegis.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -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
},
Expand Down
4 changes: 0 additions & 4 deletions _maps/shuttles/syndicate/syndicate_gorlex_komodo.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
9 changes: 0 additions & 9 deletions code/modules/client/loadout/loadout_accessories.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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."
Expand All @@ -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."
Expand Down
4 changes: 0 additions & 4 deletions code/modules/client/loadout/loadout_hat.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 0 additions & 4 deletions code/modules/client/loadout/loadout_uniform.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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

0 comments on commit 11df16f

Please sign in to comment.