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

Adds icons. Adds skirts to loadout options and closets.

Browse Source
This commit is contained in:
Cerebulon
2017-04-30 02:39:27 +01:00
parent 58e8d45457
commit 36decd20b7
9 changed files with 47 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -98,16 +98,24 @@
new /obj/item/clothing/under/lawyer/female(src)
new /obj/item/clothing/under/lawyer/black(src)
new /obj/item/clothing/under/lawyer/black(src)
new /obj/item/clothing/under/lawyer/black/skirt(src)
new /obj/item/clothing/under/lawyer/black/skirt(src)
new /obj/item/clothing/under/lawyer/red(src)
new /obj/item/clothing/under/lawyer/red(src)
new /obj/item/clothing/under/lawyer/red/skirt(src)
new /obj/item/clothing/under/lawyer/red/skirt(src)
new /obj/item/clothing/suit/storage/toggle/internalaffairs(src)
new /obj/item/clothing/suit/storage/toggle/internalaffairs(src)
new /obj/item/clothing/under/lawyer/bluesuit(src)
new /obj/item/clothing/under/lawyer/bluesuit(src)
new /obj/item/clothing/under/lawyer/bluesuit/skirt(src)
new /obj/item/clothing/under/lawyer/bluesuit/skirt(src)
new /obj/item/clothing/suit/storage/toggle/lawyer/bluejacket(src)
new /obj/item/clothing/suit/storage/toggle/lawyer/bluejacket(src)
new /obj/item/clothing/under/lawyer/purpsuit(src)
new /obj/item/clothing/under/lawyer/purpsuit(src)
new /obj/item/clothing/under/lawyer/purpsuit/skirt(src)
new /obj/item/clothing/under/lawyer/purpsuit/skirt(src)
new /obj/item/clothing/suit/storage/toggle/lawyer/purpjacket(src)
new /obj/item/clothing/suit/storage/toggle/lawyer/purpjacket(src)
new /obj/item/clothing/shoes/brown(src)
@@ -120,5 +128,7 @@
new /obj/item/clothing/glasses/sunglasses/big(src)
new /obj/item/clothing/under/lawyer/blue(src)
new /obj/item/clothing/under/lawyer/blue(src)
new /obj/item/clothing/under/lawyer/blue/skirt(src)
new /obj/item/clothing/under/lawyer/blue/skirt(src)
new /obj/item/device/tape/random(src)
new /obj/item/device/tape/random(src)

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

@@ -65,7 +65,9 @@
new /obj/item/clothing/under/dress/dress_hr(src)
new /obj/item/clothing/under/lawyer/female(src)
new /obj/item/clothing/under/lawyer/black(src)
new /obj/item/clothing/under/lawyer/black/skirt(src)
new /obj/item/clothing/under/lawyer/red(src)
new /obj/item/clothing/under/lawyer/red/skirt(src)
new /obj/item/clothing/under/lawyer/oldman(src)
new /obj/item/clothing/shoes/brown(src)
new /obj/item/clothing/shoes/black(src)

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

@@ -601,17 +601,25 @@
..()
new /obj/item/clothing/under/assistantformal(src)
new /obj/item/clothing/under/suit_jacket/charcoal(src)
new /obj/item/clothing/under/suit_jacket/charcoal/skirt(src)
new /obj/item/clothing/under/suit_jacket/navy(src)
new /obj/item/clothing/under/suit_jacket/navy/skirt(src)
new /obj/item/clothing/under/suit_jacket/burgundy(src)
new /obj/item/clothing/under/suit_jacket/burgundy/skirt(src)
new /obj/item/clothing/under/suit_jacket/checkered(src)
new /obj/item/clothing/under/suit_jacket/checkered/skirt(src)
new /obj/item/clothing/under/suit_jacket/tan(src)
new /obj/item/clothing/under/suit_jacket/tan/skirt(src)
new /obj/item/clothing/under/sl_suit(src)
new /obj/item/clothing/under/suit_jacket(src)
new /obj/item/clothing/under/suit_jacket/female(src)
new /obj/item/clothing/under/suit_jacket/female/skirt(src)
new /obj/item/clothing/under/suit_jacket/really_black(src)
new /obj/item/clothing/under/suit_jacket/really_black/skirt(src)
new /obj/item/clothing/under/suit_jacket/red(src)
new /obj/item/clothing/under/suit_jacket/red/skirt(src)
new /obj/item/clothing/under/scratch(src)
new /obj/item/clothing/under/scratch/skirt(src)
new /obj/item/weapon/storage/backpack/satchel(src)
new /obj/item/weapon/storage/backpack/satchel(src)
return

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

@@ -6,7 +6,7 @@
sort_category = "Uniforms and Casual Dress"
/datum/gear/uniform/blazerskirt
display_name = "blazer with skirt, blue"
display_name = "blazer, blue with skirt"
path = /obj/item/clothing/under/blazer/skirt
/datum/gear/uniform/cheongsam

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

@@ -6,9 +6,9 @@
icon_state = "ba_suit"
rolled_sleeves = 0
obj/item/clothing/under/rank/bartender/skirt
/obj/item/clothing/under/rank/bartender/skirt
desc = "Short and cute."
name = "bartender's uniform"
name = "bartender's skirt"
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.
@@ -103,8 +103,9 @@ obj/item/clothing/under/rank/bartender/skirt
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."
name = "Internal Affairs skirt"
icon_state = "internalaffairs_skirt"
/obj/item/clothing/under/rank/janitor
desc = "It's the official uniform of the station's janitor. It has minor protection from biohazards."
@@ -122,6 +123,7 @@ obj/item/clothing/under/rank/bartender/skirt
icon_state = "lawyer_black"
/obj/item/clothing/under/lawyer/black/skirt
name = "black Lawyer skirt"
icon_state = "lawyer_black_skirt"
/obj/item/clothing/under/lawyer/female
@@ -134,7 +136,7 @@ obj/item/clothing/under/rank/bartender/skirt
icon_state = "lawyer_red"
/obj/item/clothing/under/lawyer/red/skirt
name = "red Lawyer suit"
name = "red Lawyer skirt"
icon_state = "lawyer_red_skirt"
/obj/item/clothing/under/lawyer/blue
@@ -142,25 +144,27 @@ obj/item/clothing/under/rank/bartender/skirt
icon_state = "lawyer_blue"
/obj/item/clothing/under/lawyer/blue/skirt
name = "blue Lawyer suit"
name = "blue Lawyer skirt"
icon_state = "lawyer_blue_skirt"
/obj/item/clothing/under/lawyer/bluesuit
name = "Blue Suit"
name = "blue suit"
desc = "A classy suit."
icon_state = "bluesuit"
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
name = "blue skirt suit"
icon_state = "bluesuit_skirt"
/obj/item/clothing/under/lawyer/purpsuit
name = "Purple Suit"
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
name = "purple skirt suit"
icon_state = "lawyer_purp_skirt"
/obj/item/clothing/under/lawyer/oldman

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

@@ -114,6 +114,7 @@
starting_accessories = list(/obj/item/clothing/accessory/red_long, /obj/item/clothing/accessory/wcoat)
/obj/item/clothing/under/det/skirt
name = "detective's skirt"
icon_state = "detective_skirt"
desc = "A serious-looking white blouse paired with a formal black pencil skirt."

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

@@ -22,8 +22,7 @@
icon_state = "scratch"
/obj/item/clothing/under/scratch/skirt
name = "white suit"
desc = "A white suit, suitable for a excellent host"
name = "white skirt suit"
icon_state = "scratch_skirt"
/obj/item/clothing/under/sl_suit
@@ -104,6 +103,7 @@
starting_accessories = list(/obj/item/clothing/accessory/darkgreen)
/obj/item/clothing/under/gov/skirt
name = "Green formal skirt uniform"
desc = "A neat proper uniform of someone on offical business. The top button is sewn shut."
icon_state = "greensuit_skirt"
@@ -174,6 +174,7 @@
item_state_slots = list(slot_r_hand_str = "centcom", slot_l_hand_str = "centcom")
/obj/item/clothing/under/gimmick/rank/captain/suit/skirt
name = "colony director's skirt suit"
icon_state = "green_suit_skirt"
/obj/item/clothing/under/gimmick/rank/head_of_personnel/suit
@@ -183,6 +184,7 @@
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
name = "head of personnel's skirt suit"
icon_state = "teal_suit_skirt"
/obj/item/clothing/under/suit_jacket
@@ -198,6 +200,7 @@
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
name = "executive skirt suit"
desc = "A formal black suit and red necktie, intended for the station's finest."
icon_state = "really_black_suit_skirt"
@@ -221,8 +224,9 @@
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."
name = "red skirt suit"
desc = "A red suit and blue necktie. Somewhat formal."
icon_state = "red_suit_skirt"
/obj/item/clothing/under/schoolgirl
name = "schoolgirl uniform"
@@ -450,6 +454,7 @@
starting_accessories = list(/obj/item/clothing/accessory/navy, /obj/item/clothing/accessory/charcoal_jacket)
/obj/item/clothing/under/suit_jacket/charcoal/skirt
name = "charcoal skirt"
icon_state = "charcoal_suit_skirt"
/obj/item/clothing/under/suit_jacket/navy
@@ -460,6 +465,7 @@
starting_accessories = list(/obj/item/clothing/accessory/red, /obj/item/clothing/accessory/navy_jacket)
/obj/item/clothing/under/suit_jacket/navy/skirt
name = "navy skirt"
icon_state = "navy_suit_skirt"
/obj/item/clothing/under/suit_jacket/burgundy
@@ -470,6 +476,7 @@
starting_accessories = list(/obj/item/clothing/accessory/black, /obj/item/clothing/accessory/burgundy_jacket)
/obj/item/clothing/under/suit_jacket/burgundy/skirt
name = "burgundy skirt"
icon_state = "burgundy_suit_skirt"
/obj/item/clothing/under/suit_jacket/checkered
@@ -480,6 +487,7 @@
starting_accessories = list(/obj/item/clothing/accessory/black, /obj/item/clothing/accessory/checkered_jacket)
/obj/item/clothing/under/suit_jacket/checkered/skirt
name = "checkered skirt"
icon_state = "checkered_suit_skirt"
/obj/item/clothing/under/suit_jacket/tan
@@ -490,6 +498,7 @@
starting_accessories = list(/obj/item/clothing/accessory/yellow, /obj/item/clothing/accessory/tan_jacket)
/obj/item/clothing/under/suit_jacket/tan/skirt
name = "tan skirt"
icon_state = "tan_suit_skirt"
/obj/item/clothing/under/serviceoveralls
@@ -527,7 +536,7 @@
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"
name = "ladies blue blazer"
desc = "A bold but yet conservative outfit, a red pencil skirt and a navy blazer."
icon_state = "blue_blazer_skirt"