cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-10 10:12:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Adds 23 new skirt versions of existing suit sprites.

Browse Source 
Adds them to loadout options and departmental uniform lockers as appropriate.
One new (Old Woman Attire) as equivalent to old man suit.
Some are unused, but now skirt sprites exist.
This commit is contained in:
Cerebulon
2017-04-29 12:01:40 +01:00
parent 5ff71f926c
commit 339b269393
9 changed files with 169 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
code/datums/supplypacks/security.dm
View File

@@ -200,6 +200,7 @@
/obj/item/clothing/under/det/black = 2,
/obj/item/clothing/under/det/grey = 2,
/obj/item/clothing/head/det/grey = 2,
/obj/item/clothing/under/det/skirt = 2,
/obj/item/clothing/under/det = 2,
/obj/item/clothing/head/det = 2,
/obj/item/clothing/suit/storage/det_trench,

1
code/game/objects/structures/crates_lockers/closets/job_closets.dm
View File

@@ -28,6 +28,7 @@
new /obj/item/clothing/under/sl_suit(src)
new /obj/item/clothing/under/rank/bartender(src)
new /obj/item/clothing/under/rank/bartender(src)
new /obj/item/clothing/under/rank/bartender/skirt(src)
new /obj/item/clothing/under/dress/dress_saloon(src)
new /obj/item/clothing/accessory/wcoat(src)
new /obj/item/clothing/accessory/wcoat(src)

1
code/game/objects/structures/crates_lockers/closets/secure/security.dm
View File

@@ -74,6 +74,7 @@
new /obj/item/clothing/under/rank/head_of_personnel_whimsy(src)
new /obj/item/clothing/head/caphat/hop(src)
new /obj/item/clothing/under/gimmick/rank/head_of_personnel/suit(src)
new /obj/item/clothing/under/gimmick/rank/head_of_personnel/suit/skirt(src)
new /obj/item/clothing/glasses/sunglasses(src)
return

2
code/game/objects/structures/crates_lockers/closets/wardrobe.dm
View File

@@ -82,6 +82,7 @@
new /obj/item/clothing/under/det/grey/waistcoat(src)
new /obj/item/clothing/under/det/black(src)
new /obj/item/clothing/under/det/black(src)
new /obj/item/clothing/under/det/skirt(src)
new /obj/item/clothing/under/det/corporate(src)
new /obj/item/clothing/under/det/corporate(src)
new /obj/item/clothing/suit/storage/det_trench(src)
@@ -637,5 +638,6 @@
new /obj/item/clothing/suit/storage/hooded/wintercoat/captain(src)
new /obj/item/clothing/head/beret/centcom/captain(src)
new /obj/item/clothing/under/gimmick/rank/captain/suit(src)
new /obj/item/clothing/under/gimmick/rank/captain/suit/skirt(src)
new /obj/item/clothing/glasses/sunglasses(src)
return

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

@@ -5,6 +5,10 @@
slot = slot_w_uniform
sort_category = "Uniforms and Casual Dress"
/datum/gear/uniform/blazerskirt
display_name = "blazer with skirt, blue"
path = /obj/item/clothing/under/blazer/skirt
/datum/gear/uniform/cheongsam
display_name = "cheongsam selection"
@@ -190,26 +194,50 @@
display_name = "suit, shiny-black"
path = /obj/item/clothing/under/lawyer/black
/datum/gear/uniform/suit/shinyblackskirt
display_name = "suit, shiny-black skirt"
path = /obj/item/clothing/under/lawyer/black/skirt
/datum/gear/uniform/suit/blue
display_name = "suit, blue"
path = /obj/item/clothing/under/lawyer/blue
/datum/gear/uniform/suit/blueskirt
display_name = "suit, blue skirt"
path = /obj/item/clothing/under/lawyer/blue/skirt
/datum/gear/uniform/suit/burgundy
display_name = "suit, burgundy"
path = /obj/item/clothing/under/suit_jacket/burgundy
/datum/gear/uniform/suit/burgundyskirt
display_name = "suit, burgundy skirt"
path = /obj/item/clothing/under/suit_jacket/burgundy/skirt
/datum/gear/uniform/suit/checkered
display_name = "suit, checkered"
path = /obj/item/clothing/under/suit_jacket/checkered
/datum/gear/uniform/suit/checkeredskirt
display_name = "suit, checkered skirt"
path = /obj/item/clothing/under/suit_jacket/checkered/skirt
/datum/gear/uniform/suit/charcoal
display_name = "suit, charcoal"
path = /obj/item/clothing/under/suit_jacket/charcoal
/datum/gear/uniform/suit/charcoalskirt
display_name = "suit, charcoal skirt"
path = /obj/item/clothing/under/suit_jacket/charcoal/skirt
/datum/gear/uniform/suit/exec
display_name = "suit, executive"
path = /obj/item/clothing/under/suit_jacket/really_black
/datum/gear/uniform/suit/execskirt
display_name = "suit, executive skirt"
path = /obj/item/clothing/under/suit_jacket/really_black/skirt
/datum/gear/uniform/suit/femaleexec
display_name = "suit, female-executive"
path = /obj/item/clothing/under/suit_jacket/female
@@ -218,18 +246,34 @@
display_name = "suit, gentlemen"
path = /obj/item/clothing/under/gentlesuit
/datum/gear/uniform/suit/gentleskirt
display_name = "suit, lady"
path = /obj/item/clothing/under/gentlesuit/skirt
/datum/gear/uniform/suit/navy
display_name = "suit, navy"
path = /obj/item/clothing/under/suit_jacket/navy
/datum/gear/uniform/suit/navyskirt
display_name = "suit, navy skirt"
path = /obj/item/clothing/under/suit_jacket/navy/skirt
/datum/gear/uniform/suit/red
display_name = "suit, red"
path = /obj/item/clothing/under/suit_jacket/red
/datum/gear/uniform/suit/redskirt
display_name = "suit, red skirt"
path = /obj/item/clothing/under/suit_jacket/red/skirt
/datum/gear/uniform/suit/redlawyer
display_name = "suit, lawyer-red"
path = /obj/item/clothing/under/lawyer/red
/datum/gear/uniform/suit/redlawyerskirt
display_name = "suit, lawyer-red skirt"
path = /obj/item/clothing/under/lawyer/red/skirt
/datum/gear/uniform/suit/oldman
display_name = "suit, old-man"
path = /obj/item/clothing/under/lawyer/oldman
@@ -238,18 +282,49 @@
display_name = "suit, purple"
path = /obj/item/clothing/under/lawyer/purpsuit
/datum/gear/uniform/suit/purpleskirt
display_name = "suit, purple skirt"
path = /obj/item/clothing/under/lawyer/purpsuit/skirt
/datum/gear/uniform/suit/tan
display_name = "suit, tan"
path = /obj/item/clothing/under/suit_jacket/tan
/datum/gear/uniform/suit/tanskirt
display_name = "suit, tan skirt"
path = /obj/item/clothing/under/suit_jacket/tan/skirt
/datum/gear/uniform/suit/white
display_name = "suit, white"
path = /obj/item/clothing/under/scratch
/datum/gear/uniform/suit/whiteskirt
display_name = "suit, white skirt"
path = /obj/item/clothing/under/scratch/skirt
/datum/gear/uniform/suit/whiteblue
display_name = "suit, white-blue"
path = /obj/item/clothing/under/lawyer/bluesuit
/datum/gear/uniform/suit/whiteblueskirt
display_name = "suit, white-blue skirt"
path = /obj/item/clothing/under/lawyer/bluesuit/skirt
/datum/gear/uniform/suit/detectiveskirt
display_name = "suit, detective skirt (Detective)"
path = /obj/item/clothing/under/det/skirt
allowed_roles = list("Detective")
/datum/gear/uniform/suit/iaskirt
display_name = "suit, Internal Affairs skirt (Internal Affairs)"
path = /obj/item/clothing/under/rank/internalaffairs/skirt
allowed_roles = list("Internal Affairs Agent")
/datum/gear/uniform/suit/bartenderskirt
display_name = "suit, bartender skirt (Bartender)"
path = /obj/item/clothing/under/rank/bartender/skirt
allowed_roles = list("Bartender")
/datum/gear/uniform/scrubs
display_name = "scrubs, black"
path = /obj/item/clothing/under/rank/medical/black
@@ -271,6 +346,10 @@
display_name = "scrubs, navy blue"
path = /obj/item/clothing/under/rank/medical/navyblue
/datum/gear/uniform/oldwoman
display_name = "old woman attire"
path = /obj/item/clothing/under/lawyer/oldwoman
/datum/gear/uniform/sundress
display_name = "sundress"
path = /obj/item/clothing/under/sundress

32
code/modules/clothing/under/jobs/civilian.dm
View File

@@ -6,6 +6,11 @@
icon_state = "ba_suit"
rolled_sleeves = 0
obj/item/clothing/under/rank/bartender/skirt
desc = "Short and cute."
name = "bartender's uniform"
icon_state = "ba_suit_skirt"
/obj/item/clothing/under/rank/captain //Alright, technically not a 'civilian' but its better then giving a .dm file for a single define.
desc = "It's a blue jumpsuit with some gold markings denoting the rank of \"Colony Director\"."
name = "colony director's jumpsuit"
@@ -97,6 +102,10 @@
rolled_sleeves = 0
starting_accessories = list(/obj/item/clothing/accessory/black)
/obj/item/clothing/under/rank/internalaffairs/skirt
icon_state = "internalaffairs_skirt"
desc = "The plain, professional attire of an Internal Affairs Agent. The top button is sewn shut."
/obj/item/clothing/under/rank/janitor
desc = "It's the official uniform of the station's janitor. It has minor protection from biohazards."
name = "janitor's jumpsuit"
@@ -112,6 +121,9 @@
name = "black Lawyer suit"
icon_state = "lawyer_black"
/obj/item/clothing/under/lawyer/black/skirt
icon_state = "lawyer_black_skirt"
/obj/item/clothing/under/lawyer/female
name = "black Lawyer suit"
icon_state = "black_suit_fem"
@@ -121,10 +133,18 @@
name = "red Lawyer suit"
icon_state = "lawyer_red"
/obj/item/clothing/under/lawyer/red/skirt
name = "red Lawyer suit"
icon_state = "lawyer_red_skirt"
/obj/item/clothing/under/lawyer/blue
name = "blue Lawyer suit"
icon_state = "lawyer_blue"
/obj/item/clothing/under/lawyer/blue/skirt
name = "blue Lawyer suit"
icon_state = "lawyer_blue_skirt"
/obj/item/clothing/under/lawyer/bluesuit
name = "Blue Suit"
desc = "A classy suit."
@@ -132,17 +152,29 @@
item_state_slots = list(slot_r_hand_str = "lawyer_blue", slot_l_hand_str = "lawyer_blue")
starting_accessories = list(/obj/item/clothing/accessory/red)
/obj/item/clothing/under/lawyer/bluesuit/skirt
icon_state = "bluesuit_skirt"
/obj/item/clothing/under/lawyer/purpsuit
name = "Purple Suit"
icon_state = "lawyer_purp"
item_state_slots = list(slot_r_hand_str = "purple", slot_l_hand_str = "purple")
/obj/item/clothing/under/lawyer/purpsuit/skirt
icon_state = "lawyer_purp_skirt"
/obj/item/clothing/under/lawyer/oldman
name = "Old Man's Suit"
desc = "A classic suit for the older gentleman with built in back support."
icon_state = "oldman"
item_state_slots = list(slot_r_hand_str = "johnny", slot_l_hand_str = "johnny")
/obj/item/clothing/under/lawyer/oldwoman
name = "Old Woman's Attire"
desc = "A typical outfit for the older woman, a lovely cardigan and comfortable skirt."
icon_state = "oldwoman"
item_state_slots = list(slot_r_hand_str = "johnny", slot_l_hand_str = "johnny")
/obj/item/clothing/under/librarian
name = "sensible suit"
desc = "It's very... sensible."

4
code/modules/clothing/under/jobs/security.dm
View File

@@ -113,6 +113,10 @@
desc = "A serious-looking tan dress shirt paired with freshly-pressed black slacks, complete with a red striped tie and waistcoat."
starting_accessories = list(/obj/item/clothing/accessory/red_long, /obj/item/clothing/accessory/wcoat)
/obj/item/clothing/under/det/skirt
icon_state = "detective_skirt"
desc = "A serious-looking white blouse paired with a formal black pencil skirt."
/*
* Head of Security
*/

50
code/modules/clothing/under/miscellaneous.dm
View File

@@ -21,6 +21,11 @@
desc = "A white suit, suitable for an excellent host"
icon_state = "scratch"
/obj/item/clothing/under/scratch/skirt
name = "white suit"
desc = "A white suit, suitable for a excellent host"
icon_state = "scratch_skirt"
/obj/item/clothing/under/sl_suit
desc = "It's a very amish looking suit."
name = "amish suit"
@@ -98,6 +103,10 @@
rolled_sleeves = 0
starting_accessories = list(/obj/item/clothing/accessory/darkgreen)
/obj/item/clothing/under/gov/skirt
desc = "A neat proper uniform of someone on offical business. The top button is sewn shut."
icon_state = "greensuit_skirt"
/obj/item/clothing/under/space
name = "\improper NASA jumpsuit"
desc = "It has a NASA logo on it and is made of space-proofed materials."
@@ -147,24 +156,35 @@
/obj/item/clothing/under/gentlesuit
name = "gentlemans suit"
desc = "A silk black shirt with a white tie and a matching gray vest and slacks. Feels proper."
desc = "A silk black shirt with matching gray slacks. Feels proper."
icon_state = "gentlesuit"
item_state_slots = list(slot_r_hand_str = "grey", slot_l_hand_str = "grey")
rolled_sleeves = 0
starting_accessories = list(/obj/item/clothing/accessory/white, /obj/item/clothing/accessory/wcoat/gentleman)
/obj/item/clothing/under/gentlesuit/skirt
name = "lady's suit"
desc = "A silk black blouse with a matching gray skirt. Feels proper."
icon_state = "gentlesuit_skirt"
/obj/item/clothing/under/gimmick/rank/captain/suit
name = "colony director's suit"
desc = "A green suit and yellow necktie. Exemplifies authority."
icon_state = "green_suit"
item_state_slots = list(slot_r_hand_str = "centcom", slot_l_hand_str = "centcom")
/obj/item/clothing/under/gimmick/rank/captain/suit/skirt
icon_state = "green_suit_skirt"
/obj/item/clothing/under/gimmick/rank/head_of_personnel/suit
name = "head of personnel's suit"
desc = "A teal suit and yellow necktie. An authoritative yet tacky ensemble."
icon_state = "teal_suit"
item_state_slots = list(slot_r_hand_str = "green", slot_l_hand_str = "green")
/obj/item/clothing/under/gimmick/rank/head_of_personnel/suit/skirt
icon_state = "teal_suit_skirt"
/obj/item/clothing/under/suit_jacket
name = "black suit"
desc = "A black suit and red tie. Very formal."
@@ -177,6 +197,10 @@
icon_state = "really_black_suit"
item_state_slots = list(slot_r_hand_str = "lawyer_black", slot_l_hand_str = "lawyer_black")
/obj/item/clothing/under/suit_jacket/really_black/skirt
desc = "A formal black suit and red necktie, intended for the station's finest."
icon_state = "really_black_suit_skirt"
/obj/item/clothing/under/suit_jacket/female
name = "executive suit"
desc = "A formal trouser suit for women, intended for the station's finest."
@@ -196,6 +220,10 @@
icon_state = "red_suit"
item_state_slots = list(slot_r_hand_str = "lawyer_red", slot_l_hand_str = "lawyer_red")
/obj/item/clothing/under/suit_jacket/red/skirt
name = "red suit"
desc = "A red suit and blue tie. Somewhat formal."
/obj/item/clothing/under/schoolgirl
name = "schoolgirl uniform"
desc = "It's just like one of my Japanese animes!"
@@ -421,6 +449,9 @@
item_state_slots = list(slot_r_hand_str = "lawyer_black", slot_l_hand_str = "lawyer_black")
starting_accessories = list(/obj/item/clothing/accessory/navy, /obj/item/clothing/accessory/charcoal_jacket)
/obj/item/clothing/under/suit_jacket/charcoal/skirt
icon_state = "charcoal_suit_skirt"
/obj/item/clothing/under/suit_jacket/navy
name = "navy suit"
desc = "A navy suit and red tie, intended for the station's finest."
@@ -428,6 +459,9 @@
item_state_slots = list(slot_r_hand_str = "lawyer_blue", slot_l_hand_str = "lawyer_blue")
starting_accessories = list(/obj/item/clothing/accessory/red, /obj/item/clothing/accessory/navy_jacket)
/obj/item/clothing/under/suit_jacket/navy/skirt
icon_state = "navy_suit_skirt"
/obj/item/clothing/under/suit_jacket/burgundy
name = "burgundy suit"
desc = "A burgundy suit and black tie. Somewhat formal."
@@ -435,6 +469,9 @@
item_state_slots = list(slot_r_hand_str = "lawyer_red", slot_l_hand_str = "lawyer_red")
starting_accessories = list(/obj/item/clothing/accessory/black, /obj/item/clothing/accessory/burgundy_jacket)
/obj/item/clothing/under/suit_jacket/burgundy/skirt
icon_state = "burgundy_suit_skirt"
/obj/item/clothing/under/suit_jacket/checkered
name = "checkered suit"
desc = "That's a very nice suit you have there. Shame if something were to happen to it, eh?"
@@ -442,6 +479,9 @@
item_state_slots = list(slot_r_hand_str = "lawyer_black", slot_l_hand_str = "lawyer_black")
starting_accessories = list(/obj/item/clothing/accessory/black, /obj/item/clothing/accessory/checkered_jacket)
/obj/item/clothing/under/suit_jacket/checkered/skirt
icon_state = "checkered_suit_skirt"
/obj/item/clothing/under/suit_jacket/tan
name = "tan suit"
desc = "A tan suit. Smart, but casual."
@@ -449,6 +489,9 @@
item_state_slots = list(slot_r_hand_str = "tan_suit", slot_l_hand_str = "tan_suit")
starting_accessories = list(/obj/item/clothing/accessory/yellow, /obj/item/clothing/accessory/tan_jacket)
/obj/item/clothing/under/suit_jacket/tan/skirt
icon_state = "tan_suit_skirt"
/obj/item/clothing/under/serviceoveralls
name = "workman outfit"
desc = "The very image of a working man. Not that you're probably doing work."
@@ -483,6 +526,11 @@
icon_state = "blue_blazer"
item_state_slots = list(slot_r_hand_str = "lawyer_blue", slot_l_hand_str = "lawyer_blue")
/obj/item/clothing/under/blazer/skirt
name = "blue blazer"
desc = "A bold but yet conservative outfit, a red pencil skirt and a navy blazer."
icon_state = "blue_blazer_skirt"
/obj/item/clothing/under/croptop
name = "crop top"
desc = "A shirt that has had the top cropped. This one is NT sponsored."