Merge pull request tgstation#7528 from paprka/clothessec

Some clothing changes

code/game/jobs/job/civilian.dm

@@ -40,7 +40,7 @@ Bartender
 
 /datum/job/bartender/equip_items(var/mob/living/carbon/human/H)
 	H.equip_to_slot_or_del(new /obj/item/clothing/shoes/sneakers/black(H), slot_shoes)
-	H.equip_to_slot_or_del(new /obj/item/clothing/suit/armor/vest/alt(H), slot_wear_suit)
+	H.equip_to_slot_or_del(new /obj/item/clothing/suit/armor/vest(H), slot_wear_suit)
 	H.equip_to_slot_or_del(new /obj/item/clothing/under/rank/bartender(H), slot_w_uniform)
 
 	if(H.backbag != 1)

code/game/objects/items/weapons/storage/belt.dm

@@ -189,14 +189,15 @@
 
 /obj/item/weapon/storage/belt/holster
 	name = "shoulder holster"
-	desc = "A holster to conceal a carried handgun. WARNING: Badasses only."
+	desc = "A holster to conceal a carried handgun and ammo. WARNING: Badasses only."
 	icon_state = "holster"
 	item_state = "holster"
-	storage_slots = 1
-	max_w_class = 4
+	storage_slots = 3
+	max_w_class = 3
 	can_hold = list(
 		/obj/item/weapon/gun/projectile/automatic/pistol,
-		/obj/item/weapon/gun/projectile/revolver/detective
+		/obj/item/weapon/gun/projectile/revolver,
+		/obj/item/ammo_box,
 		)
 
 /obj/item/weapon/storage/belt/fannypack

code/game/objects/structures/crates_lockers/closets/secure/security.dm

@@ -48,7 +48,7 @@
 	new /obj/item/clothing/shoes/sneakers/brown(src)
 	new /obj/item/weapon/storage/box/ids(src)
 	new /obj/item/weapon/storage/box/ids(src)
-	new /obj/item/clothing/suit/armor/vest/alt(src)
+	new /obj/item/clothing/suit/armor/vest(src)
 	new /obj/item/weapon/gun/energy/gun(src)
 	new /obj/item/device/flash/handheld(src)
 	new /obj/item/clothing/glasses/sunglasses(src)
@@ -75,8 +75,9 @@
 	new /obj/item/clothing/under/hosparadefem(src)
 	new /obj/item/clothing/under/hosparademale(src)
 	new /obj/item/clothing/suit/armor/hos(src)
+	new /obj/item/clothing/under/rank/head_of_security/alt(src)
 	new /obj/item/clothing/head/HoS(src)
-	new /obj/item/clothing/glasses/hud/security/eyepatch(src)
+	new /obj/item/clothing/glasses/hud/security/sunglasses/eyepatch(src)
 	new /obj/item/weapon/storage/lockbox/loyalty(src)
 	new /obj/item/weapon/storage/box/flashbangs(src)
 	new /obj/item/clothing/mask/gas/sechailer/swat(src)
@@ -103,8 +104,9 @@
 	new /obj/item/device/radio/headset/headset_sec(src)
 	new /obj/item/clothing/suit/armor/vest/warden/(src)
 	new /obj/item/clothing/head/warden(src)
-	new /obj/item/clothing/suit/armor/vest/warden/alt(src)
 	new /obj/item/clothing/head/beret/sec/navywarden(src)
+	new /obj/item/clothing/suit/armor/vest/warden/alt(src)
+	new /obj/item/clothing/under/rank/warden/navyblue(src)
 	new /obj/item/clothing/glasses/hud/security/sunglasses(src)
 	new /obj/item/clothing/mask/gas/sechailer(src)
 	new /obj/item/weapon/storage/box/flashbangs(src)

code/modules/clothing/glasses/hud.dm

@@ -40,7 +40,7 @@
 	icon_state = "securityhud"
 	hud_type = DATA_HUD_SECURITY_ADVANCED
 
-/obj/item/clothing/glasses/hud/security/eyepatch
+/obj/item/clothing/glasses/hud/security/sunglasses/eyepatch
 	name = "Eyepatch HUD"
 	desc = "A heads-up display that connects directly to the optical nerve of the user, replacing the need for that useless eyeball."
 	icon_state = "hudpatch"

code/modules/clothing/head/helmet.dm

@@ -13,7 +13,8 @@
 	strip_delay = 60
 
 /obj/item/clothing/head/helmet/alt
-	desc = "A bulletproof helmet that excels in protecting the wearer against traditional projectile weaponry and explosives to a minor extent."
+	name = "bulletproof helmet"
+	desc = "A bulletproof combat helmet that excels in protecting the wearer against traditional projectile weaponry and explosives to a minor extent."
 	icon_state = "helmetalt"
 	item_state = "helmetalt"
 	armor = list(melee = 25, bullet = 80, laser = 10, energy = 10, bomb = 40, bio = 0, rad = 0)

code/modules/clothing/suits/armor.dm

@@ -16,14 +16,6 @@
 	blood_overlay_type = "armor"
 	armor = list(melee = 50, bullet = 15, laser = 50, energy = 10, bomb = 25, bio = 0, rad = 0)
 
-/obj/item/clothing/suit/armor/vest/alt
-	name = "armor"
-	desc = "An armored vest that protects against most types of damage. This is a civilian variant."
-	icon_state = "armoralt"
-	item_state = "armoralt"
-	blood_overlay_type = "armor"
-	armor = list(melee = 50, bullet = 15, laser = 50, energy = 10, bomb = 25, bio = 0, rad = 0)
-
 /obj/item/clothing/suit/armor/hos
 	name = "armored greatcoat"
 	desc = "A greatcoat enchanced with a special alloy for some protection and style for those with a commanding presence."

code/modules/clothing/under/jobs/security.dm

@@ -10,19 +10,19 @@
  */
 
 /obj/item/clothing/under/rank/security
-	name = "security suit"
-	desc = "A formal security suit for officers complete with nanotrasen belt buckle."
+	name = "security jumpsuit"
+	desc = "A tactical security jumpsuit for officers complete with nanotrasen belt buckle."
 	icon_state = "security"
-	item_state = "gy_suit"
+	item_state = "r_suit"
 	item_color = "security"
 	armor = list(melee = 10, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 0, rad = 0)
 	strip_delay = 50
 
 /obj/item/clothing/under/rank/warden
-	name = "warden's suit"
-	desc = "A formal security suit for the warden with blue desginations and '/Warden/' stiched into the shoulders."
+	name = "warden's jumpsuit"
+	desc = "A tactical security jumpsuit for the warden with silver desginations and '/Warden/' stiched into the shoulders."
 	icon_state = "warden"
-	item_state = "gy_suit"
+	item_state = "r_suit"
 	item_color = "warden"
 	armor = list(melee = 10, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 0, rad = 0)
 	strip_delay = 50
@@ -50,35 +50,42 @@
  * Head of Security
  */
 /obj/item/clothing/under/rank/head_of_security
-	name = "head of security's suit"
-	desc = "A security suit decorated for those few with the dedication to achieve the position of Head of Security."
+	name = "head of security's jumpsuit"
+	desc = "A security jumpsuit decorated for those few with the dedication to achieve the position of Head of Security."
 	icon_state = "hos"
-	item_state = "gy_suit"
+	item_state = "r_suit"
 	item_color = "hos"
 	armor = list(melee = 10, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 0, rad = 0)
 	strip_delay = 60
 
+/obj/item/clothing/under/rank/head_of_security/alt
+	name = "head of security's turtleneck"
+	desc = "A stylish alternative to the normal head of security jumpsuit, complete with tactical pants."
+	icon_state = "hosalt"
+	item_state = "bl_suit"
+	item_color = "hosalt"
+
 /*
  * Navy uniforms
  */
 
 /obj/item/clothing/under/rank/security/navyblue
-	name = "security officer's uniform"
+	name = "security officer's formal uniform"
 	desc = "The latest in fashionable security outfits."
 	icon_state = "officerblueclothes"
 	item_state = "officerblueclothes"
 	item_color = "officerblueclothes"
 
 /obj/item/clothing/under/rank/head_of_security/navyblue
 	desc = "The insignia on this uniform tells you that this uniform belongs to the Head of Security."
-	name = "head of security's uniform"
+	name = "head of security's formal uniform"
 	icon_state = "hosblueclothes"
 	item_state = "hosblueclothes"
 	item_color = "hosblueclothes"
 
 /obj/item/clothing/under/rank/warden/navyblue
 	desc = "The insignia on this uniform tells you that this uniform belongs to the Warden."
-	name = "warden's uniform"
+	name = "warden's formal uniform"
 	icon_state = "wardenblueclothes"
 	item_state = "wardenblueclothes"
 	item_color = "wardenblueclothes"

code/modules/hydroponics/biogenerator.dm

@@ -161,6 +161,7 @@
 			dat += "Medical belt: <A href='?src=\ref[src];create=mbelt;amount=1'>Make</A> ([300/efficiency])<BR>"
 			dat += "Janitorial belt: <A href='?src=\ref[src];create=jbelt;amount=1'>Make</A> ([300/efficiency])<BR>"
 			dat += "Bandolier belt: <A href='?src=\ref[src];create=bbelt;amount=1'>Make</A> ([300/efficiency])<BR>"
+			dat += "Shoulder holster: <A href='?src=\ref[src];create=sholster;amount=1'>Make</A> ([400/efficiency])<BR>"
 			dat += "Leather Satchel: <A href='?src=\ref[src];create=satchel;amount=1'>Make</A> ([400/efficiency])<BR>"
 			dat += "Leather Jacket: <A href='?src=\ref[src];create=jacket;amount=1'>Make</A> ([500/efficiency])<BR>"
 			dat += "</div>"
@@ -283,6 +284,9 @@
 		if("bbelt")
 			if (check_cost(300/efficiency)) return 0
 			else new/obj/item/weapon/storage/belt/bandolier(src.loc)
+		if("sholster")
+			if (check_cost(400/efficiency)) return 0
+			else new/obj/item/weapon/storage/belt/holster(src.loc)
 		if("satchel")
 			if (check_cost(400/efficiency)) return 0
 			else new/obj/item/weapon/storage/backpack/satchel(src.loc)

code/modules/mob/living/simple_animal/friendly/corgi.dm

@@ -149,7 +149,7 @@
 
 					//The objects that corgis can wear on their backs.
 					var/list/allowed_types = list(
-						/obj/item/clothing/suit/armor/vest/alt,
+						/obj/item/clothing/suit/armor/vest,
 						/obj/item/device/radio,
 						/obj/item/device/radio/off,
 						/obj/item/clothing/suit/cardborg,

html/changelogs/Paprka-clothessec.yml

@@ -0,0 +1,6 @@
+author: Paprka
+
+delete-after: True
+
+changes: 
+  - rscadd: "Changed some clothing around. Added a turtleneck for the HoS. Removed 'civillian' armor and gave normal armor to the bartender and HoP. Added flash protection to the HoS' eyepatch, it functions like sunglasses now. Additionally, added the ability to store ammo on your shoulder holster as detective."