diff --git a/_maps/shuttles/independent/horizon_apis.dmm b/_maps/shuttles/independent/horizon_apis.dmm index 2fb51193d2..5c9935bb11 100644 --- a/_maps/shuttles/independent/horizon_apis.dmm +++ b/_maps/shuttles/independent/horizon_apis.dmm @@ -4874,20 +4874,12 @@ /obj/effect/turf_decal/box, /obj/machinery/light/small/directional/north, /obj/effect/decal/cleanable/dirt, -/obj/item/ammo_box/magazine/gauss, -/obj/item/ammo_box/magazine/gauss, -/obj/item/ammo_box/magazine/gauss, -/obj/item/ammo_box/magazine/gauss, -/obj/item/gun/ballistic/automatic/powered/gauss{ - name = "horizon prototype gauss rifle"; - manufacturer = "Horizon RnD team Delta "; - desc = "An experimental rifle with a high capacity. Useful for putting down crowds. Chambered in ferromagnetic pellets." - }, -/obj/item/gun/ballistic/automatic/powered/gauss{ - name = "horizon prototype gauss rifle"; - manufacturer = "Horizon RnD team Delta "; - desc = "An experimental rifle with a high capacity. Useful for putting down crowds. Chambered in ferromagnetic pellets." - }, +/obj/item/gun/ballistic/automatic/powered/gauss/horizon, +/obj/item/gun/ballistic/automatic/powered/gauss/horizon, +/obj/item/ammo_box/magazine/gauss/horizon, +/obj/item/ammo_box/magazine/gauss/horizon, +/obj/item/ammo_box/magazine/gauss/horizon, +/obj/item/ammo_box/magazine/gauss/horizon, /turf/open/floor/plasteel/dark, /area/ship/security) "QR" = ( diff --git a/icons/obj/guns/manufacturer/nanotrasen_sharplite/48x32.dmi b/icons/obj/guns/manufacturer/nanotrasen_sharplite/48x32.dmi index 66d714e245..f41708a20e 100644 Binary files a/icons/obj/guns/manufacturer/nanotrasen_sharplite/48x32.dmi and b/icons/obj/guns/manufacturer/nanotrasen_sharplite/48x32.dmi differ diff --git a/icons/obj/guns/projectile.dmi b/icons/obj/guns/projectile.dmi index 9068f30164..d9b5e659a5 100644 Binary files a/icons/obj/guns/projectile.dmi and b/icons/obj/guns/projectile.dmi differ diff --git a/modular_pentest/modules/faction_horizon/code/horizon_gauss.dm b/modular_pentest/modules/faction_horizon/code/horizon_gauss.dm new file mode 100644 index 0000000000..eb0347dd45 --- /dev/null +++ b/modular_pentest/modules/faction_horizon/code/horizon_gauss.dm @@ -0,0 +1,35 @@ +/obj/item/gun/ballistic/automatic/powered/gauss/horizon + name = "Horizon 'Bardiche' gauss rifle" + desc = "A magnetic rifle produced by Horizons RnD team Delta, adapted from Nanotrasen Blueprints." + icon = 'modular_pentest/modules/faction_horizon/icons/horizon_gauss.dmi' + icon_state = "gauss_horizon" + item_state = "arg" + slot_flags = 0 + mag_type = /obj/item/ammo_box/magazine/gauss/horizon + fire_sound = 'sound/weapons/gun/gauss/magrifle.ogg' + load_sound = 'sound/weapons/gun/gauss/rifle_reload.ogg' + burst_size = 1 + fire_delay = 0.3 SECONDS + spread = 0 + show_magazine_on_sprite = TRUE + empty_indicator = TRUE + weapon_weight = WEAPON_MEDIUM + w_class = WEIGHT_CLASS_BULKY + charge_sections = 4 + ammo_x_offset = 2 + manufacturer = MANUFACTURER_NONE + + spread = 0 + spread_unwielded = 25 + recoil = 0 + recoil_unwielded = 4 + wield_slowdown = 0.75 + wield_delay = 1 SECONDS + fire_select_icon_state_prefix = "lance_" + +/obj/item/ammo_box/magazine/gauss/horizon + name = "gauss magazine (ferromagnetic lances)" + desc = "A 20-round magazine for the horizon gauss rifle. Ferromagnetic lances do good damage with significant armor penetration." + ammo_type = /obj/item/ammo_casing/caseless/gauss/lance + caliber = "lance" + max_ammo = 20 diff --git a/modular_pentest/modules/faction_horizon/icons/horizon_gauss.dmi b/modular_pentest/modules/faction_horizon/icons/horizon_gauss.dmi new file mode 100644 index 0000000000..e1019f929d Binary files /dev/null and b/modular_pentest/modules/faction_horizon/icons/horizon_gauss.dmi differ diff --git a/shiptest.dme b/shiptest.dme index 4bd22dcead..066f96bfa0 100644 --- a/shiptest.dme +++ b/shiptest.dme @@ -3608,6 +3608,7 @@ #include "modular_pentest\_maps\ruins_wasteplanet\_areas_wasteplanet.dm" #include "modular_pentest\_maps\ruins_wasteplanet\_modular_wasteplanet.dm" #include "modular_pentest\_maps\ships\_areas_ships.dm" +#include "modular_pentest\modules\faction_horizon\code\horizon_gauss.dm" #include "modular_pentest\modules\hair_styles\code\hair.dm" #include "modular_pentest\modules\pi_items\code\clothing.dm" #include "modular_pentest\modules\pi_items\code\flooring_decals.dm"