Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

NGR Turrets #3555

Merged
merged 4 commits into from
Oct 15, 2024
Merged

NGR Turrets #3555

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
08b18a5
ngr turrets
Erikafox Oct 14, 2024
cbddd8c
Update portable_turret.dm
Erikafox Oct 14, 2024
77c7be2
Update portable_turret.dm
Erikafox Oct 14, 2024
5e7ae3d
Update portable_turret.dm
Erikafox Oct 14, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 33 additions & 0 deletions code/game/machinery/porta_turret/portable_turret.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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/smg/cobra.ogg'
lethal_projectile = /obj/projectile/bullet/c45
lethal_projectile_sound = 'sound/weapons/gun/smg/cobra.ogg'
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"
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/sniper/cmf90.ogg'
lethal_projectile = /obj/projectile/bullet/a65clip
lethal_projectile_sound = 'sound/weapons/gun/sniper/cmf90.ogg'
scan_range = 14
shot_delay = 30


/* Inteq Turrets */
//slower rof, higher damage + range

Expand Down
5 changes: 5 additions & 0 deletions code/modules/projectiles/projectile/bullets/rifle.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
5 changes: 5 additions & 0 deletions code/modules/projectiles/projectile/bullets/smg.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Loading