Merge branch 'master' into releaseupdate

code/datums/autolathe/tools_yw.dm

@@ -0,0 +1,7 @@
+/datum/category_item/autolathe/tools/ice_pick
+	name = "ice pick"
+	path =/obj/item/weapon/ice_pick
+
+/datum/category_item/autolathe/tools/shovel
+	name = "shovel"
+	path =/obj/item/weapon/shovel

code/modules/client/preference_setup/loadout/loadout_suit_yw.dm

@@ -1,4 +1,16 @@
 /datum/gear/suit/roles/poncho/cloak/blueshield
 	display_name = "cloak, blueshield"
 	path = /obj/item/clothing/accessory/poncho/roles/cloak/blueshield
-	allowed_roles = list("Blueshield Guard")
+	allowed_roles = list("Blueshield Guard")
+
+/datum/gear/suit/victailcoat
+	display_name = "Victorian tailcoat"
+	path = /obj/item/clothing/suit/storage/tailcoat
+
+/datum/gear/suit/victdress
+	display_name = "Victorian ladiescoat, Black"
+	path = /obj/item/clothing/suit/storage/victcoat
+
+/datum/gear/suit/victdress/red
+	display_name = "Victorian ladiescoat, Red"
+	path = /obj/item/clothing/suit/storage/victcoat/red

code/modules/client/preference_setup/loadout/loadout_uniform_yw.dm

@@ -0,0 +1,21 @@
+/datum/gear/uniform/victsuit
+	description = "A victorian style suit, fancy!"
+	display_name = "Victorian suit selection"
+
+/datum/gear/uniform/victsuit/New()
+	..()
+	var/list/victsuits = list()
+	for(var/suitvict in (typesof(/obj/item/clothing/under/yw/victsuit) - typesof(/obj/item/clothing/under/yw/victsuit/victdress)))
+		var/obj/item/clothing/under/yw/victsuit/suitvict_type = suitvict
+		victsuits[initial(suitvict_type.name)] = suitvict_type
+	gear_tweaks += new/datum/gear_tweak/path(sortAssoc(victsuits))
+
+/datum/gear/uniform/victdress
+	description = "A victorian style dress, fancy!"
+	display_name = "Victorian dress, Black"
+	path = /obj/item/clothing/under/yw/victsuit/victdress
+
+/datum/gear/uniform/redvictdress
+	description = "A victorian style dress, fancy!"
+	display_name = "Victorian Dress, Red"
+	path = /obj/item/clothing/under/yw/victsuit/victdress/red

code/modules/clothing/suits/storage_yw.dm

@@ -52,4 +52,24 @@
 /obj/item/clothing/suit/storage/explorer/command
 	name = "\improper Explorer command jacket"
 	desc = "A exploration jacket belonging to the Explorer's association. It has gold buttons and gold trim."
-	icon_state = "blackservice_com"
+	icon_state = "blackservice_com"
+
+
+/obj/item/clothing/suit/storage/tailcoat
+	name = "victorian tailcoat"
+	desc = "A fancy victorian tailcoat."
+	icon_state = "tailcoat"
+	icon_override = 'icons/mob/suit_yw.dmi'
+	item_state = "tailcoat"
+
+/obj/item/clothing/suit/storage/victcoat
+	name = "ladies black victorian coat"
+	desc = "A fancy victorian coat."
+	icon_state = "ladiesvictoriancoat"
+	icon_override = 'icons/mob/suit_yw.dmi'
+	item_state = "ladiesvictoriancoat"
+
+/obj/item/clothing/suit/storage/victcoat/red
+	name = "ladies red victorian coat"
+	icon_state = "ladiesredvictoriancoat"
+	item_state = "ladiesredvictoriancoat"

code/modules/clothing/under/extrauniforms_yw.dm

@@ -210,4 +210,44 @@
 	desc = "An old and worn down unifom of a missing exploration expedition. It has the words SGV DAEDALUS written on the back."
 	icon_state = "greyutility_sup"
 	worn_state = "greyutility_sup"
-	icon_override = 'icons/mob/uniform_yw.dmi'
+	icon_override = 'icons/mob/uniform_yw.dmi'
+
+
+/obj/item/clothing/under/yw/victsuit/victdress
+	name = "black victorian dress"
+	desc = "A victorian style dress, fancy!"
+	icon_state = "victorianblackdress"
+	item_state = "victorianblackdress"
+	body_parts_covered = UPPER_TORSO|LOWER_TORSO
+
+/obj/item/clothing/under/yw/victsuit/victdress/red
+	name = "red victorian dress"
+	icon_state = "victorianreddress"
+	item_state = "victorianreddress"
+
+/obj/item/clothing/under/yw/victsuit
+	name = "black victorian suit"
+	desc = "A victorian style suit, fancy!"
+	icon = 'icons/mob/uniform_yw.dmi'
+	icon_state = "victorianvest"
+	item_state = "victorianvest"
+	icon_override = 'icons/mob/uniform_yw.dmi'
+	body_parts_covered = UPPER_TORSO|LOWER_TORSO
+
+/obj/item/clothing/under/yw/victsuit/redblk
+	name = "red and black victorian suit"
+	icon_state = "victorianblred"
+	item_state = "victorianblred"
+
+/obj/item/clothing/under/yw/victsuit/red
+	name = "red victorian suit"
+	icon_state = "victorianredvest"
+	item_state = "victorianredvest"
+
+/obj/item/clothing/under/yw/victsuit/get_worn_icon_file(var/body_type,var/slot_name,var/default_icon,var/inhands)
+	if(body_type == SPECIES_GREY_YW)
+		if(!inhands)
+			return 'icons/mob/species/grey/uniform.dmi'
+
+	else
+		return ..()

maps/yw/cryogaia_things.dm

@@ -469,18 +469,6 @@ var/global/list/latejoin_tram   = list()
 		..()
 //end of freezable airlock stuff.
 
-//Ice pick, mountain axe, or ice axe.
-/obj/item/weapon/ice_pick
-	name = "ice axe"
-	desc = "A sharp tool for climbers and hikers to break up ice and keep themselves from slipping on a steep slope."
-	icon = 'icons/obj/items_yw.dmi'
-	icon_state = "icepick"
-	item_state = "icepick"
-	force = 15 //increasing force for icepick/axe, cause it's a freaking iceaxe.
-	throwforce = 0
-//end of Ice Pick
-
-
 /obj/structure/closet/secure_closet/guncabinet/excursion
 	name = "expedition weaponry cabinet"
 	req_one_access = list(access_explorer,access_brig)

maps/yw/items/icepick.dm

@@ -0,0 +1,10 @@
+//Ice pick, mountain axe, or ice axe.YW Creation.
+/obj/item/weapon/ice_pick
+	name = "ice axe"
+	desc = "A sharp tool for climbers and hikers to break up ice and keep themselves from slipping on a steep slope."
+	icon = 'icons/obj/items_yw.dmi'
+	icon_state = "icepick"
+	item_state = "icepick"
+	matter = list(DEFAULT_WALL_MATERIAL = 12000) //Same as a knife
+	force = 15 //increasing force for icepick/axe, cause it's a freaking iceaxe.
+	throwforce = 0

vorestation.dme

@@ -314,6 +314,7 @@
 #include "code\datums\autolathe\medical_vr.dm"
 #include "code\datums\autolathe\tools.dm"
 #include "code\datums\autolathe\tools_vr.dm"
+#include "code\datums\autolathe\tools_yw.dm"
 #include "code\datums\helper_datums\construction_datum.dm"
 #include "code\datums\helper_datums\events.dm"
 #include "code\datums\helper_datums\getrev.dm"
@@ -3547,6 +3548,7 @@
 #include "maps\yw\items\encryptionkey_vr.dm"
 #include "maps\yw\items\headset_sc.dm"
 #include "maps\yw\items\headset_vr.dm"
+#include "maps\yw\items\icepick.dm"
 #include "maps\yw\items\clothing\sc_accessory.dm"
 #include "maps\yw\items\clothing\sc_suit.dm"
 #include "maps\yw\items\clothing\sc_under.dm"