From 08b18a57b48b85ff41b0da5b5fac28b90bdbf787 Mon Sep 17 00:00:00 2001 From: Erika Fox <94164348+Bjarl@users.noreply.github.com> Date: Sun, 13 Oct 2024 21:17:32 -0400 Subject: [PATCH 1/4] ngr turrets --- .../machinery/porta_turret/portable_turret.dm | 33 +++++++++++++++++++ .../projectiles/projectile/bullets/rifle.dm | 5 +++ .../projectiles/projectile/bullets/smg.dm | 5 +++ 3 files changed, 43 insertions(+) diff --git a/code/game/machinery/porta_turret/portable_turret.dm b/code/game/machinery/porta_turret/portable_turret.dm index c3c39c72e34a..b2a44fa680ff 100644 --- a/code/game/machinery/porta_turret/portable_turret.dm +++ b/code/game/machinery/porta_turret/portable_turret.dm @@ -908,6 +908,39 @@ DEFINE_BITFIELD(turret_flags, list( lethal_projectile_sound = 'sound/weapons/lasercannonfire.ogg' max_integrity = 300 +/* New Gorlex Republic Turrets */ +// Midline ballistic turrets + +/obj/machinery/porta_turret/ship/ngr + name = "Oasis Turret" + desc = "A turret manufactured by the New Gorlex Republic for its ships and installations. Proudly manufactured within the nation!" + stun_projectile = /obj/projectile/bullet/c45/rubber + stun_projectile_sound = 'sound/weapons/gun/rifle/skm.ogg' + lethal_projectile = /obj/projectile/bullet/c45 + lethal_projectile_sound = 'sound/weapons/gun/rifle/skm.ogg' + faction = list(FACTION_NGR, "turret") + +/obj/machinery/porta_turret/ship/ngr/light + name = "Sonoran Turret" + desc = "A light turret manufactured by the New Gorlex Republic for its ships and installations. Proudly manufactured within the Nation, using locally produced munitions!" + stun_projectile = /obj/projectile/bullet/c57x39mm/rubber + stun_projectile_sound = 'sound/weapons/gun/smg/sidewinder.ogg' + lethal_projectile = /obj/projectile/bullet/c57x39mm + lethal_projectile_sound = 'sound/weapons/gun/smg/sidewinder.ogg' + scan_range = 7 + shot_delay = 10 + +/obj/machinery/porta_turret/ship/ngr/heavy + name = "Cliff Turret" + desc = "A heavy turret manufactured by the New Gorlex Republic for its ships and installations. Has a reputation of being extremely dangerous." + stun_projectile = /obj/projectile/bullet/a65clip/rubber + stun_projectile_sound = 'sound/weapons/gun/rifle/f4.ogg' + lethal_projectile = /obj/projectile/bullet/a65clip + lethal_projectile_sound = 'sound/weapons/gun/rifle/f4.ogg' + scan_range = 14 + shot_delay = 30 + + /* Inteq Turrets */ //slower rof, higher damage + range diff --git a/code/modules/projectiles/projectile/bullets/rifle.dm b/code/modules/projectiles/projectile/bullets/rifle.dm index 1d5d48c9b826..7955c2b41557 100644 --- a/code/modules/projectiles/projectile/bullets/rifle.dm +++ b/code/modules/projectiles/projectile/bullets/rifle.dm @@ -100,3 +100,8 @@ light_system = MOVABLE_LIGHT light_color = COLOR_SOFT_RED light_range = 2 + +/obj/projectile/bullet/a65clip/rubber //"rubber" + name = "6.5x57mm CLIP rubber bullet" + damage = 10 + stamina = 40 diff --git a/code/modules/projectiles/projectile/bullets/smg.dm b/code/modules/projectiles/projectile/bullets/smg.dm index 9b11c74e4c1d..5e838b61161c 100644 --- a/code/modules/projectiles/projectile/bullets/smg.dm +++ b/code/modules/projectiles/projectile/bullets/smg.dm @@ -4,6 +4,11 @@ name = "5.7x39mm bullet" damage = 20 +/obj/projectile/bullet/c57x39mm/rubber + name = "5.7x39mm rubber bullet" + damage = 5 + stamina = 20 + // 4.6x30mm (WT-550 Automatic Rifle & NT-SVG) /obj/projectile/bullet/c46x30mm From cbddd8ca96162cda243d991617a44e0ed1db9cb1 Mon Sep 17 00:00:00 2001 From: Erika Fox <94164348+Bjarl@users.noreply.github.com> Date: Sun, 13 Oct 2024 21:19:00 -0400 Subject: [PATCH 2/4] Update portable_turret.dm --- code/game/machinery/porta_turret/portable_turret.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/machinery/porta_turret/portable_turret.dm b/code/game/machinery/porta_turret/portable_turret.dm index b2a44fa680ff..5ead0d366368 100644 --- a/code/game/machinery/porta_turret/portable_turret.dm +++ b/code/game/machinery/porta_turret/portable_turret.dm @@ -918,7 +918,7 @@ DEFINE_BITFIELD(turret_flags, list( stun_projectile_sound = 'sound/weapons/gun/rifle/skm.ogg' lethal_projectile = /obj/projectile/bullet/c45 lethal_projectile_sound = 'sound/weapons/gun/rifle/skm.ogg' - faction = list(FACTION_NGR, "turret") + faction = list(FACTION_NGR, FACTION_PLAYER_SYNDICATE, "turret") //player_syndicate is just to be safe /obj/machinery/porta_turret/ship/ngr/light name = "Sonoran Turret" From 77c7be21b36657414e0156265ffe904e35c29744 Mon Sep 17 00:00:00 2001 From: Erika Fox <94164348+Bjarl@users.noreply.github.com> Date: Sun, 13 Oct 2024 21:20:17 -0400 Subject: [PATCH 3/4] Update portable_turret.dm --- code/game/machinery/porta_turret/portable_turret.dm | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/code/game/machinery/porta_turret/portable_turret.dm b/code/game/machinery/porta_turret/portable_turret.dm index 5ead0d366368..7c5e186acd54 100644 --- a/code/game/machinery/porta_turret/portable_turret.dm +++ b/code/game/machinery/porta_turret/portable_turret.dm @@ -915,10 +915,10 @@ DEFINE_BITFIELD(turret_flags, list( name = "Oasis Turret" desc = "A turret manufactured by the New Gorlex Republic for its ships and installations. Proudly manufactured within the nation!" stun_projectile = /obj/projectile/bullet/c45/rubber - stun_projectile_sound = 'sound/weapons/gun/rifle/skm.ogg' + stun_projectile_sound = 'sound/weapons/gun/smg/cobra.ogg' lethal_projectile = /obj/projectile/bullet/c45 - lethal_projectile_sound = 'sound/weapons/gun/rifle/skm.ogg' - faction = list(FACTION_NGR, FACTION_PLAYER_SYNDICATE, "turret") //player_syndicate is just to be safe + lethal_projectile_sound = 'sound/weapons/gun/smg/cobra.ogg' + faction = list(FACTION_NGR, FACTION_PLAYER_SYND ICATE, "turret") //player_syndicate is just to be safe /obj/machinery/porta_turret/ship/ngr/light name = "Sonoran Turret" @@ -934,9 +934,9 @@ DEFINE_BITFIELD(turret_flags, list( name = "Cliff Turret" desc = "A heavy turret manufactured by the New Gorlex Republic for its ships and installations. Has a reputation of being extremely dangerous." stun_projectile = /obj/projectile/bullet/a65clip/rubber - stun_projectile_sound = 'sound/weapons/gun/rifle/f4.ogg' + stun_projectile_sound = 'sound/weapons/gun/sniper/cmf90.ogg' lethal_projectile = /obj/projectile/bullet/a65clip - lethal_projectile_sound = 'sound/weapons/gun/rifle/f4.ogg' + lethal_projectile_sound = 'sound/weapons/gun/sniper/cmf90.ogg' scan_range = 14 shot_delay = 30 From 5e7ae3dc10ebdf4191776a1f5833c353a4b26e0a Mon Sep 17 00:00:00 2001 From: Erika Fox <94164348+Bjarl@users.noreply.github.com> Date: Sun, 13 Oct 2024 21:25:06 -0400 Subject: [PATCH 4/4] Update portable_turret.dm --- code/game/machinery/porta_turret/portable_turret.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/machinery/porta_turret/portable_turret.dm b/code/game/machinery/porta_turret/portable_turret.dm index 7c5e186acd54..c370b3697e9d 100644 --- a/code/game/machinery/porta_turret/portable_turret.dm +++ b/code/game/machinery/porta_turret/portable_turret.dm @@ -918,7 +918,7 @@ DEFINE_BITFIELD(turret_flags, list( stun_projectile_sound = 'sound/weapons/gun/smg/cobra.ogg' lethal_projectile = /obj/projectile/bullet/c45 lethal_projectile_sound = 'sound/weapons/gun/smg/cobra.ogg' - faction = list(FACTION_NGR, FACTION_PLAYER_SYND ICATE, "turret") //player_syndicate is just to be safe + faction = list(FACTION_NGR, FACTION_PLAYER_SYNDICATE, "turret") //player_syndicate is just to be safe /obj/machinery/porta_turret/ship/ngr/light name = "Sonoran Turret"