map: old nasa void v2.1

_maps/map_files/RandomRuins/SpaceRuins/old_station_ss1984.dmm

@@ -4697,15 +4697,11 @@
 	color = "red";
 	dir = 4
 	},
-/obj/item/gun/projectile/shotgun{
-	name = "Remington 871M"
-	},
 /obj/structure/closet/secure_closet/guncabinet{
 	req_access = list(271)
 	},
-/obj/item/gun/projectile/shotgun{
-	name = "Remington 871M"
-	},
+/obj/item/gun/projectile/shotgun/old,
+/obj/item/gun/projectile/shotgun/old,
 /turf/simulated/floor/plasteel,
 /area/ruin/space/ancientstation/charlie_armory)
 "qo" = (
@@ -6864,13 +6860,10 @@
 /obj/item/ammo_box/magazine/enforcer,
 /obj/item/ammo_box/magazine/enforcer,
 /obj/item/circuitboard/holopad,
-/obj/item/gun/projectile/automatic/pistol/enforcer{
-	name = "Glock 25";
-	desc = "Rare weapon, engraving reads: Command with style! To the best captain of NRS ABOTC."
-	},
 /obj/structure/window/reinforced,
 /obj/item/clothing/suit/space/nasavoid/captain,
 /obj/item/clothing/head/helmet/space/nasavoid/captain,
+/obj/item/gun/projectile/automatic/pistol/enforcer/old,
 /turf/simulated/floor/plasteel,
 /area/ruin/space/ancientstation/charlie_comm)
 "xJ" = (

code/game/objects/items/weapons/tanks/jetpack.dm

@@ -182,13 +182,6 @@
 	icon_state = "jetpack-void"
 	item_state =  "jetpack-void"
 
-/obj/item/tank/jetpack/void/grey
-	name = "Void Jetpack (Oxygen)"
-	icon_state = "jetpack-void-grey"
-
-/obj/item/tank/jetpack/void/gold
-	name = "Retro Jetpack (Oxygen)"
-	icon_state = "jetpack-void-gold"
 
 /obj/item/tank/jetpack/oxygen
 	name = "Jetpack (Oxygen)"
@@ -328,5 +321,3 @@
 		configure_jetpack(skip_trails = FALSE)
 
 	return ..()
-
-

code/modules/awaymissions/mission_code/ruins/oldstation.dm

@@ -50,35 +50,61 @@
 	access = list(ACCESS_ROBOTICS)
 
 /obj/item/storage/backpack/old
-	max_combined_w_class = 12
+	name = "Belt and shoulder system"
+	desc = "The belt-and-shoulder system developed for astronauts originally served as a safety harness to be worn on top of the spacesuit."
+	icon_state = "oldnasa"
+	item_state = "oldnasa"
+	icon = 'icons/mob/clothing/back.dmi'
+	lefthand_file = 'icons/mob/inhands/clothing_lefthand.dmi'
+	righthand_file = 'icons/mob/inhands/clothing_righthand.dmi'
+	storage_slots = 25
+	slot_flags = list(ITEM_SLOT_BELT, ITEM_SLOT_BACK)
+	max_combined_w_class = 25
+	display_contents_with_number = TRUE
+	max_w_class = WEIGHT_CLASS_SMALL
 
 // Equipment
-/obj/item/clothing/head/helmet/space/nasavoid/old
-	name = "Engineering Void Helmet"
-	desc = "A CentCom engineering dark red space suit helmet. While old and dusty, it still gets the job done."
-	icon_state = "void-red"
-	item_state = "void"
-
-/obj/item/clothing/suit/space/nasavoid/old
-	name = "Engineering Voidsuit"
-	icon_state = "void-red"
-	item_state = "void"
-	desc = "A CentCom engineering dark red space suit. Age has degraded the suit making is difficult to move around in."
-	slowdown = 4
-	allowed = list(/obj/item/flashlight, /obj/item/tank/internals, /obj/item/multitool)
 
 /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."
+	name = "BM1 helmet"
+	desc = "Steel helmet, the cheap plastic visor is clouded and yellowed, unfortunately it's welded on."
 	tint = 2
 
 /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."
+	name = "BM1 armor vest"
+	desc = "It's body armor, its straps have worn out and now it keeps sliding off. You can't feel the shock absorber behind the plate, what is it? A book?"
 	icon_state = "armor"
 	item_state = "armor"
 	slowdown = 1
 
+/obj/item/gun/projectile/automatic/pistol/enforcer/old
+	name = "Glock 25"
+	desc = "A rare example of a 21st century pistol, a luxury item. The pistol is designed for 9 mm cartridge and is stamped ABOTCH CR 412."
+	icon_state = "enforcer_grey"
+	force = 10
+	mag_type = /obj/item/ammo_box/magazine/enforcer
+	fire_sound = 'sound/weapons/gunshots/1colt.ogg'
+	can_suppress = TRUE
+	unique_reskin = TRUE
+	can_flashlight = TRUE
+	gun_light_overlay = "enforcer-light"
+
+/obj/item/gun/projectile/shotgun/old
+	name = "Remington 871M"
+	desc = "Traditional shotgun with wooden hardware and a four-round magazine at the bottom. It is stamped ABOTCH-2231"
+	icon_state = "shotgun"
+	item_state = "shotgun"
+	w_class = WEIGHT_CLASS_BULKY
+	force = 10
+	flags = CONDUCT
+	can_holster = FALSE
+	slot_flags = ITEM_SLOT_BACK
+	origin_tech = "combat=4;materials=2"
+	mag_type = /obj/item/ammo_box/magazine/internal/shot
+	fire_sound = 'sound/weapons/gunshots/1shotgun_old.ogg'
+	weapon_weight = WEAPON_HEAVY
+	pb_knockback = 2
+
 /obj/item/gun/energy/laser/retro/old
 	name ="laser gun"
 	icon_state = "retro"
@@ -102,10 +128,11 @@
 	e_cost = 1000
 
 // Papers
+
 /obj/item/paper/fluff/ruins/oldstation
 	name = "Cryo Awakening Alert"
 	language = LANGUAGE_SOL_COMMON
-	info = "<b>**WARNING**</b><br><br>Catastrophic damage sustained to station. Powernet exhausted to reawaken crew.<br><br>Immediate Objectives<br><br>1: Activate emergency power generator<br>2: Lift station lockdown on the bridge<br><br>Please locate the 'Damage Report' on the bridge for a detailed situation report."
+	info = "<B>**WARNING**</B><BR><BR>Catastrophic damage sustained to station. Powernet exhausted to reawaken crew.<BR><BR>Immediate Objectives<br><br>1: Activate emergency power generator<br>2: Lift station lockdown on the bridge<br><br>Please locate the 'Damage Report' on the bridge for a detailed situation report."
 
 /obj/item/paper/fluff/ruins/oldstation/damagereport
 	name = "Damage Report"