Skip to content

Commit

Permalink
Add Clip Turrets (#3660)
Browse files Browse the repository at this point in the history
<!-- Write **BELOW** The Headers and **ABOVE** The comments else it may
not be viewable. -->
<!-- You can view Contributing.MD for a detailed description of the pull
request process. -->

## About The Pull Request
Adds CLIP Turrets

High Damage Low Range. The Eoehoma of turrets.

Maps them into the Atlas


## Changelog

:cl:
add: Clover Photonics' contract for manufacturing turrets has finally
caught up to the CLIP MIC. Expect to see them on the Atlas.
/:cl:

<!-- Both :cl:'s are required for the changelog to work! You can put
your name to the right of the first :cl: if you want to overwrite your
GitHub username as author ingame. -->
<!-- You can use multiple of the same prefix (they're only used for the
icon ingame) and delete the unneeded ones. Despite some of the tags,
changelogs should generally represent how a player might be affected by
the changes rather than a summary of the PR's contents. -->
  • Loading branch information
Erikafox authored Nov 3, 2024
1 parent 8737a4c commit da321f2
Show file tree
Hide file tree
Showing 3 changed files with 85 additions and 20 deletions.
51 changes: 35 additions & 16 deletions _maps/shuttles/minutemen/minutemen_atlas.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -990,10 +990,6 @@
},
/turf/open/floor/plasteel/dark,
/area/ship/bridge)
"lA" = (
/obj/machinery/porta_turret/ship/ballistic/clip,
/turf/closed/wall/mineral/plastitanium/nodiagonal,
/area/ship/cargo)
"lJ" = (
/obj/machinery/power/apc/auto_name/directional/north,
/obj/structure/cable{
Expand Down Expand Up @@ -1074,14 +1070,17 @@
/turf/open/floor/carpet/nanoweave/blue,
/area/ship/crew/crewtwo)
"ms" = (
/obj/machinery/porta_turret/ship/ballistic/clip,
/obj/docking_port/mobile{
dir = 2;
launch_status = 0;
port_direction = 8;
preferred_direction = 4;
name = "atlas dock"
},
/obj/machinery/porta_turret/ship/clip{
id = "atlas";
dir = 9
},
/turf/closed/wall/mineral/plastitanium/nodiagonal,
/area/ship/engineering)
"mw" = (
Expand Down Expand Up @@ -2096,7 +2095,10 @@
/turf/open/floor/plasteel/grimy,
/area/ship/crew/canteen)
"vS" = (
/obj/machinery/porta_turret/ship/ballistic/clip,
/obj/machinery/porta_turret/ship/clip{
id = "atlas";
dir = 10
},
/turf/closed/wall/mineral/plastitanium/nodiagonal,
/area/ship/engineering)
"vT" = (
Expand Down Expand Up @@ -2224,6 +2226,11 @@
dir = 4
},
/obj/machinery/airalarm/directional/north,
/obj/machinery/turretid/ship{
pixel_x = -28;
pixel_y = -3;
id = "atlas"
},
/turf/open/floor/plasteel/dark,
/area/ship/bridge)
"wy" = (
Expand Down Expand Up @@ -2969,6 +2976,13 @@
},
/turf/open/floor/plasteel/dark,
/area/ship/hallway/central)
"EO" = (
/obj/machinery/porta_turret/ship/clip{
id = "atlas";
dir = 5
},
/turf/closed/wall/mineral/plastitanium/nodiagonal,
/area/ship/security)
"EP" = (
/obj/effect/turf_decal/spline/fancy/opaque/black,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
Expand Down Expand Up @@ -3123,7 +3137,10 @@
/turf/open/floor/carpet/blue,
/area/ship/crew/crewthree)
"GU" = (
/obj/machinery/porta_turret/ship/ballistic/clip,
/obj/machinery/porta_turret/ship/clip{
id = "atlas";
dir = 6
},
/turf/closed/wall/mineral/plastitanium/nodiagonal,
/area/ship/crew/crewtwo)
"Hf" = (
Expand Down Expand Up @@ -3171,10 +3188,6 @@
"HX" = (
/turf/closed/wall/mineral/plastitanium/nodiagonal,
/area/ship/hallway/central)
"Ic" = (
/obj/machinery/turretid,
/turf/closed/wall/mineral/plastitanium/nodiagonal,
/area/ship/bridge)
"Ig" = (
/obj/effect/turf_decal/siding/thinplating/dark{
dir = 1
Expand Down Expand Up @@ -4102,7 +4115,10 @@
/turf/open/floor/plating,
/area/ship/hallway/central)
"RT" = (
/obj/machinery/porta_turret/ship/ballistic/clip,
/obj/machinery/porta_turret/ship/clip{
id = "atlas";
dir = 6
},
/turf/closed/wall/mineral/plastitanium/nodiagonal,
/area/ship/crew)
"RU" = (
Expand Down Expand Up @@ -4824,7 +4840,10 @@
/turf/open/floor/plasteel/dark,
/area/ship/security)
"XZ" = (
/obj/machinery/porta_turret/ship/ballistic/clip,
/obj/machinery/porta_turret/ship/clip{
id = "atlas";
dir = 5
},
/turf/closed/wall/mineral/plastitanium/nodiagonal,
/area/ship/crew/crewthree)
"Ya" = (
Expand Down Expand Up @@ -5443,7 +5462,7 @@ ps
ps
ps
ps
gT
EO
gT
gT
Zd
Expand Down Expand Up @@ -5495,7 +5514,7 @@ ps
ps
ps
ps
lA
TE
TE
TE
TE
Expand Down Expand Up @@ -5873,7 +5892,7 @@ LH
uG
ry
LM
Ic
LM
Mq
qn
Qw
Expand Down
51 changes: 47 additions & 4 deletions code/game/machinery/porta_turret/portable_turret.dm
Original file line number Diff line number Diff line change
Expand Up @@ -844,10 +844,6 @@ DEFINE_BITFIELD(turret_flags, list(
stun_projectile_sound = 'sound/weapons/gun/smg/shot.ogg'
desc = "A ballistic machine gun auto-turret."

/* Colonial League turrets */
/obj/machinery/porta_turret/ship/ballistic/clip
faction = list(FACTION_PLAYER_MINUTEMAN, "turret")

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

Expand Down Expand Up @@ -1017,6 +1013,53 @@ DEFINE_BITFIELD(turret_flags, list(
lethal_projectile = /obj/projectile/beam/hitscan/kalix/pgf/sniper //fwoom
lethal_projectile_sound = 'sound/weapons/gun/laser/heavy_laser.ogg'

///CLIP Turrets

//high damage low range

/obj/machinery/porta_turret/ship/clip
name = "Clover Mintaka"
desc = "Clover Photonic's offering for the Confederated League's 476FS \"Defense System\" competition, the Mintaka (and its sister systems, the Alnitak and Ori) handily beat out the Lunatex \"Vigil\" line during the final round of testing, and earned a prestigous contract."
faction = list(FACTION_PLAYER_MINUTEMAN, "Turret")
stun_projectile = /obj/projectile/beam/disabler
stun_projectile_sound = 'sound/weapons/gun/laser/e-fire.ogg'
lethal_projectile = /obj/projectile/beam/laser/assault
lethal_projectile_sound = 'sound/weapons/gun/laser/e-fire.ogg'
icon_state = "standard_lethal"
base_icon_state = "standard"

scan_range = 8
shot_delay = 10
max_integrity = 200
integrity_failure = 0.3

/obj/machinery/porta_turret/ship/clip/light
name = "Clover Alnitak"
desc = "Clover Photonic's light turret system, unveiled as part of Clover's defense line-up in the early 470s. While lacking the punch of its sister systems, it still presents a hassle to circumvent."
stun_projectile = /obj/projectile/beam/disabler
stun_projectile_sound = 'sound/weapons/gun/laser/e-fire.ogg'
lethal_projectile = /obj/projectile/beam/laser/light
lethal_projectile_sound = 'sound/weapons/gun/laser/e-fire.ogg'

scan_range = 6
shot_delay = 10
max_integrity = 200
integrity_failure = 0.4

/obj/machinery/porta_turret/ship/clip/heavy
name = "Clover Ori"
desc = "Clover Photonic's heaviest entry in the Confederated League's 476FS \"Defense System\" competition, the Ori's results demolished the handily beat out the Lunatex \"Vigil Sword\" during testing, earning better marks on durability, effectiveness, and reaction rate."
stun_projectile = /obj/projectile/beam/disabler
stun_projectile_sound = 'sound/weapons/gun/laser/e-fire.ogg'
lethal_projectile = /obj/projectile/beam/laser/heavylaser/assault
lethal_projectile_sound = 'sound/weapons/gun/laser/e40_las.ogg'

scan_range = 10
shot_delay = 20
max_integrity = 300
integrity_failure = 0.3


/// Frontiersmen Turrets

// fast and spitty
Expand Down
3 changes: 3 additions & 0 deletions code/modules/projectiles/projectile/beams.dm
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,9 @@
muzzle_type = /obj/effect/projectile/muzzle/heavy_laser
impact_type = /obj/effect/projectile/impact/heavy_laser

/obj/projectile/beam/laser/heavylaser/assault
armour_penetration = 20

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

Expand Down

0 comments on commit da321f2

Please sign in to comment.