Merge pull request #12960 from timothyteakettle/loadout-you-say

loadout changes part 1: adds subcategories to the loadout
2020-08-06 21:59:13 -07:00
parent 7e4f172ba5 e773062b9a
commit 1586625e6b
33 changed files with 799 additions and 758 deletions
@@ -40,7 +40,6 @@ GLOBAL_LIST_EMPTY(preferences_datums)
 										//If it's 0, that's good, if it's anything but 0, the owner of this prefs file's antag choices were,
 										//autocorrected this round, not that you'd need to check that.

-
 	var/UI_style = null
 	var/buttons_locked = FALSE
 	var/hotkeys = FALSE
@@ -1065,6 +1064,7 @@ GLOBAL_LIST_EMPTY(preferences_datums)
 			dat += "<tr><td colspan=4><center><b><font color='[gear_points == 0 ? "#E62100" : "#CCDDFF"]'>[gear_points]</font> loadout points remaining.</b> \[<a href='?_src_=prefs;preference=gear;clear_loadout=1'>Clear Loadout</a>\]</center></td></tr>"
 			dat += "<tr><td colspan=4><center>You can only choose one item per category, unless it's an item that spawns in your backpack or hands.</center></td></tr>"
 			dat += "<tr><td colspan=4><center><b>"
+
 			var/firstcat = TRUE
 			for(var/i in GLOB.loadout_items)
 				if(firstcat)
@@ -1075,6 +1075,7 @@ GLOBAL_LIST_EMPTY(preferences_datums)
 					dat += " <span class='linkOn'>[i]</span> "
 				else
 					dat += " <a href='?_src_=prefs;preference=gear;select_category=[i]'>[i]</a> "
+
 			dat += "</b></center></td></tr>"
 			dat += "<tr><td colspan=4><hr></td></tr>"
 			dat += "<tr><td colspan=4><b><center>[gear_tab]</center></b></td></tr>"
@@ -224,7 +224,7 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car
 	var/needs_update = savefile_needs_update(S)
 	if(needs_update == -2)		//fatal, can't load any data
 		return 0
-	
+
 	. = TRUE

 	//general preferences
@@ -443,7 +443,7 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car
 		return 0

 	. = TRUE
-	
+
 	//Species
 	var/species_id
 	S["species"]			>> species_id
@@ -469,3 +469,16 @@
 	icon_state = "maid"
 	item_state = "maid"
 	dynamic_hair_suffix = ""
+
+/obj/item/clothing/head/widered
+	name = "Wide red hat"
+	desc = "It is both wide, and red. Stylish!"
+	icon_state = "widehat_red"
+	item_state = "widehat_red"
+
+/obj/item/clothing/head/kabuto
+	name = "Kabuto helmet"
+	desc = "A traditional kabuto helmet."
+	icon_state = "kabuto"
+	item_state = "kabuto"
+	flags_inv = HIDEHAIR|HIDEEARS
@@ -1057,3 +1057,9 @@
 	desc = "Reminds you of someone, but you just can't put your finger on it..."
 	icon_state = "waldo_shirt"
 	item_state = "waldo_shirt"
+
+/obj/item/clothing/suit/samurai
+	name = "Samurai outfit"
+	desc = "An outfit used by traditional japanese warriors."
+	icon_state = "samurai"
+	item_state = "samurai"
@@ -329,3 +329,29 @@
 	desc = "cloud"
 	icon_state = "cloud"
 	can_adjust = FALSE
+
+/obj/item/clothing/under/costume/kimono
+	name = "Kimono"
+	desc = "A traditional piece of clothing from japan"
+	icon_state = "kimono"
+	item_state = "kimono"
+
+/obj/item/clothing/under/costume/kimono/black
+	name = "Black Kimono"
+	icon_state = "kimono_a"
+	item_state = "kimono_a"
+
+/obj/item/clothing/under/costume/kimono/kamishimo
+	name = "Kamishimo"
+	icon_state = "kamishimo"
+	item_state = "kamishimo"
+
+/obj/item/clothing/under/costume/kimono/fancy
+	name = "Fancy Kimono"
+	icon_state = "fancy_kimono"
+	item_state = "fancy_kimono"
+
+/obj/item/clothing/under/costume/kimono/sakura
+	name = "Sakura Kimono'"
+	icon_state = "sakura_kimono"
+	item_state = "sakura_kimono"
@@ -308,3 +308,21 @@
 	icon_state = "polyfemtankpantsu"
 	poly_states = 2
 	poly_colors = list("#808080", "#FF3535")
+
+/obj/item/clothing/under/misc/black_dress
+	name = "little black dress"
+	desc = "A small black dress"
+	icon_state = "littleblackdress_s"
+	item_state = "littleblackdress_s"
+
+/obj/item/clothing/under/misc/pinktutu
+	name = "pink tutu"
+	desc = "A pink tutu"
+	icon_state = "pinktutu_s"
+	item_state = "pinktutu_s"
+
+/obj/item/clothing/under/misc/bathrobe
+	name = "bathrobe"
+	desc = "A blue bathrobe."
+	icon_state = "bathrobe"
+	item_state = "bathrobe"