New Colonial Marines ERT, and lavaland ruin.

code/datums/ert.dm

@@ -127,3 +127,15 @@
 	mission = "Eliminate the kudzu with extreme prejudice"
 	polldesc = "an elite gardening team"
 	code = "Vine Green"
+
+/datum/ert/marine
+
+	opendoors = FALSE
+	leader_role =  /datum/antagonist/ert/marine/squadlead
+	enforce_human = TRUE
+	roles = list(/datum/antagonist/ert/marine, /datum/antagonist/ert/marine/breacher, /datum/antagonist/ert/marine/medic)
+	rename_team = "United States Colonial Marines"
+	code = "Code X"
+	mission = "Investigate the distress signal from SS13."
+	teamsize = 4
+	polldesc = "An elite squad of Marines sent by the USCM."

code/datums/ruins/lavaland.dm

@@ -232,3 +232,11 @@
 	cost = 5
 	always_place = TRUE
 	allow_duplicates = TRUE
+
+/datum/map_template/ruin/lavaland/colonialmarines
+	name = "Alamo Crashsite"
+	id = "alamo"
+	description = "The crashsite of a USCM dropship."
+	suffix = "lavaland_surface_colonial_marines1.dmm"
+	cost = 5
+	allow_duplicates = FALSE

code/game/objects/items/cards_ids.dm

@@ -769,6 +769,22 @@ update_label("John Doe", "Clowny")
 	assignment = "CentCom Attorney"
 	icon_state = "centcom"
 
+/obj/item/card/id/ert/marine
+	registered_name = "Squad Marine"
+	assignment = "Squad Marine"
+
+/obj/item/card/id/ert/marine/leader
+	registered_name = "Squad Leader"
+	assignment = "Squad Leader"
+
+/obj/item/card/id/ert/Security/marine
+	registered_name = "Squad Specialist"
+	assignment = "Squad Specialist"
+
+/obj/item/card/id/ert/Medical/marine
+	registered_name = "Squad Corpsman"
+	assignment = "Squad Corpsman"
+
 /obj/item/card/id/ert/lawyer/Initialize(mapload)
 	. = ..()
 	access = list(ACCESS_CENT_GENERAL, ACCESS_COURT, ACCESS_BRIG, ACCESS_FORENSICS_LOCKERS)

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

@@ -759,3 +759,17 @@
 	new /obj/item/implanter/adrenalin(src)
 	new /obj/item/clothing/mask/luchador/rudos(src)
 
+
+// Marine Bags
+
+/obj/item/storage/backpack/marine
+	name = "lightweight IMP backpack"
+	desc = "The standard-issue pack of the USCM forces. Designed to lug gear into the battlefield."
+	icon_state = "marinepack"
+	item_state = "marinepack"
+
+/obj/item/storage/backpack/marine/medic
+	name = "USCM corpsman backpack"
+	desc = "A standard-issue backpack worn by USCM medics."
+	icon_state = "marinepack_medic"
+	item_state = "marinepack_medic"

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

@@ -671,6 +671,17 @@
 		/obj/item/multitool = 1)
 	generate_items_inside(items_inside,src)
 
+/obj/item/storage/belt/military/assault/marine
+	name = "marines ammo belt"
+	desc = "Enough ammo to kill an entire hive."
+
+/obj/item/storage/belt/military/assault/marine/PopulateContents()
+	var/static/items_inside = list(
+		/obj/item/ammo_box/magazine/m556 = 4,
+		/obj/item/grenade/chem_grenade/incendiary = 2,
+		/obj/item/reagent_containers/hypospray/medipen/survival = 1)
+	generate_items_inside(items_inside,src)
+
 /obj/item/storage/belt/grenade/full/webbing
 	name = "grenadier chest rig"
 	desc = "A set of tactical webbing stocked full of grenades."
@@ -756,6 +767,11 @@
 		/obj/item/ammo_casing/shotgun
 		))
 
+/obj/item/storage/belt/bandolier/filled/PopulateContents()
+	for(var/i in 1 to 18)
+		new /obj/item/ammo_casing/shotgun/buckshot(src)
+
+
 /obj/item/storage/belt/bandolier/western
 	name = "sheriff's bandolier"
 	desc = "A bandolier that has been retrofitted for .38 cartridges"

code/modules/antagonists/ert/ert.dm

@@ -172,6 +172,22 @@
 	role = "HONKER"
 	plasmaman_outfit = /datum/outfit/plasmaman/honk_squad
 
+/datum/antagonist/ert/marine
+	role = "Squad Marine"
+	outfit = /datum/outfit/ert/marine
+
+/datum/antagonist/ert/marine/medic
+	role = "Squad Corpsman"
+	outfit = /datum/outfit/ert/marine/medic
+
+/datum/antagonist/ert/marine/breacher
+	role = "Squad Specialist"
+	outfit = /datum/outfit/ert/marine/breacher
+
+/datum/antagonist/ert/marine/squadlead
+	role = "Squad Leader"
+	outfit = /datum/outfit/ert/marine/squadlead
+
 /datum/antagonist/ert/create_team(datum/team/ert/new_team)
 	if(istype(new_team))
 		ert_team = new_team

code/modules/awaymissions/corpse.dm

@@ -560,3 +560,36 @@ CREATION_TEST_IGNORE_SELF(/obj/effect/mob_spawn)
 	shoes = /obj/item/clothing/shoes/sneakers/black
 	suit = /obj/item/clothing/suit/armor/vest
 	glasses = /obj/item/clothing/glasses/sunglasses/advanced/reagent
+
+
+///////////////// Colonial Marines! /////////////////
+/obj/effect/mob_spawn/human/corpse/marine
+	outfit = /datum/outfit/marine
+
+/obj/effect/mob_spawn/human/corpse/marine/corpsman
+	outfit = /datum/outfit/marine/medic
+
+/obj/effect/mob_spawn/human/corpse/marine/squadlead
+	outfit = /datum/outfit/marine/squadlead
+
+/datum/outfit/marine
+	name = "Dead Marine Generic"
+	head = /obj/item/clothing/head/helmet/marine
+	uniform = /obj/item/clothing/under/misc/marine
+	back = /obj/item/storage/backpack/marine
+	shoes = /obj/item/clothing/shoes/combat/swat
+	suit = /obj/item/clothing/suit/armor/marine
+	gloves = /obj/item/clothing/gloves/color/black
+
+/datum/outfit/marine/medic
+	name = "Dead Marine Corpsman"
+	head = /obj/item/clothing/head/helmet/marine/medicae
+	uniform = /obj/item/clothing/under/misc/marine/medic
+	back = /obj/item/storage/backpack/marine/medic
+	shoes = /obj/item/clothing/shoes/combat/swat
+	suit = /obj/item/clothing/suit/armor/marine
+	gloves = /obj/item/clothing/gloves/color/latex/nitrile
+
+/datum/outfit/marine/squadlead
+	name = "Dead Marine Squad Leader"
+	head = /obj/item/clothing/head/helmet/marine/squadlead

code/modules/clothing/head/helmet.dm

@@ -329,3 +329,34 @@
 	worn_icon_state = "cowboy_outlaw"
 	body_parts_covered = HEAD
 	armor = list(MELEE = 25,  BULLET = 25, LASER = 20, ENERGY = 10, BOMB = 30, BIO = 30, RAD = 20, FIRE = 0, ACID = 40, STAMINA = 25, BLEED = 15)
+
+/obj/item/clothing/head/helmet/marine
+	name = "M10 pattern marine helmet"
+	desc = "A standard M10 Pattern Helmet. The inside label, along with washing information, reads, 'The difference between an open-casket and closed-casket funeral. Wear on head for best results.'. There is a built-in camera on the right side."
+	icon = 'icons/obj/clothing/head/helmet.dmi'
+	icon_state = "marine_helmet"
+	item_state = "marine_helmet"
+	worn_icon = 'icons/mob/clothing/head/helmet.dmi'
+	worn_icon_state = "marine_helmet"
+	body_parts_covered = HEAD
+	flags_cover = HEADCOVERSMOUTH
+	armor = list(MELEE = 30, BULLET = 20, LASER = 0, ENERGY = 10, BOMB = 30, RAD = 0, FIRE = 15, ACID = 45, STAMINA = 0, BLEED = 40)
+
+/obj/item/clothing/head/helmet/marine/squadlead
+	name = "M11 pattern marine helmet"
+	desc = "A variant of the standard M10 pattern. The front plate is reinforced. This one contains a small built-in camera and has cushioning to project your fragile brain."
+	icon = 'icons/obj/clothing/head/helmet.dmi'
+	icon_state = "sl_helmet"
+	item_state = "sl_helmet"
+	worn_icon = 'icons/mob/clothing/head/helmet.dmi'
+	worn_icon_state = "sl_helmet"
+
+/obj/item/clothing/head/helmet/marine/medicae
+	name = "M10 corpsman helmet"
+	desc = "An M10 marine helmet version worn by marine hospital corpsmen. Has red cross painted on its front."
+	icon = 'icons/obj/clothing/head/helmet.dmi'
+	icon_state = "med_helmet"
+	item_state = "med_helmet"
+	worn_icon = 'icons/mob/clothing/head/helmet.dmi'
+	worn_icon_state = "med_helmet"
+	body_parts_covered = HEAD

code/modules/clothing/outfits/ert.dm

@@ -511,3 +511,66 @@
 		/obj/item/gun/ballistic/sniper_rifle=1,\
 		/obj/item/gun/grenadelauncher/security=1,\
 		/obj/item/gun/ballistic/automatic/ar=1)
+
+
+// United States Colonial Marines (oorah)
+
+
+/datum/outfit/ert/marine
+	name = "Marine Generic"
+
+	head = /obj/item/clothing/head/helmet/marine
+	ears = /obj/item/radio/headset/headset_cent/alt
+	uniform = /obj/item/clothing/under/misc/marine
+	back = /obj/item/storage/backpack/marine
+	shoes = /obj/item/clothing/shoes/combat/swat
+	suit = /obj/item/clothing/suit/armor/marine
+	gloves = /obj/item/clothing/gloves/combat
+	belt = /obj/item/storage/belt/military/assault/marine
+	suit_store = /obj/item/gun/ballistic/automatic/ar
+	id = /obj/item/card/id/ert/marine
+	l_pocket = /obj/item/knife/combat
+	backpack_contents = list(/obj/item/storage/box/survival/engineer=1,\
+		/obj/item/ammo_box/magazine/m556=1,\
+		/obj/item/flashlight/seclite)
+	mask = /obj/item/clothing/mask/cigarette/cigar
+
+/datum/outfit/ert/marine/medic
+	name = "Marine Corpsman"
+
+	head = /obj/item/clothing/head/helmet/marine/medicae
+	uniform = /obj/item/clothing/under/misc/marine/medic
+	back = /obj/item/storage/backpack/marine/medic
+	shoes = /obj/item/clothing/shoes/combat/swat
+	suit = /obj/item/clothing/suit/armor/marine
+	gloves = /obj/item/clothing/gloves/color/latex/nitrile
+	belt = /obj/item/storage/belt/medical
+	id = /obj/item/card/id/ert/Medical/marine
+	suit_store = /obj/item/gun/ballistic/automatic/wt550
+	glasses = /obj/item/clothing/glasses/hud/health/sunglasses
+	backpack_contents = list(/obj/item/storage/box/survival/engineer=1,\
+		/obj/item/ammo_box/magazine/wt550m9=3,\
+		/obj/item/flashlight/seclite=1)
+	mask = /obj/item/clothing/mask/surgical
+	l_hand = /obj/item/storage/firstaid/compact
+
+/datum/outfit/ert/marine/breacher
+	name = "Marine Breacher"
+	belt = /obj/item/storage/belt/bandolier/filled
+	suit_store = /obj/item/gun/ballistic/shotgun/automatic/combat/compact
+	id = /obj/item/card/id/ert/Security/marine
+	backpack_contents = list(/obj/item/storage/box/survival/engineer=1,\
+		/obj/item/storage/box/lethalshot=1,\
+		/obj/item/storage/box/breacherslug=1,\
+		/obj/item/flashlight/seclite=1)
+
+/datum/outfit/ert/marine/squadlead
+	name = "Marine Squad Leader"
+	head = /obj/item/clothing/head/helmet/marine/squadlead
+	suit_store = /obj/item/gun/ballistic/rocketlauncher/unrestricted
+	backpack_contents = list(/obj/item/storage/box/survival/engineer=1,\
+		/obj/item/ammo_casing/caseless/rocket/hedp=3,\
+		/obj/item/ammo_casing/caseless/rocket=3,\
+		/obj/item/reagent_containers/hypospray/medipen/survival=1)
+	belt = /obj/item/gun/energy/e_gun
+

code/modules/clothing/suits/armor.dm

@@ -313,3 +313,11 @@
 	. = ..()
 	AddComponent(/datum/component/toggle_icon)
 	allowed = GLOB.security_wintercoat_allowed
+
+/obj/item/clothing/suit/armor/marine
+	name = "\improper M3 pattern marine armor"
+	desc = "A standard Colonial Marines M3 Pattern Chestplate. Protects the chest from ballistic rounds, bladed objects and accidents. It has a small leather pouch strapped to it for limited storage."
+	icon_state = "marine_suit"
+	item_state = "marine_suit"
+	armor = list(MELEE = 25,  BULLET = 30, LASER = 0, ENERGY = 10, BOMB = 10, BIO = 0, RAD = 0, FIRE = 20, ACID = 50, STAMINA = 25, BLEED = 20)
+	slowdown = 0.05

code/modules/clothing/under/miscellaneous.dm

@@ -77,3 +77,16 @@
 	desc = "A cartridge loaded with a compressed extinguisher mix, used to refill the automatic extinguisher on plasma envirosuits."
 	icon_state = "plasmarefill"
 	icon = 'icons/obj/device.dmi'
+
+/obj/item/clothing/under/misc/marine
+	name = "USCM uniform"
+	desc = "Standard-issue Marine uniform. They have shards of light Kevlar to help protect against stabbing weapons and bullets."
+	icon_state = "marine_jumpsuit"
+	item_state = "marine_jumpsuit"
+	armor = list(MELEE = 20, BULLET = 20, LASER = 0, ENERGY = 0, BOMB = 0, BIO = 0, RAD = 0, FIRE = 10, ACID = 10, STAMINA = 20, BLEED = 30)
+
+/obj/item/clothing/under/misc/marine/medic
+	name = "USCM corpsman uniform"
+	desc = "Standard-issue Marine hospital corpsman fatigues. They have shards of light Kevlar to help protect against stabbing weapons and bullets."
+	icon_state = "marine_medic"
+	item_state = "marine_medic"