TGS Test Merge (#6104)

code/datums/armor/clothing/armor.dm

@@ -71,3 +71,10 @@
 	laser = 0.6
 	energy = 0.3
 	bomb = 0.2
+
+/datum/armor/general/baroque_military
+	melee = 0.4
+	bullet = 0.3
+	laser = 0.4
+	energy = 0.3
+	bomb = 0.2

code/modules/clothing/gloves/miscellaneous.dm

@@ -204,6 +204,14 @@
 	desc = "These gloves were originally integrated into the bounty hunter skinsuit. Later iterations were made removable for practicality."
 	icon_state = "bountyskin"
 
+//More Warhammer Fun
+/obj/item/clothing/gloves/baroque
+	name = "baroque military gauntlets"
+	desc = "The silver banding around the wrists of these gloves is inscribed with the names of countless martyrs."
+	icon = 'icons/clothing/suit/armor/baroque.dmi'
+	icon_state = "sistergloves"
+	worn_render_flags = WORN_RENDER_SLOT_ONE_FOR_ALL
+
 /* Full port pending. Some of these are nuts.
 
 /obj/item/clothing/gloves/fingerless/pugilist

code/modules/clothing/head/helmet.dm

@@ -408,6 +408,14 @@
 	armor_type = /datum/armor/general/utilitarian_military
 	worn_render_flags = WORN_RENDER_SLOT_ONE_FOR_ALL
 
+/obj/item/clothing/head/helmet/baroque
+	name = "baroque military helmet"
+	desc = "This sturdy helmet's ornate design belies its technological sophistication."
+	icon = 'icons/clothing/suit/armor/baroque.dmi'
+	icon_state = "sisterhelm"
+	armor_type = /datum/armor/general/baroque_military
+	worn_render_flags = WORN_RENDER_SLOT_ONE_FOR_ALL
+
 /obj/item/clothing/head/helmet/duraskull
 	name = "durasteel skull mask"
 	desc = "The process of working durasteel into such a shape is no small feat. Whoever commissioned this wanted to send a serious message."

code/modules/clothing/shoes/boots.dm

@@ -244,6 +244,16 @@
 	pickup_sound = 'sound/items/pickup/boots.ogg'
 	worn_render_flags = WORN_RENDER_SLOT_ONE_FOR_ALL
 
+/obj/item/clothing/shoes/boots/baroque
+	name = "baroque military boots"
+	desc = "Small icons of religious significance have been carved into the soles, spreading holiness wherever the wearer treads."
+	icon = 'icons/clothing/suit/armor/baroque.dmi'
+	icon_state = "sisterboots"
+	siemens_coefficient = 0.7
+	drop_sound = 'sound/items/drop/boots.ogg'
+	pickup_sound = 'sound/items/pickup/boots.ogg'
+	worn_render_flags = WORN_RENDER_SLOT_ONE_FOR_ALL
+
 /obj/item/clothing/shoes/boots/paladin
 	name = "elite paladin boots"
 	desc = "These sturdy leather boots have been augmented with tarnished steel plate armor. The soles have been refurbished many times."

code/modules/clothing/suits/armor.dm

@@ -928,3 +928,11 @@
 	icon_state = "tau"
 	armor_type = /datum/armor/general/utilitarian_military
 	worn_render_flags = WORN_RENDER_SLOT_ONE_FOR_ALL
+
+/obj/item/clothing/suit/armor/baroque
+	name = "baroque military armor"
+	desc = "This ornately decorated armor has been lovingly adorned with holy symbols. It smells faintly of incense."
+	icon = 'icons/clothing/suit/armor/baroque.dmi'
+	icon_state = "sister"
+	armor_type = /datum/armor/general/baroque_military
+	worn_render_flags = WORN_RENDER_SLOT_ONE_FOR_ALL

code/modules/projectiles/guns/projectile/automatic.dm

@@ -346,8 +346,9 @@
 
 	firemodes = list(
 		list(mode_name="semiauto", burst=1, fire_delay=0),
-		list(mode_name="3-round bursts", burst=3, move_delay=6, burst_accuracy = list(60,40,30,25,15), dispersion = list(0.0, 0.6, 0.6))
+		list(mode_name="3-round bursts", burst=3, move_delay=6, burst_accuracy = list(60,40,30,25,15), dispersion = list(0.0, 0.6, 0.6)),
 //		list(mode_name="6-round bursts", burst=6, move_delay=6, burst_accuracy = list(0,-15,-15,-30,-30, -30), dispersion = list(0.6, 1.0, 1.0, 1.0, 1.2, 1.2)),
+		list(mode_name="automatic", burst=1, fire_delay=-1, move_delay=null, burst_accuracy=null, dispersion=null, automatic = 1)
 		)
 
 /obj/item/gun/ballistic/automatic/as24/update_icon_state()
@@ -671,6 +672,52 @@
 	. = ..()
 	icon_state = (ammo_magazine)? "combatsmg" : "combatsmg-empty"
 
+// Please don't spawn these regularly. I'm mostly just adding these for fun.
+/obj/item/gun/ballistic/automatic/bolter
+	name = "\improper Ballistae bolt rifle"
+	desc = "A boxy rifle clearly designed for larger hands. Uses .75 gyrojet rounds."
+	description_fluff = "The HI-GP mk 8 'Ballistae' is a bulky weapon designed to fire an obscenely robust .75 caliber gyrojet round with an explosive payload. The original design was sourced from Old Earth speculative documentation, and developed to test its efficacy. Although the weapon itself is undeniably powerful, its logistical demands, the recoil of the three-stage ammunition system, and its hefty size make it untenable on the modern battlefield."
+	icon_state = "bolter"
+	item_state = "bolter"
+	caliber = ".75"
+	origin_tech = list(TECH_COMBAT = 5, TECH_ILLEGAL = 2)
+	load_method = MAGAZINE
+	fire_sound = 'sound/weapons/gunshot/gunshot_bolter.ogg'
+	max_shells = 30
+	magazine_type = /obj/item/ammo_magazine/m75/sickle
+	allowed_magazines = list(/obj/item/ammo_magazine/m75/sickle)
+	heavy = TRUE
+	one_handed_penalty = 80
+
+	firemodes = list(
+		list(mode_name="semiauto", burst=1, fire_delay=0),
+		list(mode_name="automatic", burst=1, fire_delay=-1, move_delay=null, burst_accuracy=null, dispersion=null, automatic = 1)
+		)
+
+/obj/item/gun/ballistic/automatic/bolter/update_icon_state()
+	. = ..()
+	icon_state = "bolter-[ammo_magazine ? round(ammo_magazine.stored_ammo.len, 2) : "empty"]"
+
+/obj/item/gun/ballistic/automatic/bolter/storm
+	name = "\improper Onager heavy bolt rifle"
+	desc = "A hulking automatic weapon more fit for a crew serve position than personal use. Uses .75 gyrojet rounds."
+	description_fluff = "The HI-GP mk 2 'Onager' may perhaps be considered the one successful prototype to come out of Hephaestus' reclamatory efforts. Thanks to its large size many of the issues with ease of maintenance were successfully mitigated. However, the expense of replacing parts and the cost of the weapon's exotic ammunition still resulted in the inititative being considered a failure."
+	icon_state = "stormbolter"
+	item_state = "stormbolter"
+	max_shells = 50
+	magazine_type = /obj/item/ammo_magazine/m75/box
+	allowed_magazines = list(/obj/item/ammo_magazine/m75/box)
+	one_handed_penalty = 100
+
+	firemodes = list(
+		list(mode_name="semiauto", burst=1, fire_delay=0),
+		list(mode_name="automatic", burst=2, fire_delay=-1, move_delay=null, burst_accuracy=null, dispersion=null, automatic = 1)
+		)
+
+/obj/item/gun/ballistic/automatic/bolter/storm/update_icon_state()
+	. = ..()
+	icon_state = "stormbolter-[ammo_magazine ? round(ammo_magazine.stored_ammo.len, 10) : "empty"]"
+
 //Foam Weapons
 /obj/item/gun/ballistic/automatic/advanced_smg/foam
 	name = "toy submachine gun"

code/modules/projectiles/guns/projectile/pistol.dm

@@ -158,6 +158,32 @@
 	auto_eject = 1
 	auto_eject_sound = 'sound/weapons/smg_empty_alarm.ogg'
 
+/obj/item/gun/ballistic/gyropistol/bolter
+	name = "\improper Scorpion bolt pistol"
+	desc = "A boxy sidearm seemingly designed for a larger hand. Uses .75 gyrojet rounds."
+	description_fluff = "The HI-GP mk 3 'Scorpion' was an attempt to downsize the larger Ballistae model even further. Many of the weapon's issues persisted, compounded by the smaller size of the mechanical components within. Most prototypes sheared or broke, and were prone to malfunction due to the instense strain of extensive firing."
+	icon_state = "bolt_pistol"
+	item_state = "bolt_pistol"
+	max_shells = 10
+	fire_sound = 'sound/weapons/gunshot/gunshot_bolter.ogg'
+	origin_tech = list(TECH_COMBAT = 5, TECH_ILLEGAL = 3)
+	magazine_type = /obj/item/ammo_magazine/m75/pistol
+	allowed_magazines = list(/obj/item/ammo_magazine/m75/pistol)
+	auto_eject = 0
+
+/obj/item/gun/ballistic/gyropistol/bolter/update_icon_state()
+	. = ..()
+	icon_state = "bolt_pistol-[ammo_magazine ? round(ammo_magazine.stored_ammo.len, 2) : "empty"]"
+
+/obj/item/gun/ballistic/gyropistol/bolter/black
+	desc = "A boxy sidearm seemingly designed for a larger hand. This one is painted black."
+	icon_state = "bolt_pistolblack"
+	item_state = "bolt_pistolblack"
+
+/obj/item/gun/ballistic/gyropistol/bolter/black/update_icon_state()
+	. = ..()
+	icon_state = "bolt_pistolblack-[ammo_magazine ? round(ammo_magazine.stored_ammo.len, 2) : "empty"]"
+
 /obj/item/gun/ballistic/pistol
 	name = "compact pistol"
 	desc = "An ultra-compact pistol with a matte black finish. Uses 9mm."

code/modules/projectiles/magazines/unsorted.dm

@@ -1032,16 +1032,30 @@
 
 /obj/item/ammo_magazine/m75
 	name = "magazine (.75 Gyrojet)"
-	icon_state = "75"
+	icon_state = "m75"
 	mag_type = MAGAZINE
 	caliber = ".75"
 	ammo_type = /obj/item/ammo_casing/a75
 	multiple_sprites = 1
-	max_ammo = 4
+	max_ammo = 8
 
 /obj/item/ammo_magazine/m75/empty
 	initial_ammo = 0
 
+/obj/item/ammo_magazine/m75/sickle
+	name = "sickle magazine (.75 Gyrojet)"
+	icon_state = "m75sickle"
+	max_ammo = 30
+
+/obj/item/ammo_magazine/m75/pistol
+	icon_state = "m75pistol"
+	max_ammo = 10
+
+/obj/item/ammo_magazine/m75/box
+	name = "box magazine (.75 Gyrojet)"
+	icon_state = "a75box"
+	max_ammo = 50
+
 ///////// Misc. /////////
 
 /obj/item/ammo_magazine/caps