New sand ruin - the E-11 Manufacturing Plant.

code/datums/ruins/whitesands.dm

@@ -41,3 +41,9 @@
 	allow_duplicates = FALSE
 	ruin_tags = list(RUIN_TAG_MEDIUM_COMBAT, RUIN_TAG_MEDIUM_LOOT, RUIN_TAG_INHOSPITABLE, RUIN_TAG_HAZARDOUS)
 
+/datum/map_template/ruin/whitesands/e11_manufactory
+	name = "E-11 Manufacturing Plant"
+	id = "ws-e11manufactory"
+	description = "An old Eoehoma Firearms manufacturing plant dedicated to assembly of the beloved-by-many E-11 rifle."
+	suffix = "whitesands_surface_e11_manufactory.dmm"
+	ruin_tags = list(RUIN_TAG_MEDIUM_COMBAT, RUIN_TAG_MEDIUM_LOOT, RUIN_TAG_HAZARDOUS)

code/game/area/areas/ruins/sandplanet.dm

@@ -20,6 +20,31 @@
 	name = "Pubby-Class Chunk"
 	icon_state = "red"
 
+//e-11 manufactory
+/area/ruin/whitesands/e11manufactory
+	name = "Eoehoma Firearms Assembly Line"
+	icon_state = "mining_production"
+
+/area/ruin/whitesands/e11manufactory/warehouse
+	name = "Eoehoma Firearms Warehouse"
+	icon_state = "storage"
+
+/area/ruin/whitesands/e11manufactory/mats
+	name = "Eoehoma Firearms Material Storage"
+	icon_state = "auxstorage"
+
+/area/ruin/whitesands/e11manufactory/security
+	name = "Eoehoma Firearms Security Office"
+	icon_state = "security"
+
+/area/ruin/whitesands/e11manufactory/barracks
+	name = "Eoehoma Firearms Worker Barracks"
+	icon_state = "crew_quarters"
+
+/area/ruin/whitesands/e11manufactory/office
+	name = "Eoehoma Firearms Management Offices"
+	icon_state = "quartoffice"
+
 //cave base
 /area/ruin/whitesands/cave_base
 	name = "Abandoned Facility"

code/game/objects/items/documents.dm

@@ -54,6 +54,10 @@
 	desc = "\"Top Secret\" documents belonging to the Second Battlegroup of New Gorlex Republic. They are filled with sensitive operational intelligence. These documents are verified with a red wax seal."
 	icon_state = "docs_red"
 
+/obj/item/documents/eoehoma // For use in Eoehoma-related ruins.
+	desc = "\"Top Secret\" Eoehoma Firearms documents. Filled with weapon blueprints and eviction notices."
+	icon_state = "docs_blue"
+
 /obj/item/documents/photocopy
 	desc = "A copy of some top-secret documents. Nobody will notice they aren't the originals... right?"
 	var/forgedseal = 0

code/game/turfs/open/floor/plating/whitesands.dm

@@ -83,6 +83,20 @@
 
 /turf/open/floor/concrete/whitesands
 	initial_gas_mix = WHITESANDS_ATMOS
+	light_range = 2
+	light_power = 0.6
+	light_color = COLOR_VERY_LIGHT_GRAY
+
+/turf/open/floor/concrete/reinforced/whitesands
+	initial_gas_mix = WHITESANDS_ATMOS
+	light_range = 2
+	light_power = 0.6
+	light_color = COLOR_VERY_LIGHT_GRAY
+
+/turf/open/floor/concrete/pavement/whitesands
+	initial_gas_mix = WHITESANDS_ATMOS
+	light_range = 2
+	light_power = 0.6
 	light_color = COLOR_VERY_LIGHT_GRAY
 
 /turf/open/floor/concrete/slab_1/whitesands

code/modules/clothing/head/hardhat.dm

@@ -62,6 +62,10 @@
 	icon_state = "hardhat_orange"
 	dog_fashion = null
 
+/obj/item/clothing/head/hardhat/purple
+	icon_state = "hardhat_purple"
+	dog_fashion = null
+
 /obj/item/clothing/head/hardhat/red
 	name = "firefighter helmet"
 	icon_state = "hardhat_red"

code/modules/mob/living/simple_animal/hostile/human/survivors.dm

@@ -68,6 +68,21 @@
 		/obj/effect/mob_spawn/human/corpse/damaged/whitesands/gunslinger,
 	)
 
+/mob/living/simple_animal/hostile/human/hermit/ranged/e11 // Intended for the e11_manufactory ruin.
+	name = "Hermit Trooper"
+	desc = "Quality weapons are hard to get by in the sandworlds, which forces many survivors to improvise with that they have. This one is hoping that an E-11 of all things will save his life."
+	icon_state = "survivor_e11"
+	icon_living = "survivor_e11"
+	projectilesound = 'sound/weapons/gun/laser/e-fire.ogg'
+	speed = 10
+	faction = list("eoehoma")
+	rapid_fire_delay = 1
+	casingtype = null
+	projectiletype = /obj/projectile/beam/laser/eoehoma/hermit
+	loot = list(
+		/obj/effect/mob_spawn/human/corpse/damaged/whitesands/e11,
+	)
+
 //survivor corpses
 
 /obj/effect/mob_spawn/human/corpse/damaged/whitesands
@@ -278,6 +293,25 @@
 			else
 				visible_message(span_warning("The gunslinger's weapon shatters as they impact the ground!"))
 
+		if("e11")
+			uniform = pick_weight(list(
+				/obj/item/clothing/under/rank/cargo/miner = 65,
+				/obj/item/clothing/under/color/random = 25,
+				/obj/item/clothing/under/rank/cargo/miner/lavaland/old = 10,
+				)
+			)
+			belt = pick_weight(list(
+				/obj/item/storage/belt/utility = 25,
+				/obj/item/storage/belt/mining = 15,
+				/obj/item/storage/belt/fannypack = 15,
+				/obj/item/storage/belt/mining/alt = 5,
+				)
+			)
+			shoes = /obj/item/clothing/shoes/workboots
+			if(prob(50)) // Hilarious, ain't it?
+				new /obj/item/gun/energy/e_gun/e11 (loc)
+			else
+				visible_message(span_warning("The trooper's weapon shatters as they impact the ground!"))
 	. = ..()
 
 
@@ -290,6 +324,9 @@
 /obj/effect/mob_spawn/human/corpse/damaged/whitesands/gunslinger
 	survivor_type = "gunslinger"
 
+/obj/effect/mob_spawn/human/corpse/damaged/whitesands/e11
+	survivor_type = "e11"
+
 //hold overs for any admin who may want to spawn their own survivor realmobs
 
 /datum/outfit/whitesands

code/modules/projectiles/ammunition/energy/laser.dm

@@ -6,6 +6,9 @@
 	projectile_type = /obj/projectile/beam/laser/eoehoma
 	fire_sound = 'sound/weapons/gun/laser/e-fire.ogg'
 
+/obj/projectile/beam/laser/eoehoma/hermit // Used for the Hermits with E-11 because apparently you can only set it on projectile for simple mobs? That's fun!
+	spread = 80
+
 /obj/item/ammo_casing/energy/laser/assault
 	projectile_type = /obj/projectile/beam/laser/assault
 	fire_sound = 'sound/weapons/gun/laser/e40_las.ogg'

code/modules/projectiles/guns/energy/energy_gun.dm

@@ -253,3 +253,6 @@
 	dual_wield_spread = 140
 	shaded_charge = TRUE
 	manufacturer = MANUFACTURER_EOEHOMA
+
+/obj/item/gun/energy/e_gun/e11/empty_cell
+	spawn_no_ammo = TRUE