diff --git a/code/modules/projectiles/ammunition/bullets.dm b/code/modules/projectiles/ammunition/bullets.dm index c6f1aebd2c6..2707864f19a 100644 --- a/code/modules/projectiles/ammunition/bullets.dm +++ b/code/modules/projectiles/ammunition/bullets.dm @@ -295,7 +295,9 @@ max_stack = 2 /obj/item/ammo_casing/gauss/carbine + name = "compact tungsten slug" desc = "A heavy tungsten gauss slug. This one has a casing adapated for carbine models." + projectile_type = /obj/item/projectile/bullet/gauss/carbine /obj/item/ammo_casing/gauss/emp name = "ion slug" diff --git a/code/modules/projectiles/projectile/bullets.dm b/code/modules/projectiles/projectile/bullets.dm index 2aa8dd6de3d..de6eb616f1e 100644 --- a/code/modules/projectiles/projectile/bullets.dm +++ b/code/modules/projectiles/projectile/bullets.dm @@ -352,6 +352,10 @@ muzzle_type = /obj/effect/projectile/muzzle/gauss embed = 0 +/obj/item/projectile/bullet/gauss + name = "compact slug" + damage = 20 + /obj/item/projectile/bullet/gauss/highex name = "high-ex shell" damage = 10 diff --git a/maps/sccv_horizon/placeholder-2_deck_2.dmm b/maps/sccv_horizon/placeholder-2_deck_2.dmm index b130133d96e..9a3bb65ce67 100644 --- a/maps/sccv_horizon/placeholder-2_deck_2.dmm +++ b/maps/sccv_horizon/placeholder-2_deck_2.dmm @@ -673,10 +673,9 @@ /turf/simulated/floor/grass/alt, /area/hydroponics/garden) "ati" = ( -/obj/machinery/atmospherics/portables_connector{ +/obj/machinery/atmospherics/pipe/tank/air{ dir = 8 }, -/obj/machinery/portable_atmospherics/canister/air/airlock, /turf/simulated/floor/plating, /area/engineering/engine_room) "atB" = ( @@ -57660,7 +57659,7 @@ qgN qgN qgN dpj -dpj +lJE lJE oSQ rMw @@ -57861,7 +57860,7 @@ qgN qgN qgN qgN -qgN +dpj dpj lJE rMw