cyberpresidentvanellope/Polaris
1
0
Fork 0
mirror of https://github.com/PolarisSS13/Polaris.git synced 2026-01-03 22:13:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4384 from Belsima/maid

Browse Source 
Adds maid bonnet, more hair pins, and adds maid uniform to locker.
This commit is contained in:
Anewbe
2017-12-12 19:51:35 -06:00
committed by GitHub
parent c0615e47cf 0a76047cef
commit 3b89c5e320
10 changed files with 2072 additions and 2002 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
code/modules/client/preference_setup/loadout/loadout_head.dm
View File

@@ -159,12 +159,24 @@
/datum/gear/head/hairflower
display_name = "hair flower pin (colorable)"
path = /obj/item/clothing/head/hairflower/white
path = /obj/item/clothing/head/pin/flower/white
/datum/gear/head/hairflower/New()
..()
gear_tweaks = list(gear_tweak_free_color_choice)
/datum/gear/head/pin
display_name = "pin selection"
path = /obj/item/clothing/head/pin
/datum/gear/head/pin/New()
..()
var/list/pins = list()
for(var/pin in typesof(/obj/item/clothing/head/pin))
var/obj/item/clothing/head/pin/pin_type = pin
pins[initial(pin_type.name)] = pin_type
gear_tweaks += new/datum/gear_tweak/path(sortAssoc(pins))
/datum/gear/head/hardhat
display_name = "hardhat selection"
path = /obj/item/clothing/head/hardhat
@@ -295,11 +307,11 @@
..()
gear_tweaks = list(gear_tweak_free_color_choice)
/datum/gear/head/bow
display_name = "hair bow"
path = /obj/item/clothing/head/hairflower/bow
/datum/gear/head/bow/small
display_name = "hair bow, small (colorable)"
path = /obj/item/clothing/head/pin/bow
/datum/gear/head/bow/New()
/datum/gear/head/bow/small/New()
..()
gear_tweaks = list(gear_tweak_free_color_choice)

16
code/modules/client/preference_setup/loadout/loadout_uniform.dm
View File

@@ -363,13 +363,17 @@
display_name = "red evening gown"
path = /obj/item/clothing/under/dress/redeveninggown
/datum/gear/uniform/dresses/janimaid
display_name = "maid uniform"
path = /obj/item/clothing/under/dress/janimaid
/datum/gear/uniform/dresses/maid
display_name = "maid uniform selection"
path = /obj/item/clothing/under/dress/maid
/datum/gear/uniform/dresses/sexymaid
display_name = "sexy maid uniform"
path = /obj/item/clothing/under/dress/sexymaid
/datum/gear/uniform/dresses/maid/New()
..()
var/list/maids = list()
for(var/maid in typesof(/obj/item/clothing/under/dress/maid))
var/obj/item/clothing/under/dress/maid/maid_type = maid
maids[initial(maid_type.name)] = maid_type
gear_tweaks += new/datum/gear_tweak/path(sortAssoc(maids))
/datum/gear/uniform/utility
display_name = "utility, black"