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

Nanotrasen Turrets #3451

Merged
merged 2 commits into from
Oct 5, 2024
Merged

Nanotrasen Turrets #3451

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c266500
turret_code
Erikafox Sep 27, 2024
c7ed165
map changes
Erikafox Sep 27, 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
18 changes: 9 additions & 9 deletions _maps/shuttles/nanotrasen/nanotrasen_delta.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1371,9 +1371,9 @@
/turf/open/floor/plasteel/tech/techmaint,
/area/ship/engineering)
"jH" = (
/obj/machinery/porta_turret/ship/weak{
dir = 9;
id = "delta_grid"
/obj/machinery/porta_turret/ship/nt/light{
id = "delta_grid";
dir = 9
},
/turf/closed/wall/mineral/titanium,
/area/ship/bridge)
Expand Down Expand Up @@ -2891,9 +2891,9 @@
/turf/open/floor/plasteel/white,
/area/ship/science/robotics)
"WG" = (
/obj/machinery/porta_turret/ship/weak{
dir = 4;
id = "delta_grid"
/obj/machinery/porta_turret/ship/nt/light{
id = "delta_grid";
dir = 4
},
/turf/closed/wall/mineral/titanium,
/area/ship/bridge)
Expand Down Expand Up @@ -3018,9 +3018,9 @@
/turf/open/floor/plasteel/white,
/area/ship/science/robotics)
"YZ" = (
/obj/machinery/porta_turret/ship/weak{
dir = 10;
id = "delta_grid"
/obj/machinery/porta_turret/ship/nt/light{
id = "delta_grid";
dir = 10
},
/turf/closed/wall/mineral/titanium,
/area/ship/bridge)
Expand Down
42 changes: 24 additions & 18 deletions _maps/shuttles/nanotrasen/nanotrasen_meta.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1680,9 +1680,10 @@
/turf/open/floor/plating,
/area/ship/cargo)
"jo" = (
/obj/machinery/porta_turret/ship/weak{
dir = 4;
id = "meta_grid"
/obj/machinery/porta_turret/ship/nt/light{
id = "meta_grid";
pixel_y = 0;
dir = 4
},
/turf/closed/wall/mineral/titanium,
/area/ship/crew)
Expand Down Expand Up @@ -2206,9 +2207,10 @@
/turf/open/floor/plasteel/dark,
/area/ship/cargo)
"uT" = (
/obj/machinery/porta_turret/ship/weak{
dir = 4;
id = "meta_grid"
/obj/machinery/porta_turret/ship/nt/light{
id = "meta_grid";
pixel_y = 0;
dir = 4
},
/turf/closed/wall/mineral/titanium,
/area/ship/crew/canteen/kitchen)
Expand Down Expand Up @@ -2399,9 +2401,10 @@
/turf/open/floor/plasteel,
/area/ship/crew/canteen/kitchen)
"yF" = (
/obj/machinery/porta_turret/ship/weak{
dir = 1;
id = "meta_grid"
/obj/machinery/porta_turret/ship/nt/light{
id = "meta_grid";
pixel_y = 0;
dir = 5
},
/turf/closed/wall/mineral/titanium,
/area/ship/engineering)
Expand Down Expand Up @@ -3079,9 +3082,10 @@
/turf/open/floor/plating,
/area/ship/engineering)
"Lo" = (
/obj/machinery/porta_turret/ship/weak{
dir = 2;
id = "meta_grid"
/obj/machinery/porta_turret/ship/nt/light{
id = "meta_grid";
pixel_y = 0;
dir = 6
},
/turf/closed/wall/mineral/titanium,
/area/ship/engineering)
Expand Down Expand Up @@ -3480,16 +3484,18 @@
/turf/open/floor/plasteel/dark,
/area/ship/cargo)
"TR" = (
/obj/machinery/porta_turret/ship/weak{
dir = 2;
id = "meta_grid"
/obj/machinery/porta_turret/ship/nt/light{
id = "meta_grid";
pixel_y = 0;
dir = 10
},
/turf/closed/wall/mineral/titanium,
/area/ship/crew/canteen)
"TV" = (
/obj/machinery/porta_turret/ship/weak{
dir = 1;
id = "meta_grid"
/obj/machinery/porta_turret/ship/nt/light{
id = "meta_grid";
pixel_y = 0;
dir = 9
},
/turf/closed/wall/mineral/titanium,
/area/ship/crew)
Expand Down
38 changes: 38 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 @@ -842,6 +842,44 @@ DEFINE_BITFIELD(turret_flags, list(
stun_projectile_sound = 'sound/weapons/gun/smg/shot.ogg'
desc = "A ballistic machine gun auto-turret."

//high rof, range, faster projectile speed
/* 'Nanotrasen' turrets */

/obj/machinery/porta_turret/ship/nt
name = "Sharplite Defense Turret"
desc = "A cheap and effective turret designed by Sharplite and purchased and installed on most Nanotrasen Vessels."
faction = list(FACTION_PLAYER_NANOTRASEN, "turret")
icon_state = "standard_lethal"
base_icon_state = "standard"
stun_projectile = /obj/projectile/beam/disabler/sharplite
lethal_projectile = /obj/projectile/beam/laser/sharplite
lethal_projectile_sound = 'sound/weapons/gun/laser/nt-fire.ogg'
stun_projectile_sound = 'sound/weapons/taser2.ogg'
shot_delay = 10
scan_range = 10

/obj/machinery/porta_turret/ship/nt/light
name = "Sharplite LDS"
desc = "A cheap and effective 'defensive system' designed by Sharplite for installation on Nanotrasen vessels."
stun_projectile = /obj/projectile/beam/disabler/weak/sharplite
lethal_projectile = /obj/projectile/beam/laser/light/sharplite
lethal_projectile_sound = 'sound/weapons/gun/laser/nt-fire.ogg'
stun_projectile_sound = 'sound/weapons/taser2.ogg'


/obj/machinery/porta_turret/ship/nt/heavy
name = "Sharplite Defense Cannon"
desc = "A heavy laser mounting designed by Sharplite for usage on Nanotrasen vessels."
lethal_projectile = /obj/projectile/beam/laser/heavylaser/sharplite
lethal_projectile_sound = 'sound/weapons/lasercannonfire.ogg'

/obj/machinery/porta_turret/ship/nt/pulse
name = "Sharplite Pulse Cannon"
desc = "A pulse cannon mounting designed by Sharplite. Not sold to any purchasers and exclusively used on Nanotrasen Vessels."
lethal_projectile = /obj/projectile/beam/pulse/sharplite_turret
lethal_projectile_sound = 'sound/weapons/gun/laser/heavy_laser.ogg'



/* Syndicate Turrets */

Expand Down
23 changes: 23 additions & 0 deletions code/modules/projectiles/projectile/beams.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,15 @@
muzzle_type = /obj/effect/projectile/muzzle/laser
impact_type = /obj/effect/projectile/impact/laser

/obj/projectile/beam/laser/sharplite
speed = 0.4

/obj/projectile/beam/laser/light
damage = 15

/obj/projectile/beam/laser/light/sharplite
speed = 0.4

/obj/projectile/beam/laser/eoehoma
damage = 25
armour_penetration = -10
Expand All @@ -54,6 +63,9 @@
muzzle_type = /obj/effect/projectile/muzzle/heavy_laser
impact_type = /obj/effect/projectile/impact/heavy_laser

/obj/projectile/beam/laser/heavylaser/sharplite
speed = 0.4

/obj/projectile/beam/laser/on_hit(atom/target, blocked = FALSE)
. = ..()
if(iscarbon(target))
Expand Down Expand Up @@ -119,9 +131,15 @@
muzzle_type = /obj/effect/projectile/muzzle/disabler
impact_type = /obj/effect/projectile/impact/disabler

/obj/projectile/beam/disabler/sharplite
speed = 0.4

/obj/projectile/beam/disabler/weak
damage = 15

/obj/projectile/beam/disabler/weak/sharplite
speed = 0.4

/obj/projectile/beam/disabler/weak/negative_ap
armour_penetration = -30
range = 9
Expand All @@ -148,6 +166,11 @@
return
targets_turf.IgniteTurf(rand(8,22), "blue")

/obj/projectile/beam/pulse/sharplite_turret
wall_damage_flags = null
wall_damage_override = 0
speed = 0.4

/obj/projectile/beam/pulse/shotgun
damage = 40

Expand Down
Loading