Bolton's Assortment of Costumes! (#3009)

* This is my repository right?

If not then I'm surprised

* Slight Fix

Just remembered I forgot to finish a description, a bit embarrassing! Now it's completed.

* Changed to Secdrobe

Made more sense to change it to the Secdrobe instead of the autodrobe, as it was a cop mascot costume in its description, it doesn't make sense for it to not be used by security, IMO.

* Tweaking

Tweaked some more elements of the descriptions and design of the suit.

* Added More Costumes!

The original was pretty small, so adding this gives it a lot more justification, plus adds in a few things we didn't have, like a module for glasses, which previously was missing due to people improperly placing items into the TG code (I think.)

* Tweak to CS Glasses

Accidentally had the code a little bit off, with the dmi file mislabeled. Fixed now!

* Added the metrocop uniform

Here is the uniform that the metrocops use in Half Life 2, added to my costumes and stuff.

* Citizen Uniform

To match the metrocop!

code/modules/vending/autodrobe.dm

@@ -67,6 +67,9 @@
 				/obj/item/clothing/under/costume/worldchampiongi = 1,
 				/obj/item/clothing/head/milkmanhat = 2,
 				/obj/item/clothing/under/costume/milkman = 2,
+				/obj/item/clothing/shoes/bb_slippers = 1,
+				/obj/item/clothing/head/bb_wig = 1,
+		        /obj/item/clothing/under/costume/bb_dress = 1,
 				//Monkestation Addition end
 			),
 		),
@@ -88,6 +91,14 @@
 				/obj/item/clothing/suit/costume/shrine_maiden = 1,
 				/obj/item/gohei = 1,
 				/obj/item/clothing/under/costume/skeleton = 1,
+				//Monkestation Addition start
+				/obj/item/clothing/shoes/costume_2021/infinity_shoes = 5,
+				/obj/item/clothing/under/costume/infinity_under = 5,
+				/obj/item/clothing/suit/infinity_jacket = 5,
+				/obj/item/clothing/gloves/infinity_gloves = 5,
+				/obj/item/clothing/suit/thekiller_robe = 1,
+				/obj/item/clothing/head/thekiller_head = 1,
+				//Monkestation Addition end
 			),
 		),
 		list(
@@ -227,6 +238,10 @@
 				/obj/item/clothing/suit/shipwreckedsuit = 2,
 				/obj/item/clothing/head/kingofbugshelmet = 2,
 				/obj/item/clothing/suit/kingofbugssuit = 2,
+				/obj/item/clothing/shoes/crueltysquad_shoes = 2, // MONKESTATION EDIT ADDITION
+				/obj/item/clothing/under/costume/crueltysquad_under = 2, // MONKESTATION EDIT ADDITION
+				/obj/item/clothing/glasses/crueltysquad_glasses = 2, // MONKESTATION EDIT ADDITION
+				/obj/item/clothing/gloves/crueltysquad_gloves = 2, // MONKESTATION EDIT ADDITION
 			),
 		),
 	)

code/modules/vending/clothesmate.dm

@@ -76,6 +76,7 @@
 				/obj/item/clothing/under/dress/sailor = 1,
 				/obj/item/clothing/under/dress/redeveninggown = 1,
 				/obj/item/clothing/suit/apron/purple_bartender = 2,
+				/obj/item/clothing/under/costume/citizen_uniform = 4,
 			),
 		),
 

code/modules/vending/security.dm

@@ -33,6 +33,8 @@
 		/obj/item/grenade/stingbang = 1,
 		/obj/item/watertank/pepperspray = 2,
 		/obj/item/storage/belt/holster/energy = 4,
+		/obj/item/clothing/head/helmet/civilprotection_helmet = 1, //monkestation edit
+		/obj/item/clothing/suit/armor/civilprotection_vest = 1, //monkestation edit
 		/obj/item/clothing/head/guardmanhelmet = 1, //monkestation edit: Guardman
 		/obj/item/clothing/under/guardmanuniform = 1, //monkestation edit: Guardman
 		/obj/item/clothing/suit/armor/guardmanvest = 1, //monkestation edit: Guardman

code/modules/vending/wardrobes.dm

@@ -38,6 +38,9 @@
 		/obj/item/clothing/under/rank/security/brig_physician/skirt = 3, //Monkestation edit
 		/obj/item/clothing/suit/toggle/labcoat/brig_physician = 3, //Monkestation edit
 		/obj/item/clothing/shoes/sneakers/secred = 3, //Monkestation edit
+		/obj/item/clothing/under/civilprotection_uniform = 1, //monkestation edit
+		/obj/item/clothing/gloves/civilprotection_gloves = 1,
+		/obj/item/clothing/shoes/civilprotection_boots = 1, //monkestation edit
 	)
 	premium = list(
 		/obj/item/clothing/under/rank/security/officer/formal = 3,
@@ -50,7 +53,9 @@
 		/obj/item/clothing/suit/armor/secduster/cargo = 2,
 		/obj/item/clothing/head/helmet/hat/cowboy/cargo = 2,
 		/obj/item/clothing/suit/armor/secduster/science = 2,
-		/obj/item/clothing/head/helmet/hat/cowboy/science = 2
+		/obj/item/clothing/head/helmet/hat/cowboy/science = 2,
+		/obj/item/clothing/head/cop_mascot = 1, // MONKESTATION EDIT ADDITION
+		/obj/item/clothing/under/costume/cop_mascot = 1, // MONKESTATION EDIT ADDITION
 	)
 	refill_canister = /obj/item/vending_refill/wardrobe/sec_wardrobe
 	payment_department = ACCOUNT_SEC

monkestation/code/modules/clothing/glasses/glasses.dm

@@ -0,0 +1,6 @@
+/obj/item/clothing/glasses/crueltysquad_glasses
+	name = "CS inactive vision augmenter"
+	desc = "a pair of glasses usually designed to identify targets for execution, although this mechanic has been removed for civilian casual use."
+	icon = 'monkestation/icons/obj/clothing/glasses.dmi'
+	worn_icon = 'monkestation/icons/obj/clothing/eyes.dmi'
+	icon_state = "crueltysquad_glasses"

monkestation/code/modules/clothing/gloves/gloves.dm

@@ -8,3 +8,33 @@
 /obj/item/clothing/gloves/color/plasmaman
 	icon = 'monkestation/icons/obj/clothing/plasmaman_gloves.dmi'
 	worn_icon = 'monkestation/icons/mob/clothing/plasmaman_gloves.dmi'
+
+/obj/item/clothing/gloves/crueltysquad_gloves
+	name = "CSIJ level I gloves"
+	desc = "Armor used by assassins working for Cruelty Squad, stripped of all of its functions for kids to play with."
+	icon = 'monkestation/icons/obj/clothing/gloves.dmi'
+	worn_icon = 'monkestation/icons/mob/clothing/gloves.dmi'
+	icon_state = "crueltysquad_gloves"
+
+/obj/item/clothing/gloves/civilprotection_gloves
+	name = "civil protection gloves"
+	desc = "Armored gloves for beating anticitizens."
+	icon = 'monkestation/icons/obj/clothing/gloves.dmi'
+	worn_icon = 'monkestation/icons/mob/clothing/gloves.dmi'
+	icon_state = "civilprotection_gloves"
+
+/obj/item/clothing/gloves/infinity_gloves
+	name = "infinity wristbands"
+	desc = "The bands are oddly moist... let's hope it's not blood."
+	icon = 'monkestation/icons/obj/clothing/gloves.dmi'
+	worn_icon = 'monkestation/icons/mob/clothing/gloves.dmi'
+	icon_state = "infinity_wrist"
+
+/obj/item/clothing/gloves/infinity_gloves/equipped(mob/living/carbon/user, slot)
+	. = ..()
+	if(!ishuman(user))
+		return
+	if(slot == ITEM_SLOT_GLOVES)
+		var/obj/item/bodypart/user_active_arm = user.get_active_hand()
+		user_active_arm.unarmed_damage_low += 0.2
+		user_active_arm.unarmed_damage_high += 0.1

monkestation/code/modules/clothing/head/costume.dm

@@ -60,6 +60,49 @@
 	worn_icon = 'monkestation/icons/mob/clothing/head.dmi'
 	icon_state = "guardman_helmet"
 
+/obj/item/clothing/head/cop_mascot
+	name = "policeman mascot head"
+	desc = "A blue police mascot head. Formly designed to be a part of the BB Horror Film Franchise, it is now used for Police Theater."
+	icon = 'monkestation/icons/obj/clothing/hats.dmi'
+	worn_icon = 'monkestation/icons/mob/clothing/head.dmi'
+	icon_state = "cop_mascot"
+	worn_y_offset = 1
+	flags_inv = HIDEMASK|HIDEEARS|HIDEEYES|HIDEFACE|HIDEHAIR|HIDESNOUT
+
+/obj/item/clothing/head/helmet/civilprotection_helmet
+	name = "civil protection helmet"
+	desc = "I don't know about you, but I'm ready to join Civil Protection just to get a decent meal."
+	icon = 'monkestation/icons/obj/clothing/hats.dmi'
+	worn_icon = 'monkestation/icons/mob/clothing/head.dmi'
+	icon_state = "civilprotection_helmet"
+	custom_premium_price = PAYCHECK_COMMAND * 2
+	var/on = FALSE
+	actions_types = list(/datum/action/item_action/flip)
+
+/obj/item/clothing/head/helmet/civilprotection_helmet/attack_self(mob/user)
+	on = !on
+	if(on == TRUE)
+		icon_state = "civilprotection_helmet"
+	if(on == FALSE)
+		icon_state = "civilprotection_helmet_closed"
+	user.update_worn_head()
+
+/obj/item/clothing/head/thekiller_head
+	name = "the killer's head"
+	desc = "A red drinky bird mask. The mascot of violence."
+	icon = 'monkestation/icons/obj/clothing/hats.dmi'
+	worn_icon = 'monkestation/icons/mob/clothing/head.dmi'
+	icon_state = "thekiller_head"
+	worn_y_offset = 1
+	flags_inv = HIDEMASK|HIDEEARS|HIDEEYES|HIDEFACE|HIDEHAIR|HIDESNOUT
+
+/obj/item/clothing/head/bb_wig
+	name = "bb wig"
+	desc = "Well known movie mascot BB, this wig is either worn by a notorious killer or some sort of girl-mouse."
+	icon = 'monkestation/icons/obj/clothing/hats.dmi'
+	worn_icon = 'monkestation/icons/mob/clothing/head.dmi'
+	icon_state = "bb_wig"
+	flags_inv = HIDEHAIR
 /*
 BUNNY EARS
 */

monkestation/code/modules/clothing/shoes/shoe.dm

@@ -40,6 +40,33 @@
 	worn_icon = 'monkestation/icons/mob/clothing/feet.dmi'
 	icon_state = "cowboyboots_black"
 
+/obj/item/clothing/shoes/crueltysquad_shoes
+	name = "CSIJ level I combat boots"
+	desc = "Boots specifically designed to fit into the CSIJ level I body armor."
+	icon = 'monkestation/icons/obj/clothing/shoes.dmi'
+	worn_icon = 'monkestation/icons/mob/clothing/feet.dmi'
+	icon_state = "crueltysquad_shoes"
+
+/obj/item/clothing/shoes/costume_2021/infinity_shoes
+	name = "infinity sneakers"
+	desc = "Even for offbrand sneakers, these are outdated for the Kung Company."
+	icon = 'monkestation/icons/obj/clothing/shoes.dmi'
+	worn_icon = 'monkestation/icons/mob/clothing/feet.dmi'
+	icon_state = "infinity_shoes"
+
+/obj/item/clothing/shoes/bb_slippers
+	name = "bb slippers"
+	desc = "Despite looking like they'd fall off at any moment, they seem to stay on perfectly."
+	icon = 'monkestation/icons/obj/clothing/shoes.dmi'
+	worn_icon = 'monkestation/icons/mob/clothing/feet.dmi'
+	icon_state = "bb_slippers"
+
+/obj/item/clothing/shoes/civilprotection_boots
+	name = "civil protection boots"
+	desc = "for the officers chasing engineers."
+	icon = 'monkestation/icons/obj/clothing/shoes.dmi'
+	worn_icon = 'monkestation/icons/mob/clothing/feet.dmi'
+	icon_state = "civilprotection_boots"
 //START HEELS
 
 /obj/item/clothing/shoes/heels

monkestation/code/modules/clothing/suits/coats.dm

@@ -103,6 +103,12 @@
 	worn_icon = 'monkestation/icons/mob/clothing/suit.dmi'
 	icon_state = "guardman_vest"
 
+/obj/item/clothing/suit/armor/civilprotection_vest
+	name = "civil protection vest"
+	desc = "Used by rebels and cops alike."
+	icon = 'monkestation/icons/obj/clothing/suits.dmi'
+	worn_icon = 'monkestation/icons/mob/clothing/suit.dmi'
+	icon_state = "civilprotection_vest"
 
 //Only basic and scientist labcoats get to STAPH
 

monkestation/code/modules/clothing/suits/costume.dm

@@ -161,3 +161,18 @@
 /obj/item/clothing/head/hooded/ashsuit/Initialize(mapload)
 	. = ..()
 	AddComponent(/datum/component/armor_plate)
+
+/obj/item/clothing/suit/infinity_jacket
+	name = "infinity jersey"
+	desc = "A jersey labelled '88', somehow leaving a threatening aura around it."
+	icon = 'monkestation/icons/obj/clothing/suits.dmi'
+	worn_icon = 'monkestation/icons/mob/clothing/suit.dmi'
+	icon_state = "infinity_jersey"
+
+/obj/item/clothing/suit/thekiller_robe
+	name = "killer's robe"
+	desc = "As long as there has been man, there has been The Killer. They are surprisingly into the theater scene."
+	icon = 'monkestation/icons/obj/clothing/suits.dmi'
+	worn_icon = 'monkestation/icons/mob/clothing/suit.dmi'
+	icon_state = "thekiller_robe"
+	flags_inv = HIDEJUMPSUIT

monkestation/code/modules/clothing/under/costume.dm

@@ -89,6 +89,49 @@
 	body_parts_covered = CHEST|GROIN|ARMS|LEGS
 	can_adjust = FALSE
 
+/obj/item/clothing/under/costume/cop_mascot
+	name = "policeman mascot suit"
+	desc = "A blue police mascot suit. On the chest is a star badge with an eye in the middle. You feel like you should be chopping people apart with power tools while wearing this."
+	icon = 'monkestation/icons/obj/clothing/uniforms.dmi'
+	worn_icon = 'monkestation/icons/mob/clothing/uniform.dmi'
+	icon_state = "cop_mascot"
+	body_parts_covered = CHEST|GROIN|ARMS|LEGS|HANDS|FEET
+	alternate_worn_layer = GLOVES_LAYER
+	can_adjust = FALSE
+
+/obj/item/clothing/under/costume/crueltysquad_under
+	name = "CSIJ level I body armor"
+	desc = "Armor used by assassins working for Cruelty Squad, stripped of all of its functions for kids to play with."
+	icon = 'monkestation/icons/obj/clothing/uniforms.dmi'
+	worn_icon = 'monkestation/icons/mob/clothing/uniform.dmi'
+	icon_state = "crueltysquad_under"
+	can_adjust = FALSE
+
+/obj/item/clothing/under/costume/infinity_under
+	name = "infinity shorts"
+	desc = "Worn by those who want more matching team colors."
+	icon = 'monkestation/icons/obj/clothing/uniforms.dmi'
+	worn_icon = 'monkestation/icons/mob/clothing/uniform.dmi'
+	icon_state = "infinity_shorts"
+	body_parts_covered = CHEST|GROIN|LEGS
+	can_adjust = FALSE
+
+/obj/item/clothing/under/costume/bb_dress
+	name = "bb dress"
+	desc = "Howdy, it's me BB. Zines, zines, zines."
+	icon = 'monkestation/icons/obj/clothing/uniforms.dmi'
+	worn_icon = 'monkestation/icons/mob/clothing/uniform.dmi'
+	icon_state = "bb_dress"
+	body_parts_covered = CHEST|GROIN|ARMS
+	can_adjust = FALSE
+
+/obj/item/clothing/under/costume/citizen_uniform
+	name = "citizen uniform"
+	desc = "A blue matching uniform. It makes you feel like you're in a labor camp."
+	icon = 'monkestation/icons/obj/clothing/uniforms.dmi'
+	worn_icon = 'monkestation/icons/mob/clothing/uniform.dmi'
+	icon_state = "citizen_uniform"
+	can_adjust = FALSE
 /*
 *	LUNAR AND JAPANESE CLOTHES
 */

monkestation/code/modules/clothing/under/undersuit.dm

@@ -79,6 +79,14 @@
 	worn_icon = 'monkestation/icons/mob/clothing/uniform.dmi'
 	can_adjust = FALSE
 
+/obj/item/clothing/under/civilprotection_uniform
+	name = "civil protection's uniform"
+	desc = "Suspect, prepare to receive civil judgement!"
+	icon = 'monkestation/icons/obj/clothing/uniforms.dmi'
+	worn_icon = 'monkestation/icons/mob/clothing/uniform.dmi'
+	icon_state = "civilprotection_uniform"
+	can_adjust = FALSE
+
 /obj/item/clothing/under/artisan
 	name = "culinary artisan's uniform"
 	desc = "For the chef who knows what their doing and cooks with ethically sourced monkey meat"

tgstation.dme

@@ -6694,6 +6694,7 @@
 #include "monkestation\code\modules\clothing\accessories\accessories.dm"
 #include "monkestation\code\modules\clothing\costumes\gnome.dm"
 #include "monkestation\code\modules\clothing\costumes\henchmen.dm"
+#include "monkestation\code\modules\clothing\glasses\glasses.dm"
 #include "monkestation\code\modules\clothing\gloves\gloves.dm"
 #include "monkestation\code\modules\clothing\head\costume.dm"
 #include "monkestation\code\modules\clothing\head\hat.dm"