[MIRROR] Adds a new heavy weight space pirate variant: The space IRS! [MDB IGNORE] (#22365)

* Adds a new heavy weight space pirate variant: The space IRS!

* Fix merge conflicts, UpdatePaths

* Fixes some path changes

* Updates icon files, adds a new sprite for breacher slug box illustration

* Removes some skyrat edits and puts them in modular overrides instead

---------

Co-authored-by: Singul0 <127663818+Singul0@users.noreply.github.com>
Co-authored-by: Giz <vinylspiders@gmail.com>

_maps/RandomRuins/SpaceRuins/infested_frigate.dmm

@@ -2115,11 +2115,11 @@
 	icon_state = "warningline_white";
 	dir = 1
 	},
-/obj/item/storage/toolbox/a762{
+/obj/item/storage/toolbox/ammobox/a762{
 	pixel_y = 16;
 	pixel_x = 5
 	},
-/obj/item/storage/toolbox/a762{
+/obj/item/storage/toolbox/ammobox/a762{
 	pixel_y = 8;
 	pixel_x = 3
 	},

_maps/shuttles/skyrat/pirate_nri_raider.dmm

@@ -157,8 +157,8 @@
 /obj/structure/rack/shelf,
 /obj/effect/turf_decal/stripes/line,
 /obj/machinery/light/small/red/directional/north,
-/obj/item/storage/toolbox/ammo/full/nri_smg,
-/obj/item/storage/toolbox/ammo/full/nri_smg,
+/obj/item/storage/toolbox/ammobox/full/nri_smg,
+/obj/item/storage/toolbox/ammobox/full/nri_smg,
 /turf/open/floor/pod/light,
 /area/shuttle/pirate/nri)
 "fJ" = (

code/datums/id_trim/syndicate.dm

@@ -28,6 +28,20 @@
 	sechud_icon_state = SECHUD_SYNDICATE_INTERDYNE_HEAD
 	access = list(ACCESS_SYNDICATE, ACCESS_ROBOTICS, ACCESS_SURGERY)
 
+/// Trim for the space IRS agents (why are they syndie access? I wouldn't worry about it.)
+/datum/id_trim/syndicom/irs
+	assignment = "Internal Revenue Service Agent"
+	trim_state = "trim_securityofficer"
+	department_color = COLOR_CENTCOM_BLUE
+	subdepartment_color = COLOR_COMMAND_BLUE
+	sechud_icon_state = SECHUD_DEATH_COMMANDO
+	access = list(ACCESS_SYNDICATE, ACCESS_MAINT_TUNNELS)
+
+/datum/id_trim/syndicom/irs/auditor
+	assignment = "Internal Revenue Service Head Auditor"
+	trim_state = "trim_quartermaster"
+	sechud_icon_state = SECHUD_QUARTERMASTER
+
 /// Trim for Syndicate mobs, outfits and corpses.
 /datum/id_trim/syndicom/captain
 	assignment = "Syndicate Ship Captain"

code/game/machinery/porta_turret/portable_turret.dm

@@ -785,6 +785,14 @@ DEFINE_BITFIELD(turret_flags, list(
 	stun_projectile = /obj/projectile/bullet/syndicate_turret
 	lethal_projectile = /obj/projectile/bullet/syndicate_turret
 
+/obj/machinery/porta_turret/syndicate/irs
+	lethal_projectile = /obj/projectile/bullet/c10mm/ap
+	lethal_projectile_sound = 'sound/weapons/gun/smg/shot.ogg'
+	stun_projectile = /obj/projectile/bullet/c10mm/ap
+	stun_projectile_sound = 'sound/weapons/gun/smg/shot.ogg'
+	armor_type = /datum/armor/syndicate_turret
+	faction = list(FACTION_PIRATE)
+
 /obj/machinery/porta_turret/syndicate/shuttle
 	scan_range = 9
 	shot_delay = 3

code/game/objects/items/storage/boxes/security_boxes.dm

@@ -238,6 +238,16 @@
 	for(var/i in 1 to 6)
 		new /obj/item/ammo_casing/shotgun/beanbag(src)
 
+/obj/item/storage/box/breacherslug
+	name = "box of breaching shotgun shells"
+	desc = "A box full of breaching slugs, designed for rapid entry, not very effective against anything else."
+	icon_state = "breacher_box"
+	illustration = null
+
+/obj/item/storage/box/breacherslug/PopulateContents()
+	for(var/i in 1 to 7)
+		new /obj/item/ammo_casing/shotgun/breacher(src)
+
 /obj/item/storage/box/emptysandbags
 	name = "box of empty sandbags"
 	illustration = "sandbag"

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

@@ -225,10 +225,9 @@
 	new /obj/item/stack/pipe_cleaner_coil/white(src)
 	new /obj/item/stack/pipe_cleaner_coil/brown(src)
 
-/obj/item/storage/toolbox/a762
-	name = "7.62mm ammo box (Surplus?)"
-	desc = "It contains a few clips. Goddamn, this thing smells awful. \
-		Has this been sitting in a warehouse for the last several centuries?"
+/obj/item/storage/toolbox/ammobox
+	name = "ammo canister"
+	desc = "A metal canister designed to hold ammunition"
 	icon_state = "ammobox"
 	inhand_icon_state = "ammobox"
 	lefthand_file = 'icons/mob/inhands/equipment/toolbox_lefthand.dmi'
@@ -236,15 +235,30 @@
 	has_latches = FALSE
 	drop_sound = 'sound/items/handling/ammobox_drop.ogg'
 	pickup_sound = 'sound/items/handling/ammobox_pickup.ogg'
-	var/ammo_to_spawn = /obj/item/ammo_box/a762
+	var/ammo_to_spawn
 
-/obj/item/storage/toolbox/a762/PopulateContents()
-	for(var/i in 1 to 6)
-		new ammo_to_spawn(src)
+/obj/item/storage/toolbox/ammobox/PopulateContents()
+	if(!isnull(ammo_to_spawn))
+		for(var/i in 1 to 6)
+			new ammo_to_spawn(src)
 
-/obj/item/storage/toolbox/a762/surplus
+/obj/item/storage/toolbox/ammobox/a762
+	name = "7.62mm ammo box (Surplus?)"
+	desc = "It contains a few clips. Goddamn, this thing smells awful. \
+		Has this been sitting in a warehouse for the last several centuries?"
+	ammo_to_spawn = /obj/item/ammo_box/a762
+
+/obj/item/storage/toolbox/ammobox/a762/surplus
 	ammo_to_spawn = /obj/item/ammo_box/a762/surplus
 
+/obj/item/storage/toolbox/ammobox/wt550m9
+	name = "4.6x30mm ammo box"
+	ammo_to_spawn = /obj/item/ammo_box/magazine/wt550m9
+
+/obj/item/storage/toolbox/ammobox/wt550m9ap
+	name = "4.6x30mm AP ammo box"
+	ammo_to_spawn = /obj/item/ammo_box/magazine/wt550m9/wtap
+
 /obj/item/storage/toolbox/maint_kit
 	name = "gun maintenance kit"
 	desc = "It contains some gun maintenance supplies"

code/game/objects/obj_defense.dm

@@ -28,7 +28,7 @@
 	playsound(src, P.hitsound, 50, TRUE)
 	var/damage
 	if(!QDELETED(src)) //Bullet on_hit effect might have already destroyed this object
-		damage = take_damage(P.damage, P.damage_type, P.armor_flag, 0, turn(P.dir, 180), P.armour_penetration)
+		damage = take_damage(P.damage * P.demolition_mod, P.damage_type, P.armor_flag, 0, turn(P.dir, 180), P.armour_penetration)
 	if(P.suppressed != SUPPRESSED_VERY)
 		visible_message(span_danger("[src] is hit by \a [P][damage ? "" : ", without leaving a mark"]!"), null, null, COMBAT_MESSAGE_RANGE)
 

code/game/objects/structures/guncase.dm

@@ -133,3 +133,8 @@
 	icon_state = "ecase"
 	case_type = "egun"
 	gun_category = /obj/item/gun/energy/e_gun
+
+/obj/structure/guncase/wt550
+	name = "WT-550 gun locker"
+	desc = "A locker that holds WT-550 rifles."
+	case_type = "wt550"

code/modules/antagonists/pirate/pirate_gangs.dm

@@ -150,3 +150,25 @@ GLOBAL_LIST_INIT(heavy_pirate_gangs, init_pirate_gangs(is_heavy = TRUE))
 	response_received = "Wait, you ACTUALLY gave us the money? Thanks, but we're coming for the rest anyways!"
 	response_too_late = "Nothing, huh? Looks like the Tide's coming aboard!"
 	response_not_enough = "You trying to cheat us? That's fine, we'll take your station as collateral."
+
+///Agents from the space I.R.S. heavily armed to stea- I mean, collect the station's tax dues
+/datum/pirate_gang/irs
+	name = "Space IRS"
+
+	is_heavy_threat = TRUE
+	ship_template_id = "irs"
+	ship_name_pool = "irs_names"
+
+	threat_title = "Missing Tax Dues"
+	threat_content = "%SHIPNAME Here, We noticed that your station hasn't been paying your taxes.. \
+		Let's rectify that, Your missing tax dues amounts to %PAYOFF \
+		We highly recommend paying your taxes stat, \
+		we don't need to send a team to your station to resolve the situation do we?"
+	arrival_announcement = "This is the tax conflict resolution team, prepare for your assets to be liquidated and be charged with tax fraud, \
+		if you fail to pay your taxes in time."
+	possible_answers = list("You know, I was just about to pay that. Thanks for the reminder!","I don't care WHO the IRS sends, I'm not paying for my taxes!")
+
+	response_received = "Payment received, We salute you for being law-abiding tax-paying citizens"
+	response_too_late = "Too late, A team has already been sent out resolve this matter directly."
+	response_not_enough = "You filed your taxes incorrectly, A team has been sent to assist in liquidating assets and arrest you for tax fraud. \
+		Nothing personel kid."

code/modules/antagonists/pirate/pirate_outfits.dm

@@ -101,3 +101,27 @@
 	shoes = /obj/item/clothing/shoes/sneakers/black
 	l_pocket = /obj/item/reagent_containers/cup/glass/coffee
 	r_pocket = /obj/item/tank/internals/emergency_oxygen
+
+/datum/outfit/pirate/irs
+	name = "IRS Agent Outfit"
+	id = /obj/item/card/id/advanced
+	id_trim = /datum/id_trim/syndicom/irs
+	uniform = /obj/item/clothing/under/costume/buttondown/slacks
+	suit = /obj/item/clothing/suit/costume/irs
+	back = null
+	glasses = /obj/item/clothing/glasses/sunglasses
+	gloves = null
+	head = /obj/item/clothing/head/costume/irs
+	shoes = /obj/item/clothing/shoes/laceup
+	ears = /obj/item/radio/headset/syndicate
+	ears = /obj/item/radio/headset/syndicate/alt
+
+/datum/outfit/pirate/irs/auditor
+	name = "IRS Head Auditor"
+	id_trim = /datum/id_trim/syndicom/irs/auditor
+	uniform = /obj/item/clothing/under/suit/charcoal
+	neck = /obj/item/clothing/neck/tie/red/tied
+	suit = null
+	ears = /obj/item/radio/headset/syndicate/alt/leader
+	head = null
+	belt = /obj/item/storage/belt/holster/detective/full/ert

code/modules/antagonists/pirate/pirate_roles.dm

@@ -140,3 +140,33 @@
 
 /obj/effect/mob_spawn/ghost_role/human/pirate/grey/shitter
 	rank = "Tidemaster"
+
+/obj/effect/mob_spawn/ghost_role/human/pirate/irs
+	name = "\improper Space IRS sleeper"
+	desc = "A surprisingly clean cryogenic sleeper. You can see your reflection on the sides!"
+	density = FALSE
+	you_are_text = "You are an agent working for the space IRS"
+	flavour_text = "Not even in the expanse of the expanding universe can someone evade the tax man! Whether you are just a well disciplined and professional pirate gang or an actual agent from a local polity. You will squeeze the station dry of it's income regardless! Through peaceful means or otherwise..."
+	icon = 'icons/obj/machines/sleeper.dmi'
+	icon_state = "sleeper"
+	prompt_name = "An agent of the space IRS"
+	outfit = /datum/outfit/pirate/irs
+	fluff_spawn = null // dirs are fucked and I don't have the energy to deal with it
+	rank = "Agent"
+
+/obj/effect/mob_spawn/ghost_role/human/pirate/irs/generate_pirate_name(spawn_gender)
+	var/first_name
+	switch(spawn_gender)
+		if(MALE)
+			first_name = pick(GLOB.first_names_male)
+		if(FEMALE)
+			first_name = pick(GLOB.first_names_female)
+		else
+			first_name = pick(GLOB.first_names)
+
+	return "[rank] [first_name]"
+
+
+/obj/effect/mob_spawn/ghost_role/human/pirate/irs/auditor
+	rank = "Head Auditor"
+	outfit = /datum/outfit/pirate/irs/auditor

code/modules/antagonists/pirate/pirate_shuttle_equipment.dm

@@ -126,6 +126,19 @@
 	var/cooldown = 300
 	var/next_use = 0
 
+/// Surgery disk for the space IRS (I don't know where to dump them anywhere else)
+/obj/item/disk/surgery/irs
+	name = "Advanced Surgery Disk"
+	desc = "A disk that contains advanced surgery procedures, must be loaded into an Operating Console."
+	surgeries = list(
+		/datum/surgery/advanced/lobotomy,
+		/datum/surgery/advanced/bioware/vein_threading,
+		/datum/surgery/advanced/bioware/nerve_splicing,
+		/datum/surgery_step/heal/combo/upgraded,
+		/datum/surgery_step/pacify,
+		/datum/surgery_step/revive,
+	)
+
 /obj/machinery/loot_locator/interact(mob/user)
 	if(world.time <= next_use)
 		to_chat(user,span_warning("[src] is recharging."))

code/modules/cargo/packs/imports.dm

@@ -219,8 +219,8 @@
 		/obj/item/food/rationpack,
 		/obj/item/ammo_box/a762,
 		/obj/item/ammo_box/a762/surplus,
-		/obj/item/storage/toolbox/a762,
-		/obj/item/storage/toolbox/a762/surplus,
+		/obj/item/storage/toolbox/ammobox/a762,
+		/obj/item/storage/toolbox/ammobox/a762/surplus,
 		/obj/item/storage/toolbox/maint_kit,
 		/obj/item/clothing/suit/armor/vest/russian,
 		/obj/item/clothing/head/helmet/rus_helmet,

code/modules/cargo/packs/security.dm

@@ -235,7 +235,7 @@
 	cost = CARGO_CRATE_VALUE * 5
 	contains = list(/obj/item/gun/energy/e_gun/dragnet = 3)
 	crate_name = "\improper DRAGnet crate"
-	
+
 // SKYRAT EDIT REMOVAL BEGIN - CARGO ARMAMENTS
 /*
 /datum/supply_pack/security/armory/energy
@@ -319,38 +319,6 @@
 	contains = list(/obj/item/shield/riot = 3)
 	crate_name = "riot shields crate"
 
-/* SKYRAT EDIT REMOVAL START
-/datum/supply_pack/security/armory/russian
-	name = "Russian Surplus Crate"
-	desc = "Hello Comrade, we have the most modern russian military equipment the \
-		black market can offer, for the right price of course. Sadly we couldn't remove \
-		the lock, so it"
-	cost = CARGO_CRATE_VALUE * 12
-	contraband = TRUE
-	contains = list(/obj/item/food/rationpack,
-					/obj/item/ammo_box/a762,
-					/obj/item/storage/toolbox/ammo,
-					/obj/item/storage/toolbox/maint_kit,
-					/obj/item/clothing/suit/armor/vest/russian,
-					/obj/item/clothing/head/helmet/rus_helmet,
-					/obj/item/clothing/shoes/russian,
-					/obj/item/clothing/gloves/tackler/combat,
-					/obj/item/clothing/under/syndicate/rus_army,
-					/obj/item/clothing/under/costume/soviet,
-					/obj/item/clothing/mask/russian_balaclava,
-					/obj/item/clothing/head/helmet/rus_ushanka,
-					/obj/item/clothing/suit/armor/vest/russian_coat,
-					/obj/item/gun/ballistic/rifle/boltaction = 2,
-				)
-	crate_name = "surplus military crate"
-
-/datum/supply_pack/security/armory/russian/fill(obj/structure/closet/crate/C)
-	for(var/i in 1 to 10)
-		var/item = pick(contains)
-		new item(C)
-*/ // SKYRAT EDIT REMOVAL END
-
-
 /datum/supply_pack/security/armory/swat
 	name = "SWAT Crate"
 	desc = "Contains two fullbody sets of tough, fireproof suits designed in a joint \

code/modules/clothing/head/helmet.dm

@@ -120,6 +120,14 @@
 	name = "marine medic helmet"
 	icon_state = "marine_medic"
 
+/obj/item/clothing/head/helmet/marine/pmc
+	icon_state = "marine"
+	desc = "A tactical black helmet, designed to protect one's head and not much else."
+	min_cold_protection_temperature = HELMET_MIN_TEMP_PROTECT
+	max_heat_protection_temperature = HELMET_MAX_TEMP_PROTECT
+	clothing_flags = null
+	armor_type = /datum/armor/pmc
+
 /obj/item/clothing/head/helmet/old
 	name = "degrading helmet"
 	desc = "Standard issue security helmet. Due to degradation the helmet's visor obstructs the users ability to see long distances."

code/modules/clothing/outfits/standard.dm

@@ -64,8 +64,7 @@
 	head = /obj/item/clothing/head/fedora/det_hat
 	l_hand = /obj/item/gun/ballistic
 	l_hand = null
-	//r_pocket = /obj/item/ammo_box/c10mm
-	r_hand = /obj/item/ammo_box/c10mm // SKYRAT EDIT CHANGE
+	r_pocket = /obj/item/ammo_box/c10mm
 
 /datum/outfit/tournament/janitor
 	name = "tournament janitor"
@@ -137,86 +136,6 @@
 	head = /obj/item/clothing/head/helmet/bluetaghelm
 	shoes = /obj/item/clothing/shoes/sneakers/blue
 
-/datum/outfit/pirate
-	name = "Space Pirate"
-
-	id = /obj/item/card/id/advanced
-	id_trim = /datum/id_trim/pirate
-	uniform = /obj/item/clothing/under/costume/pirate
-	suit = /obj/item/clothing/suit/costume/pirate/armored
-	ears = /obj/item/radio/headset/syndicate
-	glasses = /obj/item/clothing/glasses/eyepatch
-	head = /obj/item/clothing/head/costume/pirate/bandana/armored
-	shoes = /obj/item/clothing/shoes/sneakers/brown
-
-	back = /obj/item/storage/backpack/satchel/leather //SKYRAT EDIT ADDITION
-	backpack_contents = list(/obj/item/gun/ballistic/automatic/pistol/m1911, /obj/item/ammo_box/magazine/m45 = 3) //SKYRAT EDIT ADDITION
-
-/datum/outfit/pirate/post_equip(mob/living/carbon/human/equipped)
-	equipped.faction |= "pirate"
-
-	var/obj/item/radio/outfit_radio = equipped.ears
-	if(outfit_radio)
-		outfit_radio.set_frequency(FREQ_SYNDICATE)
-		outfit_radio.freqlock = RADIO_FREQENCY_LOCKED
-
-	var/obj/item/card/id/outfit_id = equipped.wear_id
-	if(outfit_id)
-		outfit_id.registered_name = equipped.real_name
-		outfit_id.update_label()
-		outfit_id.update_icon()
-
-	var/obj/item/clothing/under/pirate_uniform = equipped.w_uniform
-	if(pirate_uniform)
-		pirate_uniform.has_sensor = NO_SENSORS
-		pirate_uniform.sensor_mode = SENSOR_OFF
-		equipped.update_suit_sensors()
-
-/datum/outfit/pirate/captain
-	name = "Space Pirate Captain"
-
-	id_trim = /datum/id_trim/pirate/captain
-	head = /obj/item/clothing/head/costume/pirate/armored
-
-/datum/outfit/pirate/space
-	name = "Space Pirate (EVA)"
-
-	suit = /obj/item/clothing/suit/space/pirate
-	suit_store = /obj/item/tank/internals/oxygen
-	head = /obj/item/clothing/head/helmet/space/pirate/bandana
-	mask = /obj/item/clothing/mask/breath
-
-	back = /obj/item/storage/backpack/satchel/leather //SKYRAT EDIT ADDITION
-	backpack_contents = list(/obj/item/gun/ballistic/automatic/pistol/m1911, /obj/item/ammo_box/magazine/m45 = 3) //SKYRAT EDIT ADDITION
-
-/datum/outfit/pirate/space/captain
-	name = "Space Pirate Captain (EVA)"
-
-	head = /obj/item/clothing/head/helmet/space/pirate
-
-/datum/outfit/pirate/silverscale
-	name = "Silver Scale Member"
-
-	id = /obj/item/card/id/advanced/silver
-	id_trim = /datum/id_trim/pirate/silverscale
-	uniform = /obj/item/clothing/under/syndicate/sniper
-	suit = /obj/item/clothing/suit/armor/vest/alt
-	glasses = /obj/item/clothing/glasses/monocle
-	gloves = /obj/item/clothing/gloves/color/black
-	head = /obj/item/clothing/head/collectable/tophat
-	shoes = /obj/item/clothing/shoes/laceup
-
-	back = /obj/item/storage/backpack/satchel/leather //SKYRAT EDIT ADDITION
-	backpack_contents = list(/obj/item/gun/ballistic/automatic/pistol/m1911, /obj/item/ammo_box/magazine/m45 = 3) //SKYRAT EDIT ADDITION
-
-/datum/outfit/pirate/silverscale/captain
-	name = "Silver Scale Captain"
-
-	id_trim = /datum/id_trim/pirate/captain/silverscale
-	head = /obj/item/clothing/head/costume/crown
-	mask = /obj/item/clothing/mask/cigarette/cigar/havana
-	l_pocket = /obj/item/lighter
-
 /datum/outfit/tunnel_clown
 	name = "Tunnel Clown"
 

code/modules/clothing/suits/armor.dm

@@ -69,6 +69,16 @@
 	acid = 50
 	wound = 20
 
+/datum/armor/pmc
+	melee = 40
+	bullet = 50
+	laser = 60
+	energy = 50
+	bomb = 50
+	bio = 100
+	acid = 50
+	wound = 20
+
 /obj/item/clothing/suit/armor/vest/marine/security
 	name = "large tactical armor vest"
 	icon_state = "marine_security"
@@ -82,6 +92,13 @@
 	icon_state = "marine_medic"
 	body_parts_covered = CHEST|GROIN
 
+/obj/item/clothing/suit/armor/vest/marine/pmc
+	desc = "A set of the finest mass produced, stamped plasteel armor plates, for an all-around door-kicking and ass-smashing."
+	min_cold_protection_temperature = HELMET_MIN_TEMP_PROTECT
+	max_heat_protection_temperature = HELMET_MAX_TEMP_PROTECT
+	clothing_flags = THICKMATERIAL
+	armor_type = /datum/armor/pmc
+
 /obj/item/clothing/suit/armor/vest/old
 	name = "degrading armor vest"
 	desc = "Older generation Type 1 armored vest. Due to degradation over time the vest is far less maneuverable to move in."

code/modules/clothing/suits/costume.dm

@@ -577,3 +577,11 @@
 	inhand_icon_state = null
 	body_parts_covered = CHEST|GROIN|LEGS|ARMS
 	supports_variations_flags = CLOTHING_DIGITIGRADE_VARIATION_NO_NEW_ICON
+
+/obj/item/clothing/suit/costume/irs
+	name = "internal revenue service jacket"
+	desc = "I'm crazy enough to take on The Owl, but the IRS? Nooo thank you!"
+	icon_state = "irs_suit"
+	inhand_icon_state = null
+	body_parts_covered = CHEST|GROIN|LEGS|ARMS
+	supports_variations_flags = CLOTHING_DIGITIGRADE_VARIATION_NO_NEW_ICON

code/modules/projectiles/ammunition/ballistic/shotgun.dm

@@ -161,3 +161,10 @@
 	reagents.add_reagent(/datum/reagent/toxin/mutetoxin, 6) //;HELP OPS IN MAINT
 	reagents.add_reagent(/datum/reagent/toxin/coniine, 6)
 	reagents.add_reagent(/datum/reagent/toxin/sodium_thiopental, 6)
+
+/obj/item/ammo_casing/shotgun/breacher
+	name = "breaching slug"
+	desc = "A 12 gauge anti-material slug. Great for breaching airlocks and windows, quickly and efficiently."
+	icon_state = "breacher"
+	projectile_type = /obj/projectile/bullet/shotgun_breaching
+	custom_materials = list(/datum/material/iron=SHEET_MATERIAL_AMOUNT*2)

code/modules/projectiles/boxes_magazines/internal/shotgun.dm

@@ -29,6 +29,10 @@
 	name = "double-barrel shotgun internal magazine (slugs)"
 	ammo_type = /obj/item/ammo_casing/shotgun
 
+/obj/item/ammo_box/magazine/internal/shot/dual/breacherslug
+	name = "double-barrel shotgun internal magazine (breacher)"
+	ammo_type = /obj/item/ammo_casing/shotgun/breacher
+
 /obj/item/ammo_box/magazine/internal/shot/riot
 	name = "riot shotgun internal magazine"
 	ammo_type = /obj/item/ammo_casing/shotgun/rubbershot

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

@@ -234,7 +234,6 @@
 	burst_size = 3
 	fire_delay = 1
 
-
 // L6 SAW //
 
 /obj/item/gun/ballistic/automatic/l6_saw

code/modules/projectiles/guns/ballistic/shotgun.dm

@@ -291,6 +291,12 @@
 	sawn_desc = "A sawn-off hunting shotgun. In its new state, it's remarkably less effective at hunting... anything."
 	mag_type = /obj/item/ammo_box/magazine/internal/shot/dual/slugs
 
+/obj/item/gun/ballistic/shotgun/doublebarrel/breacherslug
+	name = "breaching shotgun"
+	desc = "A normal double-barrel shotgun that has been rechambered to fit breaching shells. Useful in breaching airlocks and windows, not much else."
+	sawn_desc = "A sawn-off breaching shotgun, making for a more compact configuration while still having the same capability as before."
+	mag_type = /obj/item/ammo_box/magazine/internal/shot/dual/breacherslug
+
 /obj/item/gun/ballistic/shotgun/hook
 	name = "hook modified sawn-off shotgun"
 	desc = "Range isn't an issue when you can bring your victim to you."

code/modules/projectiles/projectile/bullets/shotgun.dm

@@ -128,3 +128,12 @@
 /obj/projectile/bullet/scattershot
 	icon_state = "pellet"
 	damage = 24
+
+//Breaching Ammo
+
+/obj/projectile/bullet/shotgun_breaching
+	name = "12g breaching round"
+	desc = "A breaching round designed to destroy airlocks and windows with only a few shots. Ineffective against other targets."
+	hitsound = 'sound/weapons/sonic_jackhammer.ogg'
+	damage = 5 //does shit damage to everything except doors and windows
+	demolition_mod = 200 //one shot to break a window or grille, or two shots to breach an airlock door

code/modules/vending/clothesmate.dm

@@ -149,6 +149,7 @@
 				/obj/item/clothing/under/ethereal_tunic = 3,
 
 				/obj/item/clothing/suit/costume/ianshirt = 1,
+				/obj/item/clothing/suit/costume/irs = 20,
 				/obj/item/clothing/head/costume/irs = 20,
 				/obj/item/clothing/head/costume/tmc = 20,
 				/obj/item/clothing/head/costume/deckers = 20,

modular_skyrat/master_files/code/modules/antagonists/pirate/pirate_outfits.dm

@@ -0,0 +1,9 @@
+// Pirate outfit overrides
+
+/datum/outfit/pirate
+	back = /obj/item/storage/backpack/satchel/leather
+	backpack_contents = list(/obj/item/gun/ballistic/automatic/pistol/m1911, /obj/item/ammo_box/magazine/m45 = 3)
+
+
+/datum/outfit/pirate/irs
+	back = /obj/item/storage/backpack/satchel/leather

modular_skyrat/master_files/code/modules/clothing/outfits/standard.dm

@@ -0,0 +1,5 @@
+// Standard outfit overrides
+
+/datum/outfit/tournament/gangster
+	r_pocket = null
+	r_hand = /obj/item/ammo_box/c10mm

modular_skyrat/modules/aesthetics/guns/code/guns.dm

@@ -701,5 +701,5 @@
 /obj/item/ammo_box/a762/surplus
 	name = "stripper clip (.244 Acia surplus)"
 
-/obj/item/storage/toolbox/a762
+/obj/item/storage/toolbox/ammobox/a762
 	name = ".244 Acia ammo box (Surplus?)"

modular_skyrat/modules/aesthetics/storage/storage.dm

@@ -112,6 +112,9 @@
 	icon_state = "secbox_xl"
 	illustration = "beanbag"
 
+/obj/item/storage/box/breacherslug
+	icon_state = "secbox_xl"
+	illustration = "breacherslug"
 
 /obj/item/storage/box/evidence
 	icon_state = "secbox"

modular_skyrat/modules/cargo/code/packs.dm

@@ -716,7 +716,7 @@
 	contains = list(
 		/obj/item/crucifix = 3,
 		/obj/item/storage/box/nri_rations = 3,
-		/obj/item/storage/toolbox/a762 = 1,
+		/obj/item/storage/toolbox/ammobox/a762 = 1,
 		/obj/item/storage/toolbox/maint_kit = 1,
 		/obj/item/gun/ballistic/rifle/boltaction = 1,
 		/obj/item/ammo_box/a762 = 3,

modular_skyrat/modules/novaya_ert/code/advanced_choice_beacon.dm

@@ -225,12 +225,12 @@
 
 /obj/structure/closet/crate/secure/weapon/nri/heavy/offense/PopulateContents()
 	new /obj/item/gun/ballistic/automatic/l6_saw/unrestricted(src)
-	new /obj/item/storage/toolbox/ammo/full/l6_saw(src)
-	new /obj/item/storage/toolbox/ammo/full/krinkov(src)
-	new /obj/item/storage/toolbox/ammo/full/krinkov/emp(src)
-	new /obj/item/storage/toolbox/ammo/full/krinkov/fire(src)
-	new /obj/item/storage/toolbox/ammo/full/krinkov/ricochet(src)
-	new /obj/item/storage/toolbox/ammo/full/krinkov/ap(src)
-	new /obj/item/storage/toolbox/ammo/full/nri_smg(src)
-	new /obj/item/storage/toolbox/ammo/full/nri_smg(src)
-	new /obj/item/storage/toolbox/ammo/full/aps(src)
+	new /obj/item/storage/toolbox/ammobox/full/l6_saw(src)
+	new /obj/item/storage/toolbox/ammobox/full/krinkov(src)
+	new /obj/item/storage/toolbox/ammobox/full/krinkov/emp(src)
+	new /obj/item/storage/toolbox/ammobox/full/krinkov/fire(src)
+	new /obj/item/storage/toolbox/ammobox/full/krinkov/ricochet(src)
+	new /obj/item/storage/toolbox/ammobox/full/krinkov/ap(src)
+	new /obj/item/storage/toolbox/ammobox/full/nri_smg(src)
+	new /obj/item/storage/toolbox/ammobox/full/nri_smg(src)
+	new /obj/item/storage/toolbox/ammobox/full/aps(src)

modular_skyrat/modules/novaya_ert/code/toolbox.dm

@@ -1,4 +1,4 @@
-/obj/item/storage/toolbox/ammo
+/obj/item/storage/toolbox/ammobox
 	desc = "It contains a few clips."
 	icon_state = "ammobox"
 	inhand_icon_state = "ammobox"
@@ -8,72 +8,72 @@
 	drop_sound = 'sound/items/handling/ammobox_drop.ogg'
 	pickup_sound = 'sound/items/handling/ammobox_pickup.ogg'
 
-/obj/item/storage/toolbox/ammo/PopulateContents()
+/obj/item/storage/toolbox/ammobox/PopulateContents()
 	return
 
-/obj/item/storage/toolbox/ammo/full
+/obj/item/storage/toolbox/ammobox/full
 	var/ammo_type = null ///Type of mags/casings/clips we spawn in.
 	var/amount = 0 ///Amount of mags/casings/clips we spawn in.
 
-/obj/item/storage/toolbox/ammo/full/PopulateContents()
+/obj/item/storage/toolbox/ammobox/full/PopulateContents()
 	for(var/i in 1 to amount)
 		new ammo_type(src)
 
-/obj/item/storage/toolbox/ammo/full/mosin
+/obj/item/storage/toolbox/ammobox/full/mosin
 	name = "ammo box (Sportiv)"
 	ammo_type = /obj/item/ammo_box/a762
 	amount = 7
 
-/obj/item/storage/toolbox/ammo/full/krinkov
+/obj/item/storage/toolbox/ammobox/full/krinkov
 	name = "ammo box (Krinkov)"
 	desc = "It contains a few magazines."
 	ammo_type = /obj/item/ammo_box/magazine/akm
 	amount = 7
 
-/obj/item/storage/toolbox/ammo/full/krinkov/emp
+/obj/item/storage/toolbox/ammobox/full/krinkov/emp
 	name = "ammo box (Krinkov, EMP)"
 	desc = "It contains a few magazines."
 	ammo_type = /obj/item/ammo_box/magazine/akm/emp
 
-/obj/item/storage/toolbox/ammo/full/krinkov/fire
+/obj/item/storage/toolbox/ammobox/full/krinkov/fire
 	name = "ammo box (Krinkov, incendiary)"
 	desc = "It contains a few magazines."
 	ammo_type = /obj/item/ammo_box/magazine/akm/fire
 
-/obj/item/storage/toolbox/ammo/full/krinkov/ricochet
+/obj/item/storage/toolbox/ammobox/full/krinkov/ricochet
 	name = "ammo box (Krinkov, match)"
 	desc = "It contains a few magazines."
 	ammo_type = /obj/item/ammo_box/magazine/akm/ricochet
 
-/obj/item/storage/toolbox/ammo/full/krinkov/ap
+/obj/item/storage/toolbox/ammobox/full/krinkov/ap
 	name = "ammo box (Krinkov, armor piercing)"
 	desc = "It contains a few magazines."
 	ammo_type = /obj/item/ammo_box/magazine/akm/ap
 
-/obj/item/storage/toolbox/ammo/full/bison
+/obj/item/storage/toolbox/ammobox/full/bison
 	name = "ammo box (PP-95)"
 	desc = "It contains a few magazines."
 	ammo_type = /obj/item/ammo_box/magazine/multi_sprite/cfa_lynx
 	amount = 4
 
-/obj/item/storage/toolbox/ammo/full/nri_smg
+/obj/item/storage/toolbox/ammobox/full/nri_smg
 	name = "ammo box (QLP/04)"
 	ammo_type = /obj/item/ammo_box/magazine/multi_sprite/cfa_lynx
 	amount = 7
 
-/obj/item/storage/toolbox/ammo/full/l6_saw
+/obj/item/storage/toolbox/ammobox/full/l6_saw
 	name = "ammo box (L6 SAW)"
 	desc = "It contains a few magazines."
 	ammo_type = /obj/item/ammo_box/magazine/mm712x82
 	amount = 7
 
-/obj/item/storage/toolbox/ammo/full/makarov
+/obj/item/storage/toolbox/ammobox/full/makarov
 	name = "ammo box (R-C Makarov)"
 	desc = "It contains a few magazines."
 	ammo_type = /obj/item/ammo_box/magazine/multi_sprite/makarov
 	amount = 7
 
-/obj/item/storage/toolbox/ammo/full/aps
+/obj/item/storage/toolbox/ammobox/full/aps
 	name = "ammo box (Szabo-Ivanek/APS)"
 	desc = "It contains a few magazines."
 	ammo_type = /obj/item/ammo_box/magazine/m9mm_aps

strings/pirates.json

@@ -85,6 +85,7 @@
 		"I Am Become Death",
 		"I Love the Bomb",
 		"Ickity Pickety Startooth Knuckle Dragger",
+		"Khranitel Revolyutsii Escort Desserter",
 		"John Ship",
 		"Lizard Melter",
 		"Lost in Deep Space",
@@ -104,6 +105,7 @@
 		"Space Queen's Revenge",
 		"Star Scraper",
 		"Syndicate Privateer",
+		"The Mazianni",
 		"War as a Business",
 		"Xenophobia"
 	],
@@ -204,6 +206,18 @@
 		"The monochrome crash",
 		"Maintrastosphere Omega"
 	],
+	"irs_names":[
+		"Iron Shell Agency",
+		"Auroran Federal Tax Bureau",
+		"TerraGov Internal Revenue Service",
+		"Spinward Federal Taxation Office",
+		"Soviet Taxation Administration, 5th Service",
+		"Hiigaran Ministry of Taxation",
+		"Grand Fleet Tributary Patrol",
+		"Springbok Security Protection Service",
+		"Sindrian Revenue Authority",
+		"Space IRS"
+	],
 	"psyker_names":[
 		"Big Gulchergut for Gore",
 		"Blowkaine",

tgstation.dme

@@ -5559,6 +5559,7 @@
 #include "modular_skyrat\master_files\code\modules\antagonists\ashwalker\ashwalker.dm"
 #include "modular_skyrat\master_files\code\modules\antagonists\cult\cult_items.dm"
 #include "modular_skyrat\master_files\code\modules\antagonists\ert\ert.dm"
+#include "modular_skyrat\master_files\code\modules\antagonists\pirate\pirate_outfits.dm"
 #include "modular_skyrat\master_files\code\modules\antagonists\traitor\objectives\kill_pet.dm"
 #include "modular_skyrat\master_files\code\modules\antagonists\traitor\objectives\smuggling.dm"
 #include "modular_skyrat\master_files\code\modules\asset_cache\assets\plumbing.dm"
@@ -5618,6 +5619,7 @@
 #include "modular_skyrat\master_files\code\modules\clothing\head\monkey_magnification_helmet.dm"
 #include "modular_skyrat\master_files\code\modules\clothing\masks\_masks.dm"
 #include "modular_skyrat\master_files\code\modules\clothing\outfits\ert.dm"
+#include "modular_skyrat\master_files\code\modules\clothing\outfits\standard.dm"
 #include "modular_skyrat\master_files\code\modules\clothing\shoes\bananashoes.dm"
 #include "modular_skyrat\master_files\code\modules\clothing\shoes\boots.dm"
 #include "modular_skyrat\master_files\code\modules\clothing\shoes\sneakers.dm"

tools/UpdatePaths/Scripts/76115_toolbox_762_to_ammobox_762.txt

@@ -0,0 +1,4 @@
+#this changes a762 toolbox into a child of ammobox
+
+/obj/item/storage/toolbox/a762 : /obj/item/storage/toolbox/ammobox/a762{@OLD}
+/obj/item/storage/toolbox/a762/surplus : /obj/item/storage/toolbox/ammobox/a762/surplus{@OLD}