cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-08-24 05:23:22 +01:00
Code Issues Packages Projects Releases Wiki Activity

Another fashion update: dress, medical gown and fannypack edition (#5296)

Browse Source 
-adds some new dresses ported from polaris and tg to the custom loadout, at some players request
-adds the medical gown, replacing the white jumpsuit in patient's closet, suggested here: https://forums.aurorastation.org/viewtopic.php?f=18&t=11622&
-adds fannypacks to the loadout
-adds some xeno hardsuit sprites, ported from polaris
This commit is contained in:
Alberyk
2018-09-30 22:15:02 +03:00
committed by Erki
parent 9f8cfc7e87
commit 69f92be449
12 changed files with 136 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/client/preference_setup/loadout/loadout_uniform.dm
+7
View File
@@ -114,6 +114,13 @@
dress["dress, orange"] = /obj/item/clothing/under/dress/dress_orange
dress["dress, pink"] = /obj/item/clothing/under/dress/dress_pink
dress["dress, yellow"] = /obj/item/clothing/under/dress/dress_yellow
dress["dress, white"] = /obj/item/clothing/under/dress/white
dress["dress, stripped"] = /obj/item/clothing/under/dress/stripeddress
dress["dress, sailor"] = /obj/item/clothing/under/dress/sailordress
dress["dress, red swept"] = /obj/item/clothing/under/dress/red_swept_dress
dress["dress, western bustle"] = /obj/item/clothing/under/dress/westernbustle
dress["dress, black tango"] = /obj/item/clothing/under/dress/blacktango
dress["dress, black tango alternative"] = /obj/item/clothing/under/dress/blacktango/alt
dress["cheongsam, white"] = /obj/item/clothing/under/cheongsam
dress["cheongsam, red"] = /obj/item/clothing/under/cheongsam/red
dress["cheongsam, blue"] = /obj/item/clothing/under/cheongsam/blue
code/modules/client/preference_setup/loadout/loadout_utility.dm
+14 -1
View File
@@ -2,7 +2,7 @@
display_name = "briefcase"
path = /obj/item/weapon/storage/briefcase
sort_category = "Utility"
/datum/gear/utility/secure
display_name = "secure briefcase"
path = /obj/item/weapon/storage/secure/briefcase
@@ -53,3 +53,16 @@
/datum/gear/utility/camera
display_name = "camera"
path = /obj/item/device/camera
/datum/gear/utility/fannypack
display_name = "fannypack selection"
cost = 2
path = /obj/item/weapon/storage/belt/fannypack
/datum/gear/utility/fannypack/New()
..()
var/list/fannys = list()
for(var/fanny in typesof(/obj/item/weapon/storage/belt/fannypack))
var/obj/item/weapon/storage/belt/fannypack/fanny_type = fanny
fannys[initial(fanny_type.name)] = fanny_type
gear_tweaks += new/datum/gear_tweak/path(sortAssoc(fannys))
code/modules/clothing/under/miscellaneous.dm
+48 -3
View File
@@ -332,11 +332,10 @@
item_state = "p_suit"
worn_state = "dress_saloon"
/obj/item/clothing/under/dress/dress_evening
name = "Evening Gown"
name = "evening gown"
desc = "A silky gown, leaves much to the imagination"
icon_state = "red_evening_gown_s"
icon_state = "red_evening_gown"
item_state = "red_evening_gown"
/obj/item/clothing/under/dress/dress_cap
@@ -424,6 +423,40 @@
worn_state = "sundress_white"
body_parts_covered = UPPER_TORSO|LOWER_TORSO
/obj/item/clothing/under/dress/stripeddress
name = "striped dress"
desc = "Fashion in space."
icon_state = "striped_dress"
/obj/item/clothing/under/dress/sailordress
name = "sailor dress"
desc = "Formal wear for a leading lady."
icon_state = "sailor_dress"
/obj/item/clothing/under/dress/white
name = "white dress"
desc = "A fancy white dress with a blue underdress."
icon_state = "whitedress"
flags_inv = HIDESHOES
/obj/item/clothing/under/dress/red_swept_dress
name = "red swept dress"
desc = "A red dress that sweeps to the side."
icon_state = "red_swept_dress"
/obj/item/clothing/under/dress/westernbustle
name = "western bustle"
desc = "A western bustle dress from somewhere in the ancient history of Earth."
icon_state = "westernbustle"
/obj/item/clothing/under/dress/blacktango
name = "black tango dress"
desc = "An earthen black tango dress."
icon_state = "black_tango"
/obj/item/clothing/under/dress/blacktango/alt
icon_state = "black_tango_alt"
/obj/item/clothing/under/captainformal
name = "captain's formal uniform"
desc = "A captain's formal-wear, for special occasions."
@@ -652,3 +685,15 @@
icon_state = "greensuit"
item_state = "greensuit"
worn_state = "greensuit"
/obj/item/clothing/under/medical_gown
name = "medical gown"
desc = "A loose pieces of clothing, commonly worn by medical patients."
icon_state = "medicalgown"
item_state = "medicalgown"
has_sensor = 2
sensor_mode = 3
/obj/item/clothing/under/medical_gown/white
icon_state = "whitemedicalgown"
worn_state = "whitemedicalgown"