you would not believe how fucking much work this was to do.

code/__DEFINES/conflict.dm

@@ -112,6 +112,7 @@
 #define SLOWDOWN_ARMOR_SUPER_LIGHT 0.10
 #define SLOWDOWN_ARMOR_VERY_LIGHT 0.20
 #define SLOWDOWN_ARMOR_LIGHT 0.35
+#define SLOWDOWN_ARMOR_LOW_MEDIUM 0.40
 #define SLOWDOWN_ARMOR_MEDIUM 0.55
 #define SLOWDOWN_ARMOR_LOWHEAVY 0.75
 #define SLOWDOWN_ARMOR_HEAVY 1

code/datums/ammo/bullet/revolver.dm

@@ -136,7 +136,7 @@
 	name = "small revolver bullet"
 	headshot_state = HEADSHOT_OVERLAY_LIGHT
 
-	damage = 30
+	damage = 25
 
 	penetration = 0
 

code/datums/ammo/bullet/rifle.dm

@@ -113,6 +113,20 @@
 	stamina_damage = 15
 	shrapnel_chance = 0
 
+/datum/ammo/bullet/rifle/mook
+	name = "rifle bullet"
+	headshot_state = HEADSHOT_OVERLAY_MEDIUM
+
+	damage = 25
+	penetration = 0
+	accurate_range = 3
+	accuracy = HIT_ACCURACY_TIER_4
+	scatter = SCATTER_AMOUNT_TIER_10
+	shell_speed = AMMO_SPEED_TIER_6
+	effective_range_max = 6
+	damage_falloff = DAMAGE_FALLOFF_TIER_9
+	max_range = 24 //So S8 users don't have their bullets magically disappaer at 22 tiles (S8 can see 24 tiles)
+
 /datum/ammo/bullet/rifle/incendiary
 	name = "incendiary rifle bullet"
 	damage_type = BURN

code/modules/clothing/suits/armor.dm

@@ -54,7 +54,22 @@
 		/obj/item/storage/belt/gun/m44,
 	)
 
-
+/obj/item/clothing/suit/armor/vest/mook
+	name = "damaged venlar vest"
+	desc = "A scavenged venlar bulletproof vest, complete with a few holes in the outer carrier and up until recently, divots in the back of the front panel."
+	icon_state = "armor"
+	item_state = "armor"
+	blood_overlay_type = "armor"
+	flags_armor_protection = BODY_FLAG_CHEST
+	armor_melee = CLOTHING_ARMOR_NONE
+	armor_bullet = CLOTHING_ARMOR_LOW
+	armor_laser = CLOTHING_ARMOR_LOW
+	armor_energy = CLOTHING_ARMOR_LOW
+	armor_bomb = CLOTHING_ARMOR_NONE
+	armor_bio = CLOTHING_ARMOR_MEDIUM
+	armor_rad = CLOTHING_ARMOR_NONE
+	armor_internaldamage = CLOTHING_ARMOR_NONE
+	slowdown = SLOWDOWN_ARMOR_LOW_MEDIUM
 
 /obj/item/clothing/suit/armor/vest/pilot
 	name = "\improper M70 flak jacket"
@@ -176,6 +191,29 @@
 	icon_state = "bulletproofbadge"
 	valid_accessory_slots = list(ACCESSORY_SLOT_ARMOR_A, ACCESSORY_SLOT_ARMOR_L, ACCESSORY_SLOT_ARMOR_S, ACCESSORY_SLOT_ARMOR_M)
 
+/obj/item/clothing/suit/armor/bulletproof/mook
+	name = "old bulletproof vest"
+	desc = "Used to belong to a CMB officer. The bullet hole they died with sits right where the badge was, supposedly."
+	icon_state = "bulletproof"
+	item_state = "armor"
+	blood_overlay_type = "armor"
+	flags_armor_protection = BODY_FLAG_CHEST
+	armor_melee = CLOTHING_ARMOR_NONE
+	armor_bullet = CLOTHING_ARMOR_LOW
+	armor_laser = CLOTHING_ARMOR_LOW
+	armor_energy = CLOTHING_ARMOR_LOW
+	armor_bomb = CLOTHING_ARMOR_NONE
+	armor_bio = CLOTHING_ARMOR_MEDIUM
+	armor_rad = CLOTHING_ARMOR_NONE
+	armor_internaldamage = CLOTHING_ARMOR_NONE
+	slowdown = SLOWDOWN_ARMOR_LOW_MEDIUM
+
+/obj/item/clothing/suit/armor/bulletproof/mook/bandolier
+	name = "cheap armor vest"
+	desc = "Bought from a surplus store. Even came with a bandolier for all your supplies! The clerk said it wasn't too damaged..."
+	icon_state = "bulletproofammo"
+	item_state = "bulletproofammo"
+
 /obj/item/clothing/suit/armor/riot
 	name = "riot suit"
 	desc = "A suit of armor with heavy padding to protect against melee attacks. Looks like it might impair movement."
@@ -196,6 +234,26 @@
 	time_to_unequip = 20
 	time_to_equip = 20
 
+/obj/item/clothing/suit/armor/riot/mook
+	name = "salvaged riot armor"
+	desc = "A set of police riot armor salvaged and crudely uparmored, then repaired time and time again."
+	icon_state = "riot"
+	item_state = "swat_suit"
+	flags_armor_protection = BODY_FLAG_CHEST|BODY_FLAG_GROIN|BODY_FLAG_LEGS|BODY_FLAG_ARMS
+	slowdown = SLOWDOWN_ARMOR_VERY_HEAVY
+	armor_melee = CLOTHING_ARMOR_ULTRAHIGH
+	armor_bullet = CLOTHING_ARMOR_MEDIUM
+	armor_laser = CLOTHING_ARMOR_LOW
+	armor_energy = CLOTHING_ARMOR_LOW
+	armor_bomb = CLOTHING_ARMOR_LOW
+	armor_bio = CLOTHING_ARMOR_NONE
+	armor_rad = CLOTHING_ARMOR_NONE
+	armor_internaldamage = CLOTHING_ARMOR_MEDIUM
+	flags_inventory = BLOCKSHARPOBJ
+	siemens_coefficient = 0.5
+	time_to_unequip = 20
+	time_to_equip = 20
+
 /obj/item/clothing/suit/armor/gladiator
 	name = "gladiator armor"
 	desc = "Are you not entertained? Is that not why you are here?"

code/modules/clothing/suits/marine_armor.dm

@@ -1468,16 +1468,16 @@
 	)
 	sprite_sheets = list(SPECIES_MONKEY = 'icons/mob/humans/species/monkeys/onmob/suit_monkey_1.dmi')
 	slowdown = SLOWDOWN_ARMOR_VERY_LIGHT
-	flags_armor_protection = BODY_FLAG_CHEST
+	flags_armor_protection = BODY_FLAG_CHEST|BODY_FLAG_ARMS
 	movement_compensation = SLOWDOWN_ARMOR_MEDIUM
-	armor_melee = CLOTHING_ARMOR_VERYLOW
+	armor_melee = CLOTHING_ARMOR_NONE
 	armor_bullet = CLOTHING_ARMOR_LOW
 	armor_laser = CLOTHING_ARMOR_MEDIUMLOW
 	armor_energy = CLOTHING_ARMOR_MEDIUMLOW
-	armor_bomb = 0
+	armor_bomb = CLOTHING_ARMOR_NONE
 	armor_bio = CLOTHING_ARMOR_MEDIUMLOW
 	armor_rad = CLOTHING_ARMOR_MEDIUM
-	armor_internaldamage = 0
+	armor_internaldamage = CLOTHING_ARMOR_NONE
 	storage_slots = 2
 	uniform_restricted = list(/obj/item/clothing/under/colonist)
 	allowed = list(
@@ -1510,11 +1510,11 @@
 	pockets.max_storage_space = 8
 
 /obj/item/clothing/suit/storage/militia/vest
-	name = "makeshift body armor"
-	desc = "The hauberk of a colonist militia member, created from boiled leather and some modern armored plates. While not the most powerful form of armor, and primitive compared to most modern suits of armor, it gives the wearer almost perfect mobility, which suits the needs of the local colonists. It is also quick to don, easy to hide, and cheap to produce in large workshops. This extremely light variant protects only the chest and abdomen."
+	name = "homemade body armor"
+	desc = "Bulletproof vest composed of hardened steel plates and some straps, rivets."
 	icon_state = "clf_2"
-	flags_armor_protection = BODY_FLAG_CHEST|BODY_FLAG_GROIN
-	flags_cold_protection = BODY_FLAG_CHEST|BODY_FLAG_GROIN
+	flags_armor_protection = BODY_FLAG_CHEST
+	flags_cold_protection = BODY_FLAG_CHEST
 	slowdown = 0.2
 	movement_compensation = SLOWDOWN_ARMOR_MEDIUM
 
@@ -1528,11 +1528,11 @@
 	movement_compensation = SLOWDOWN_ARMOR_MEDIUM
 
 /obj/item/clothing/suit/storage/militia/partial
-	name = "colonial militia partial hauberk"
-	desc = "The hauberk of a colonist militia member, created from boiled leather and some modern armored plates. While not the most powerful form of armor, and primitive compared to most modern suits of armor, it gives the wearer almost perfect mobility, which suits the needs of the local colonists. It is also quick to don, easy to hide, and cheap to produce in large workshops. This even lighter variant has some of the arm pieces removed."
+	name = "improvised body armor"
+	desc = "Provides a marginal class of protection to the wearer through a wide variety of materials. May defeat low caliber rounds."
 	icon_state = "clf_4"
-	flags_armor_protection = BODY_FLAG_CHEST|BODY_FLAG_GROIN|BODY_FLAG_LEGS
-	flags_cold_protection = BODY_FLAG_CHEST|BODY_FLAG_GROIN|BODY_FLAG_ARMS|BODY_FLAG_LEGS
+	flags_armor_protection = BODY_FLAG_CHEST|BODY_FLAG_ARM_RIGHT
+	flags_cold_protection = BODY_FLAG_CHEST
 	slowdown = 0.2
 
 /obj/item/clothing/suit/storage/CMB

code/modules/clothing/suits/miscellaneous.dm

@@ -517,6 +517,20 @@
 	valid_accessory_slots = list(ACCESSORY_SLOT_ARMBAND, ACCESSORY_SLOT_DECOR, ACCESSORY_SLOT_MEDAL)
 	restricted_accessory_slots = list(ACCESSORY_SLOT_ARMBAND)
 
+/obj/item/clothing/suit/storage/manager/mook
+	name = "suit jacket"
+	desc = "A suit jacket that looks fairly spiffy. Has some pockets to hold miscellaneous items."
+	storage_slots = 2
+
+	armor_melee = CLOTHING_ARMOR_NONE
+	armor_bullet = CLOTHING_ARMOR_VERYLOW //omg payday 2 reference
+	armor_laser = CLOTHING_ARMOR_NONE
+	armor_energy = CLOTHING_ARMOR_NONE
+	armor_bomb = CLOTHING_ARMOR_NONE
+	armor_bio = CLOTHING_ARMOR_NONE
+	armor_rad = CLOTHING_ARMOR_NONE
+	armor_internaldamage = CLOTHING_ARMOR_NONE
+
 /obj/item/clothing/suit/storage/director
 	name = "director's jacket"
 	desc = "A jacket that belongs to someone very important. It is made of insulating material and offers minor protection from all forms of damage."

code/modules/clothing/under/marine_uniform.dm

@@ -738,13 +738,6 @@
 	worn_state = "workwear_green"
 	flags_jumpsuit = UNIFORM_SLEEVE_ROLLABLE|UNIFORM_JACKET_REMOVABLE
 
-/obj/item/clothing/under/colonist/clf
-	name = "\improper Colonial Liberation Front uniform"
-	desc = "A stylish grey-green jumpsuit - standard issue for colonists. This version appears to have the symbol of the Colonial Liberation Front emblazoned in select areas."
-	icon_state = "clf_uniform"
-	worn_state = "clf_uniform"
-	sensor_faction = FACTION_CLF
-
 /obj/item/clothing/under/colonist/prison_boiler
 	name = "\improper prisoner boiler uniform"
 	desc = "A standardised prisoner-wear boiler uniform."
@@ -785,6 +778,95 @@
 	has_sensor = UNIFORM_HAS_SENSORS
 	sensor_faction = FACTION_MARINE
 
+//==============================//MOOK\\=================================//
+//=======================================================================//
+
+/obj/item/clothing/under/colonist/mook
+	name = "colonist uniform"
+	desc = "A stylish gray-green jumpsuit - standard issue for colonists."
+	icon_state = "colonist"
+	worn_state = "colonist"
+	armor_melee = CLOTHING_ARMOR_NONE
+	armor_bullet = CLOTHING_ARMOR_NONE
+	armor_laser = CLOTHING_ARMOR_NONE
+	armor_energy = CLOTHING_ARMOR_NONE
+	armor_bomb = CLOTHING_ARMOR_NONE
+	armor_bio = CLOTHING_ARMOR_NONE
+	armor_rad = CLOTHING_ARMOR_NONE
+	armor_internaldamage = CLOTHING_ARMOR_NONE
+	has_sensor = UNIFORM_HAS_SENSORS
+	sensor_faction = FACTION_CLF
+
+/obj/item/clothing/under/colonist/workwear
+	name = "grey workwear"
+	desc = "A pair of black slacks and a short-sleeve grey workshirt. Standard uniform for Weyland Yutani employees working in colony operations and administration."
+	icon_state = "workwear_grey"
+	worn_state = "workwear_grey"
+
+/obj/item/clothing/under/colonist/mook/workwear/khaki
+	name = "khaki workwear"
+	desc = "A pair of jeans paired with a khaki workshirt. A common pairing among blue-collar workers due to its drab look."
+	icon_state = "workwear_khaki"
+	worn_state = "workwear_khaki"
+	flags_jumpsuit = UNIFORM_SLEEVE_ROLLABLE|UNIFORM_JACKET_REMOVABLE
+
+/obj/item/clothing/under/colonist/mook/workwear/pink
+	name = "pink workwear"
+	desc = "A pair of jeans paired with a pink workshirt. Pink? Your wife might not think so, but such outlandish attire deserves questioning by corporate security. What are you, some kind of free-thinking anarchist?"
+	icon_state = "workwear_pink"
+	worn_state = "workwear_pink"
+	flags_jumpsuit = UNIFORM_SLEEVE_ROLLABLE|UNIFORM_JACKET_REMOVABLE
+
+/obj/item/clothing/under/colonist/mook/workwear/blue
+	name = "blue workwear"
+	desc = "A pair of brown canvas workpants paired with a dark blue workshirt. A common pairing among blue-collar workers."
+	icon_state = "workwear_blue"
+	worn_state = "workwear_blue"
+	flags_jumpsuit = UNIFORM_SLEEVE_ROLLABLE|UNIFORM_JACKET_REMOVABLE
+
+/obj/item/clothing/under/colonist/mook/workwear/green
+	name = "green workwear"
+	desc = "A pair of brown canvas workpants paired with a green workshirt. An common pairing among blue-collar workers."
+	icon_state = "workwear_green"
+	worn_state = "workwear_green"
+	flags_jumpsuit = UNIFORM_SLEEVE_ROLLABLE|UNIFORM_JACKET_REMOVABLE
+
+/obj/item/clothing/under/colonist/mook/prison_boiler
+	name = "\improper prisoner boiler uniform"
+	desc = "A standardised prisoner-wear boiler uniform."
+	icon_state = "prison_boiler"
+	worn_state = "prison_boiler"
+	flags_jumpsuit = UNIFORM_SLEEVE_ROLLABLE|UNIFORM_JACKET_REMOVABLE
+
+/obj/item/clothing/under/colonist/mook/ua_boiler
+	name = "\improper blue operations uniform"
+	desc = "A stylish blue jumpsuit - standard issue for UA civilian support personnel."
+	icon_state = "ua_boiler"
+	worn_state = "ua_boiler"
+	flags_jumpsuit = UNIFORM_SLEEVE_ROLLABLE|UNIFORM_JACKET_REMOVABLE
+	has_sensor = UNIFORM_HAS_SENSORS
+
+/obj/item/clothing/under/colonist/mook/ua_civvies
+	name = "\improper UA gray utility uniform"
+	desc = "A stylish gray jumpsuit - standard issue for UA civilian support personnel."
+	icon_state = "ua_civvies"
+	worn_state = "ua_civvies"
+	has_sensor = UNIFORM_HAS_SENSORS
+
+/obj/item/clothing/under/colonist/mook/wy_davisone
+	name = "\improper UA brown utility uniform"
+	desc = "A stylish brown jumpsuit - standard issue for UA civilian support personnel."
+	icon_state = "wy_davisone"
+	worn_state = "wy_davisone"
+	has_sensor = UNIFORM_HAS_SENSORS
+
+/obj/item/clothing/under/colonist/mook/wy_joliet_shopsteward
+	name = "steward utilities"
+	desc = "A stylish brown vest and shorts - uniforms like this are often worn by clerks and shop stewards."
+	icon_state = "wy_joliet_shopsteward"
+	worn_state = "wy_joliet_shopsteward"
+	has_sensor = UNIFORM_HAS_SENSORS
+
 /obj/item/clothing/under/tshirt
 	name = "T-shirt parent object"
 	has_sensor = UNIFORM_NO_SENSORS

code/modules/gear_presets/_select_equipment.dm

@@ -390,7 +390,12 @@ GLOBAL_LIST_EMPTY(personal_closets)
 /datum/equipment_preset/proc/spawn_rebel_uniform(mob/living/carbon/human/new_human)
 	if(!istype(new_human)) return
 	var/uniformpath = pick(
-		/obj/item/clothing/under/colonist/clf,
+		/obj/item/clothing/under/colonist/mook,
+		/obj/item/clothing/under/colonist/mook/workwear,
+		/obj/item/clothing/under/colonist/mook/workwear/khaki,
+		/obj/item/clothing/under/colonist/mook/workwear/pink,
+		/obj/item/clothing/under/colonist/mook/workwear/blue,
+		/obj/item/clothing/under/colonist/mook/workwear/green,
 		)
 	new_human.equip_to_slot_or_del(new uniformpath, WEAR_BODY)
 
@@ -400,10 +405,13 @@ GLOBAL_LIST_EMPTY(personal_closets)
 	var/suitpath = pick(
 		/obj/item/clothing/suit/storage/militia,
 		/obj/item/clothing/suit/storage/militia/vest,
-		/obj/item/clothing/suit/storage/militia/brace,
 		/obj/item/clothing/suit/storage/militia/partial,
-		/obj/item/clothing/suit/armor/bulletproof,
-		/obj/item/clothing/suit/armor/vest,
+		/obj/item/clothing/suit/armor/bulletproof/mook,
+		/obj/item/clothing/suit/armor/vest/mook,
+		/obj/item/clothing/suit/armor/riot/mook,
+		/obj/item/clothing/suit/storage/webbing
+		/obj/item/clothing/suit/storage/utility_vest
+		/obj/item/clothing/suit/storage/manager/mook
 		)
 	new_human.equip_to_slot_or_del(new suitpath, WEAR_JACKET)
 
@@ -433,7 +441,7 @@ GLOBAL_LIST_EMPTY(personal_closets)
 		/obj/item/clothing/shoes/brown,
 		/obj/item/clothing/shoes/laceup,
 		/obj/item/clothing/shoes/leather,
-		/obj/item/clothing/shoes/marines/surplus,
+		/obj/item/clothing/shoes/marine/surplus,
 		)
 	new_human.equip_to_slot_or_del(new shoespath, WEAR_FEET)
 
@@ -466,10 +474,10 @@ GLOBAL_LIST_EMPTY(personal_closets)
 	if(!M) return
 
 	var/list/rebel_firearms = list(
-		/obj/item/weapon/gun/shotgun/double = /obj/item/ammo_magazine/handful/shotgun/buckshot,
-		/obj/item/weapon/gun/shotgun/double/with_stock = /obj/item/ammo_magazine/handful/shotgun/flechette,
-		/obj/item/weapon/gun/shotgun/pump/dual_tube/cmb = /obj/item/ammo_magazine/handful/shotgun/incendiary,
-		/obj/item/weapon/gun/shotgun/pump/dual_tube/cmb = /obj/item/ammo_magazine/handful/shotgun/incendiary,
+		/obj/item/weapon/gun/shotgun/double = /obj/item/ammo_magazine/handful/shotgun/buckshot/mook,
+		/obj/item/weapon/gun/shotgun/double/with_stock = /obj/item/ammo_magazine/handful/shotgun/flechette/mook,
+		/obj/item/weapon/gun/shotgun/pump/dual_tube/cmb = /obj/item/ammo_magazine/handful/shotgun/buckshot/mook,
+		/obj/item/weapon/gun/shotgun/pump/dual_tube/cmb = /obj/item/ammo_magazine/handful/shotgun/incendiary/mook,
 		/obj/item/weapon/gun/shotgun/double/sawn = /obj/item/ammo_magazine/handful/shotgun/incendiary,
 		/obj/item/weapon/gun/shotgun/double/sawn = /obj/item/ammo_magazine/handful/shotgun/buckshot,
 		/obj/item/weapon/gun/rifle/mar40 = /obj/item/ammo_magazine/rifle/mar40,
@@ -478,7 +486,7 @@ GLOBAL_LIST_EMPTY(personal_closets)
 		/obj/item/weapon/gun/rifle/mar40/carbine = /obj/item/ammo_magazine/rifle/mar40,
 		/obj/item/weapon/gun/rifle/mar40/lmg = /obj/item/ammo_magazine/rifle/mar40/lmg,
 		/obj/item/weapon/gun/rifle/mar40/lmg = /obj/item/ammo_magazine/rifle/mar40/lmg,
-		/obj/item/weapon/gun/rifle/m16 = /obj/item/ammo_magazine/rifle/m16,
+		/obj/item/weapon/gun/rifle/m16 = /obj/item/ammo_magazine/rifle/m16/mook,
 		/obj/item/weapon/gun/rifle/ar10 = /obj/item/ammo_magazine/rifle/ar10,
 		/obj/item/weapon/gun/rifle/l42a/abr40 = /obj/item/ammo_magazine/rifle/l42a/abr40,
 		/obj/item/weapon/gun/rifle/l42a/abr40 = /obj/item/ammo_magazine/rifle/l42a/abr40,