[Lavaland Ruin] Crashed Marine Transport (#27660)

* InitialCommit

* MergeConflict

* Mistakesweremade

* MissingText

* MoreFixesAndBlackList

* Tweaks

* FixedIssues

* FinalFixHopefully

* NewWalls

* IDCardAndNoNTReferences

* LorePassOver

* ArmourNerf

* MergeConflicts

* MergeConflict

* MergeConflict

* SlightRework

* Terran

* IronHawk

code/modules/clothing/spacesuits/miscellaneous.dm

@@ -79,6 +79,30 @@ Contains:
 	max_heat_protection_temperature = FIRE_IMMUNITY_HELM_MAX_TEMP_PROTECT
 	resistance_flags = FIRE_PROOF | ACID_PROOF
 
+	//Marine Armour
+/obj/item/clothing/head/helmet/space/hardsuit/ueg
+	name = "Iron Hawk Marine Helmet"
+	desc = "An armoured, pressurised, military helmet used as standard issue among Iron Hawk Marines."
+	icon_state = "ueghelm"
+	item_state = "ueghelm"
+	armor = list(melee = 50, bullet = 20, laser = 20, energy = 20, bomb = 50, bio = 90, rad = 70, fire = 100, acid = 100)
+	strip_delay = 120
+	resistance_flags = FIRE_PROOF | ACID_PROOF
+	actions_types = list()
+
+/obj/item/clothing/head/helmet/space/hardsuit/ueg/attack_self(mob/user)
+	return
+
+/obj/item/clothing/suit/space/hardsuit/ueg
+	name = "Iron Hawk Marine Armour"
+	desc = "Modified MK.II SWAT Armour. Used by Iron Hawk Marines in ship to ship action. This model appears to have lost some of its armour plating during the crash."
+	icon_state = "uegarmor"
+	item_state = "uegarmor"
+	allowed = list(/obj/item/weapon/gun,/obj/item/ammo_box,/obj/item/ammo_casing,/obj/item/weapon/melee/baton,/obj/item/weapon/restraints/handcuffs,/obj/item/weapon/tank/internals,/obj/item/weapon/kitchen/knife/combat)
+	armor = list(melee = 50, bullet = 20, laser = 20, energy = 20, bomb = 50, bio = 90, rad = 100, fire = 100, acid = 100)
+	strip_delay = 130
+	resistance_flags = FIRE_PROOF | ACID_PROOF
+	helmettype = /obj/item/clothing/head/helmet/space/hardsuit/ueg
 
 	//NASA Voidsuit
 /obj/item/clothing/head/helmet/space/nasavoid

code/modules/projectiles/ammunition/ammo_casings.dm

@@ -76,6 +76,11 @@
 	caliber = "4.6x30mm"
 	projectile_type = /obj/item/projectile/bullet/incendiary/firebullet
 
+/obj/item/ammo_casing/c46carbine
+	desc = "A 4.6x30mm bullet casing."
+	caliber = "4.6x30mm"
+	projectile_type = /obj/item/projectile/bullet/carbinebullet
+
 /obj/item/ammo_casing/c45
 	desc = "A .45 bullet casing."
 	caliber = ".45"

code/modules/projectiles/boxes_magazines/external_mag.dm

@@ -186,6 +186,14 @@
 	max_ammo = 30
 	multiple_sprites = 2
 
+/obj/item/ammo_box/magazine/carbine
+	name = "carbine magazine (4.6x30mm)"
+	icon_state = "oldrifle"
+	origin_tech = "combat=5"
+	ammo_type = /obj/item/ammo_casing/c46carbine
+	caliber = "4.6x30mm"
+	max_ammo = 32
+
 /obj/item/ammo_box/magazine/m12g
 	name = "shotgun magazine (12g taser slugs)"
 	desc = "A drum magazine."

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

@@ -234,7 +234,16 @@
 	burst_size = 3
 	fire_delay = 1
 
-
+/obj/item/weapon/gun/ballistic/automatic/carbine
+	name = "\improper Marine Carbine"
+	desc = "Standard issue weapon used by Iron Hawk Marines in space to space combat. Due to modifications for space combat, the weapon has a very limited firing range."
+	icon_state = "oldrifle"
+	item_state = "arg"
+	mag_type = /obj/item/ammo_box/magazine/carbine
+	fire_sound = 'sound/weapons/Gunshot_smg.ogg'
+	can_suppress = 0
+	burst_size = 0
+	fire_delay = 2
 
 // Bulldog shotgun //
 

code/modules/projectiles/projectile/bullets.dm

@@ -20,6 +20,10 @@
 /obj/item/projectile/bullet/weakbullet3
 	damage = 20
 
+/obj/item/projectile/bullet/carbinebullet
+	damage = 20
+	range = 5
+
 /obj/item/projectile/bullet/toxinbullet
 	damage = 15
 	damage_type = TOX