fixes smg & some errors

shiptest-ss13 · Sep 24, 2024 · 94e16e5 · 94e16e5
1 parent c1b706e
commit 94e16e5
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 6 deletions.
diff --git a/_maps/shuttles/nanotrasen/nanotrasen_ranger.dmm b/_maps/shuttles/nanotrasen/nanotrasen_ranger.dmm
@@ -5564,10 +5564,6 @@
 	pixel_x = 2;
 	pixel_y = -2
 	},
-/obj/effect/spawner/lootdrop/lpcombat{
-	pixel_x = -4;
-	pixel_y = 4
-	},
 /obj/effect/spawner/lootdrop/lpretrieval{
 	pixel_x = -10;
 	pixel_y = 10
@@ -6260,7 +6256,6 @@
 /obj/item/ammo_box/magazine/co9mm,
 /obj/item/clothing/suit/armor/nanotrasen/slim,
 /obj/item/clothing/suit/armor/nanotrasen/slim,
-/obj/item/gun/ballistic/automatic/smg/skm_carbine/inteq/proto,
 /obj/item/ammo_box/magazine/smgm9mm,
 /obj/item/ammo_box/magazine/smgm9mm,
 /obj/item/ammo_box/magazine/smgm9mm,
@@ -6276,6 +6271,7 @@
 /obj/effect/turf_decal/siding/thinplating/dark{
 	dir = 5
 	},
+/obj/item/gun/ballistic/automatic/smg/skm_carbine/inteq/proto,
 /turf/open/floor/plasteel/lightgrey,
 /area/ship/storage/equip)
 "ZW" = (

diff --git a/code/game/MapData/shuttles/nanotrasen_ranger.dm b/code/game/MapData/shuttles/nanotrasen_ranger.dm
@@ -301,7 +301,6 @@
 	lootdoubles = FALSE
 
 	loot = list(
-		/obj/item/disk/holodisk/lp/aid/recruits = 1,
 		/obj/item/disk/holodisk/lp/aid/repairs = 1,
 		/obj/item/disk/holodisk/lp/aid/rescue = 1,
 		/obj/item/disk/holodisk/lp/aid/guard = 1,

diff --git a/code/modules/projectiles/guns/ballistic/smg.dm b/code/modules/projectiles/guns/ballistic/smg.dm
@@ -192,6 +192,7 @@
 	name = "\improper Nanotrasen Saber SMG"
 	desc = "A prototype full-auto 9mm submachine gun, designated 'SABR'. Has a threaded barrel for suppressors and a folding stock."
 	icon = 'icons/obj/guns/projectile.dmi'
+	default_attachments = list(/obj/item/attachment/foldable_stock)
 	icon_state = "saber"
 	item_state = "gun"
 	mag_type = /obj/item/ammo_box/magazine/smgm9mm