Project 38: Mook Enemies

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

@@ -132,6 +132,14 @@
 	penetration = 0
 	damage_falloff = DAMAGE_FALLOFF_TIER_6
 
+/datum/ammo/bullet/revolver/small/mook
+	name = "small revolver bullet"
+	headshot_state = HEADSHOT_OVERLAY_LIGHT
+
+	damage = 25
+
+	penetration = 0
+
 /datum/ammo/bullet/revolver/mateba
 	name = ".454 heavy revolver bullet"
 

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/datums/ammo/bullet/shotgun.dm

@@ -199,6 +199,49 @@
 	damage = 90
 	firing_freq_offset = SOUND_FREQ_LOW
 
+/datum/ammo/bullet/shotgun/buckshot/mook
+	name = "buckshot shell"
+	desc = "Handloaded 00 B/S. Disperses a large amount of high impact projectiles."
+	bonus_projectiles_type = /datum/ammo/bullet/shotgun/mook/spread
+
+	accuracy_var_low = PROJECTILE_VARIANCE_TIER_4
+	accuracy_var_high = PROJECTILE_VARIANCE_TIER_6
+	accurate_range = 3
+	scatter = SCATTER_AMOUNT_TIER_3
+	max_range = 10
+	damage = 40
+	damage_var_low = PROJECTILE_VARIANCE_TIER_10
+	damage_var_high = PROJECTILE_VARIANCE_TIER_10
+	penetration = 0
+	bonus_projectiles_amount = EXTRA_PROJECTILES_TIER_6
+	shell_speed = AMMO_SPEED_TIER_2
+	shrapnel_chance = 0
+
+/datum/ammo/bullet/shotgun/mook/on_hit_mob(mob/M,obj/projectile/P)
+	knockback(M, P, 3)
+
+/datum/ammo/bullet/shotgun/mook/knockback_effects(mob/living/living_mob, obj/projectile/fired_projectile)
+	to_chat(target, SPAN_HIGHDANGER("The bukcshot takes you off your feet!"))
+	target.KnockDown(0.5)
+	target.apply_effect(1, SUPERSLOW)
+	target.apply_effect(3, SLOW)
+
+/datum/ammo/bullet/shotgun/buckshot/mook/spread
+	name = "additional buckshot"
+	icon_state = "buckshot"
+
+	accuracy_var_low = PROJECTILE_VARIANCE_TIER_6
+	accuracy_var_high = PROJECTILE_VARIANCE_TIER_6
+	accurate_range = 4
+	max_range = 4
+	damage = 38
+	damage_var_low = PROJECTILE_VARIANCE_TIER_8
+	damage_var_high = PROJECTILE_VARIANCE_TIER_8
+	penetration = 0
+	shell_speed = AMMO_SPEED_TIER_2
+	damage_armor_punch = 0
+	pen_armor_punch = 0
+
 /*
 					8 GAUGE SHOTGUN AMMO
 */

code/datums/ammo/bullet/special_ammo.dm

@@ -166,9 +166,21 @@
 	accuracy_var_high = PROJECTILE_VARIANCE_TIER_6
 	accurate_range = 12
 	damage = 45 //7.62x51 is scary
-	penetration= ARMOR_PENETRATION_TIER_6
+	penetration = ARMOR_PENETRATION_TIER_6
 	shrapnel_chance = SHRAPNEL_CHANCE_TIER_2
 
+/datum/ammo/bullet/m60/mook
+	name = "Mk70 bullet"
+	headshot_state = HEADSHOT_OVERLAY_MEDIUM
+
+	accuracy = HIT_ACCURACY_TIER_1
+	accuracy_var_low = PROJECTILE_VARIANCE_TIER_8
+	accuracy_var_high = PROJECTILE_VARIANCE_TIER_6
+	accurate_range = 12
+	damage = 30
+	penetration = ARMOR_PENETRATION_TIER_1
+	shrapnel_chance = 0
+
 /datum/ammo/bullet/pkp
 	name = "machinegun bullet"
 	headshot_state = HEADSHOT_OVERLAY_MEDIUM

code/datums/pain/pain_mook.dm

@@ -0,0 +1,11 @@
+/datum/pain/mook
+	max_pain = 100
+
+	threshold_mild = 10
+	threshold_discomforting = 15
+	threshold_moderate = 20
+	threshold_distressing = 30
+	threshold_severe = 35
+	threshold_horrible = 40
+
+	feels_pain = TRUE

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

@@ -1776,27 +1776,25 @@
 	new /obj/item/ammo_magazine/smartgun/dirty(src)
 
 /obj/item/storage/belt/gun/smartgunner/clf
-	name = "\improper M802 pattern 'Freedom' smartgunner sidearm rig"
-	desc = "A modification of the standard M802 load-bearing equipment, designed to carry smartgun ammunition and a Mateba revolver. This one has the CLF logo carved over the manufacturing stamp."
+	name = "\improper improvised MG ammo storage rig"
+	desc = "A pair of pouches and a holster for a sidearm. Shoddily made, but it'll do for now."
 	can_hold = list(
 		/obj/item/device/flashlight/flare,
 		/obj/item/weapon/gun/flare,
 		/obj/item/weapon/gun/pistol,
-		/obj/item/weapon/gun/revolver/m44,
-		/obj/item/weapon/gun/revolver/mateba,
+		/obj/item/weapon/gun/revolver,
 		/obj/item/ammo_magazine/revolver,
-		/obj/item/ammo_magazine/revolver/mateba,
 		/obj/item/ammo_magazine/pistol,
-		/obj/item/ammo_magazine/smartgun,
+		/obj/item/ammo_magazine/m60/mook,
 	)
 	has_gamemode_skin = TRUE
 
 /obj/item/storage/belt/gun/smartgunner/clf/full/fill_preset_inventory()
-	handle_item_insertion(new /obj/item/weapon/gun/revolver/mateba())
-	new /obj/item/ammo_magazine/revolver/mateba/highimpact(src)
-	new /obj/item/ammo_magazine/smartgun(src)
-	new /obj/item/ammo_magazine/smartgun(src)
-	new /obj/item/ammo_magazine/smartgun(src)
+	handle_item_insertion(new /obj/item/weapon/gun/revolver/cmb/mook())
+	new /obj/item/ammo_magazine/internal/revolver/cmb/mook(src)
+	new /obj/item/ammo_magazine/m60/mook(src)
+	new /obj/item/ammo_magazine/m60/mook(src)
+	new /obj/item/ammo_magazine/m60/mook(src)
 
 /obj/item/storage/belt/gun/smartgunner/upp
 	name = "\improper Type 92 pattern machinegunner sidearm rig"

code/modules/clothing/head/head.dm

@@ -633,6 +633,26 @@
 	flags_inventory = BLOCKSHARPOBJ
 	flags_inv_hide = NO_FLAGS
 
+/obj/item/clothing/head/CMB/mook
+	name = "battered CMB cap"
+	desc = "Secondhand, taken from looted armories or from a surplus store."
+	icon = 'icons/obj/items/clothing/cm_hats.dmi'
+	item_icons = list(
+		WEAR_HEAD = 'icons/mob/humans/onmob/head_1.dmi'
+	)
+	icon_state = "cmbcap"
+	flags_armor_protection = BODY_FLAG_HEAD
+	armor_melee = CLOTHING_ARMOR_VERYLOW
+	armor_bullet = CLOTHING_ARMOR_NONE
+	armor_energy = CLOTHING_ARMOR_NONE
+	armor_bomb = CLOTHING_ARMOR_NONE
+	armor_bio = CLOTHING_ARMOR_NONE
+	armor_internaldamage = CLOTHING_ARMOR_NONE
+	flags_cold_protection = BODY_FLAG_HEAD
+	min_cold_protection_temperature = ICE_PLANET_MIN_COLD_PROT
+	flags_inventory = BLOCKSHARPOBJ
+	flags_inv_hide = HIDETOPHAIR
+
 /obj/item/clothing/head/freelancer
 	name = "\improper armored Freelancer cap"
 	desc = "A sturdy freelancer's cap. More protective than it seems."

code/modules/clothing/head/helmet.dm

@@ -62,6 +62,19 @@
 	desc = "A scarred riot helmet covered in cobwebs. It still protects your ears."
 	icon_state = "old_riot"
 
+/obj/item/clothing/head/helmet/riot/mook
+	name = "riot helmet"
+	desc = "Scavenged riot helmet. It's been heavily battered, but it should still provide some class of protection."
+	icon_state = "old_riot"
+	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
+
 /obj/item/clothing/head/helmet/augment
 	name = "augment array"
 	desc = "A helmet with optical and cranial augments coupled to it."
@@ -1467,3 +1480,20 @@ GLOBAL_LIST_INIT(allowed_helmet_items, list(
 	armor_internaldamage = CLOTHING_ARMOR_LOW
 
 #undef HELMET_GARB_RELAY_ICON_STATE
+
+//=============================//MOOKS\\=================================\\
+//=======================================================================\\
+
+/obj/item/clothing/head/helmet/mook
+	name = "dented helmet"
+	desc = "On the other side, there's a divot into the armored fabric that looks to have been fixed by a hammer."
+	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
+	flags_inv_hide = HIDEEARS|HIDEEYES|HIDETOPHAIR
+

code/modules/clothing/shoes/marine_shoes.dm

@@ -52,6 +52,18 @@
 /obj/item/clothing/shoes/marine/brown/knife
 	knife_type = /obj/item/attachable/bayonet
 
+/obj/item/clothing/shoes/marine/surplus
+	name = "surplus combat boots"
+	desc = "Old combat boots bought or found from... somewhere."
+	armor_melee = CLOTHING_ARMOR_VERYLOW
+	armor_bullet = 0
+	armor_laser = 0
+	armor_energy = 0
+	armor_bomb = 0
+	armor_bio = 0
+	armor_rad = 0
+	armor_internaldamage = 0
+
 /obj/item/clothing/shoes/marine/monkey
 	name = "monkey combat boots"
 	desc = "A sturdy pair of combat boots, the reflection of the polished leather reflects your true self."

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?"