PentestSS13 · Ossa88 · Sep 3, 2025 · Sep 3, 2025 · Sep 3, 2025 · Sep 4, 2025
@@ -38,7 +38,7 @@
 	pixel_x = 8
 	},
 /obj/item/ammo_box/magazine/co9mm,
-/obj/item/gun/ballistic/automatic/pistol/commander,
+/obj/item/gun/ballistic/automatic/pistol/challenger,
 /obj/item/gun_voucher/syndicate,
 /turf/open/floor/mineral/titanium/blue,
 /area/ruin/space/has_grav/syndicircle/escape)

@@ -38,7 +38,7 @@
 	pixel_x = 8
 	},
 /obj/item/ammo_box/magazine/co9mm,
-/obj/item/gun/ballistic/automatic/pistol/commander,
+/obj/item/gun/ballistic/automatic/pistol/challenger,
 /obj/item/gun_voucher/syndicate,
 /turf/open/floor/mineral/titanium/blue,
 /area/ruin/space/has_grav/syndicircle/escape)

@@ -17,6 +17,21 @@
 	description = "A abandoned colony. It seems that this colony was abandoned, for a reason or another"
 	suffix = "beach_colony.dmm"
 
+/datum/map_template/ruin/beachplanet/pentest/crashedengie
+	name = "Crashed Engineer Ship"
+	id = "beach_crashed_engineer"
+	description = "An abandoned camp built by a crashed engineer"
+	suffix = "beach_crashed_engineer.dmm"
+	ruin_tags = list(RUIN_TAG_MINOR_COMBAT, RUIN_TAG_MEDIUM_LOOT, RUIN_TAG_HAZARDOUS)
+	ruin_mission_types = list(/datum/mission/ruin/lost_axe)
+
+/datum/mission/ruin/lost_axe
+	name = "Axe Retrieval"
+	desc = "I recently lost a heirloom axe - produced by a very fine Syebenaltch Guild. I was unable to retrieve it when my vessel crashed, and I was rescued. Please bring it home to me."
+	mission_limit = 1
+	value = 1000
+	setpiece_item = /obj/item/melee/axe/fire
+
 /datum/map_template/ruin/beachplanet/pentest/fishing_hole
 	name = "Fishing Hole"
 	id = "fishing_hole"

@@ -414,9 +414,9 @@
 	pixel_x = 9;
 	pixel_y = -1
 	},
-/obj/item/gun/ballistic/automatic/assault/cm82{
-	pixel_y = 7;
-	pixel_x = -9
+/obj/item/gun/ballistic/automatic/smg/cm5{
+	pixel_x = -5;
+	pixel_y = 5
 	},
 /turf/open/floor/carpet/red,
 /area/ruin/beach/treasure_cove)

@@ -1690,8 +1690,8 @@
 /area/ruin/unpowered/corprejectvault)
 "Md" = (
 /obj/structure/rack,
-/obj/item/ammo_box/magazine/smgm9mm/ap,
-/obj/item/ammo_box/magazine/smgm9mm,
+/obj/item/ammo_box/magazine/m9mm_expedition,
+/obj/item/ammo_box/magazine/m9mm_expedition,
 /obj/machinery/light/small/directional/east,
 /turf/open/floor/vault,
 /area/ruin/unpowered/corprejectvault)

@@ -95,7 +95,7 @@
 	name = "Head Of Security's Locker";
 	req_access_txt = "3"
 	},
-/obj/item/gun/energy/e_gun/hos,
+/obj/item/gun/energy/sharplite/x01,
 /obj/item/clothing/shoes/cowboy/black,
 /obj/item/storage/belt/military,
 /obj/item/clothing/suit/armor/vest/leather,
@@ -2794,7 +2794,7 @@
 /area/ruin/rockplanet/nanotrasen)
 "ZP" = (
 /obj/effect/mob_spawn/human/scientist,
-/obj/item/gun/ballistic/automatic/pistol/commander,
+/obj/item/gun/ballistic/automatic/pistol/challenger,
 /obj/item/ammo_casing/spent,
 /obj/effect/decal/cleanable/blood{
 	icon_state = "splatter1";

@@ -3126,7 +3126,6 @@
 	name = "commanders turtleneck";
 	desc = "A midnight black turtleneck, it makes you want to tent your fingers."
 	},
-/obj/item/gun/energy/e_gun/hos/brazil,
 /turf/open/floor/plasteel/white,
 /area/ship/bridge)
 "AG" = (
@@ -3327,7 +3326,7 @@
 	req_ship_access = 1
 	},
 /obj/effect/turf_decal/box,
-/obj/item/gun/ballistic/automatic/smg/wt550,
+/obj/item/gun/ballistic/automatic/smg/resolution,
 /obj/item/ammo_box/magazine/wt550m9,
 /obj/item/ammo_box/magazine/wt550m9,
 /obj/item/ammo_box/magazine/wt550m9,

@@ -4137,7 +4137,7 @@
 /obj/item/storage/box/ammo/a357,
 /obj/item/ammo_box/a357/match,
 /obj/item/ammo_box/a357/match,
-/obj/item/gun/ballistic/revolver/mateba,
+/obj/item/gun/ballistic/revolver/rhino,
 /turf/open/floor/wood/mahogany,
 /area/ship/crew/crewtwo)
 "zF" = (
@@ -5773,7 +5773,7 @@
 /obj/item/spacecash/bundle/c1000,
 /obj/item/spacecash/bundle/c1000,
 /obj/item/modular_computer/tablet/preset/advanced,
-/obj/item/clothing/suit/armor/gezena/marinecoat{
+/obj/item/clothing/suit/armor/gezena/marine{
 	name = "Modified LBC 6052 with raincoat";
 	desc = "The LBC 6052 is an advanced plate carrier built for rugged military applications. Made from lightweight plasteel, it combines high durability with mobility, designed to withstand the rigors of diverse environments. The carrier features a modular design, allowing for customizable armor configurations to meet specific mission needs. With an emphasis on utilitarian functionality, the LBC 6052 is ergonomically designed for comfort, making it a reliable choice for soldiers seeking robust protection and versatility in the field. This one has been upraded with ESAPI IVa plasteel and repainted OD green."
 	},
@@ -7473,14 +7473,14 @@
 "RZ" = (
 /obj/structure/rack,
 /obj/effect/turf_decal/industrial/outline/yellow,
-/obj/item/gun/energy/e_gun/mini{
+/obj/item/gun/energy/sharplite/x26{
 	pixel_y = 5
 	},
-/obj/item/gun/energy/e_gun/mini,
-/obj/item/gun/energy/e_gun/mini{
+/obj/item/gun/energy/sharplite/x26,
+/obj/item/gun/energy/sharplite/x26{
 	pixel_y = -5
 	},
-/obj/item/gun/energy/e_gun/mini{
+/obj/item/gun/energy/sharplite/x26{
 	pixel_y = -10
 	},
 /turf/open/floor/plasteel/dark,

@@ -475,7 +475,7 @@
 /obj/item/clothing/suit/toggle/lawyer/burgundy,
 /obj/item/clothing/suit/toggle/lawyer/navy,
 /obj/item/clothing/head/hopcap,
-/obj/item/gun/energy/e_gun/mini,
+/obj/item/gun/energy/sharplite/x26,
 /obj/item/clothing/head/HoS/cowboy,
 /obj/item/clothing/suit/jacket/leather/duster/command,
 /obj/structure/closet/secure_closet/wall/directional/west{
@@ -1846,11 +1846,11 @@
 	pixel_y = -3;
 	pixel_x = 5
 	},
-/obj/item/clothing/head/helmet/inteq{
+/obj/item/clothing/head/helmet/m10/inteq{
 	pixel_x = -4;
 	pixel_y = -9
 	},
-/obj/item/clothing/head/helmet/inteq{
+/obj/item/clothing/head/helmet/m10/inteq{
 	pixel_x = -4;
 	pixel_y = -3
 	},
@@ -2674,7 +2674,7 @@
 /obj/item/clothing/head/caphat,
 /obj/item/clothing/gloves/color/captain,
 /obj/item/clothing/gloves/color/black,
-/obj/item/gun/energy/e_gun/mini,
+/obj/item/gun/energy/sharplite/x26,
 /obj/item/radio/headset/heads/captain/alt,
 /obj/item/radio/headset/heads/captain,
 /obj/item/clothing/glasses/hud/security,
@@ -4769,11 +4769,11 @@
 	open = 0;
 	anchored = 1
 	},
-/obj/item/gun/ballistic/automatic/pistol/commander/inteq/no_mag{
+/obj/item/gun/ballistic/automatic/pistol/challenger/inteq/no_mag{
 	pixel_y = 4;
 	pixel_x = -1
 	},
-/obj/item/gun/ballistic/automatic/pistol/commander/inteq/no_mag{
+/obj/item/gun/ballistic/automatic/pistol/challenger/inteq/no_mag{
 	pixel_y = -3;
 	pixel_x = -1
 	},

@@ -1922,7 +1922,7 @@
 	pixel_x = 10
 	},
 /obj/machinery/recharger,
-/obj/item/gun/energy/e_gun/mini{
+/obj/item/gun/energy/sharplite/x26{
 	pixel_x = -6;
 	pixel_y = 6
 	},

@@ -2842,7 +2842,7 @@
 /area/ship/hallway/fore)
 "sL" = (
 /obj/structure/closet/secure_closet/security/sec,
-/obj/item/gun/energy/e_gun/mini,
+/obj/item/gun/energy/sharplite/x26,
 /obj/item/gun/energy/taser,
 /obj/item/clothing/under/rank/security/officer/blueshirt,
 /turf/open/floor/plasteel/dark,
@@ -5492,8 +5492,8 @@
 /area/ship/hallway/aft)
 "LQ" = (
 /obj/structure/closet/crate/secure/weapon,
-/obj/item/gun/ballistic/automatic/smg/wt550,
-/obj/item/gun/ballistic/automatic/smg/wt550,
+/obj/item/gun/ballistic/automatic/smg/resolution,
+/obj/item/gun/ballistic/automatic/smg/resolution,
 /obj/item/ammo_box/magazine/wt550m9,
 /obj/item/ammo_box/magazine/wt550m9,
 /obj/machinery/light/directional/north,
@@ -6114,7 +6114,7 @@
 /area/ship/hallway/aft)
 "QF" = (
 /obj/structure/closet/secure_closet/security/sec,
-/obj/item/gun/energy/e_gun/mini,
+/obj/item/gun/energy/sharplite/x26,
 /obj/item/gun/energy/taser,
 /obj/structure/cable{
 	icon_state = "4-8"

@@ -2767,7 +2767,7 @@
 	pixel_y = -7;
 	pixel_x = -1
 	},
-/obj/item/clothing/head/helmet/bulletproof/m10{
+/obj/item/clothing/head/helmet/m10{
 	pixel_y = 9
 	},
 /obj/item/clothing/suit/armor/vest{

@@ -3901,7 +3901,7 @@
 	req_access_txt = "20"
 	},
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
-/obj/item/gun/ballistic/revolver/mateba,
+/obj/item/gun/ballistic/revolver/rhino,
 /obj/item/ammo_box/a357,
 /obj/item/ammo_box/a357,
 /obj/item/storage/box/ammo/a357,

@@ -1094,9 +1094,9 @@
 /obj/item/clothing/gloves/combat,
 /obj/item/clothing/gloves/combat,
 /obj/item/clothing/gloves/combat,
-/obj/item/clothing/head/helmet/swat/inteq,
-/obj/item/clothing/head/helmet/swat/inteq,
-/obj/item/clothing/head/helmet/swat/inteq,
+/obj/item/clothing/head/helmet/bulletproof/x11/inteq,
+/obj/item/clothing/head/helmet/bulletproof/x11/inteq,
+/obj/item/clothing/head/helmet/bulletproof/x11/inteq,
 /obj/item/storage/belt/security/webbing/inteq,
 /obj/item/storage/belt/security/webbing/inteq,
 /obj/item/storage/belt/security/webbing/inteq,
@@ -1370,11 +1370,11 @@
 /obj/item/ammo_box/magazine/co9mm{
 	pixel_x = -5
 	},
-/obj/item/gun/ballistic/automatic/pistol/commander/inteq{
+/obj/item/gun/ballistic/automatic/pistol/challenger/inteq{
 	pixel_y = 5
 	},
-/obj/item/gun/ballistic/automatic/pistol/commander/inteq,
-/obj/item/gun/ballistic/automatic/pistol/commander/inteq{
+/obj/item/gun/ballistic/automatic/pistol/challenger/inteq,
+/obj/item/gun/ballistic/automatic/pistol/challenger/inteq{
 	pixel_y = -5
 	},
 /obj/item/ammo_box/magazine/skm_762_40{

@@ -122,7 +122,7 @@
 	name = "combat gear crate";
 	desc = "A secure weapons and combat gear crate."
 	},
-/obj/item/clothing/head/helmet/inteq{
+/obj/item/clothing/head/helmet/m10/inteq{
 	pixel_x = -7
 	},
 /obj/item/storage/belt/security/webbing/inteq{
@@ -798,7 +798,7 @@
 	anchored = 1
 	},
 /obj/item/gun/ballistic/automatic/assault/skm/inteq,
-/obj/item/gun/ballistic/automatic/pistol/commander/inteq,
+/obj/item/gun/ballistic/automatic/pistol/challenger/inteq,
 /turf/open/floor/plasteel/patterned/cargo_one,
 /area/ship/cargo)
 "GC" = (

@@ -4315,7 +4315,7 @@
 /obj/item/storage/photo_album/HoP{
 	name = "photo album (XO)"
 	},
-/obj/item/gun/energy/e_gun/mini,
+/obj/item/gun/energy/sharplite/x26,
 /obj/item/pet_carrier,
 /obj/item/clothing/glasses/sunglasses,
 /obj/item/clothing/neck/petcollar,
@@ -4868,7 +4868,7 @@
 /turf/open/floor/wood/walnut,
 /area/ship/crew/canteen)
 "vo" = (
-/obj/item/gun/energy/e_gun/hos,
+/obj/item/gun/energy/sharplite/x01,
 /obj/item/clothing/gloves/krav_maga/sec,
 /obj/item/clothing/glasses/hud/security/sunglasses/eyepatch,
 /obj/item/clothing/glasses/hud/security/sunglasses,
@@ -9631,8 +9631,6 @@
 /obj/structure/window/reinforced{
 	dir = 8
 	},
-/obj/item/clothing/head/helmet/swat/nanotrasen,
-/obj/item/clothing/head/helmet/swat/nanotrasen,
 /obj/item/clothing/head/helmet/riot,
 /obj/item/clothing/head/helmet/riot,
 /obj/item/clothing/suit/armor/vest/security/officer,
@@ -12425,14 +12423,14 @@
 /area/ship/hangar)
 "ZH" = (
 /obj/machinery/light/directional/east,
-/obj/item/gun/ballistic/automatic/pistol/commander{
+/obj/item/gun/ballistic/automatic/pistol/challenger{
 	pixel_x = -2;
 	pixel_y = 3
 	},
-/obj/item/gun/ballistic/automatic/pistol/commander{
+/obj/item/gun/ballistic/automatic/pistol/challenger{
 	pixel_x = -2
 	},
-/obj/item/gun/ballistic/automatic/pistol/commander{
+/obj/item/gun/ballistic/automatic/pistol/challenger{
 	pixel_x = -2;
 	pixel_y = -3
 	},

@@ -1001,7 +1001,7 @@
 /obj/item/ammo_box/magazine/co9mm{
 	pixel_x = -5
 	},
-/obj/item/gun/ballistic/automatic/pistol/commander{
+/obj/item/gun/ballistic/automatic/pistol/challenger{
 	pixel_y = 5
 	},
 /turf/open/floor/plasteel,