Skip to content

Commit

Permalink
Update portable_turret.dm
Browse files Browse the repository at this point in the history
  • Loading branch information
Erikafox committed Oct 10, 2024
1 parent 0d34a9c commit e12ad43
Showing 1 changed file with 18 additions and 16 deletions.
34 changes: 18 additions & 16 deletions code/game/machinery/porta_turret/portable_turret.dm
Original file line number Diff line number Diff line change
Expand Up @@ -826,7 +826,7 @@ DEFINE_BITFIELD(turret_flags, list(
. = ..()
if(in_range(user, src) || isobserver(user))
if(!(machine_stat & BROKEN))
. += "<span class='notice'>[src] reports its integrity is currently [round(obj_integrity / max_integrity) * 100] percent.</span>"
. += "<span class='notice'>[src] reports its integrity is currently [round((obj_integrity / max_integrity) * 100 )] percent.</span>"

Check failure on line 829 in code/game/machinery/porta_turret/portable_turret.dm

View workflow job for this annotation

GitHub Actions / Run Linters

Check Regex

padding inside parentheses added to here, remove or update check_regex.yml

/obj/machinery/porta_turret/ship/weak
max_integrity = 120
Expand Down Expand Up @@ -982,10 +982,12 @@ DEFINE_BITFIELD(turret_flags, list(

// Frontiersmen Turrets
/obj/machinery/porta_turret/ship/frontiersmen
name =
desc =
name = "Spitter Turret"
desc = "A juryrigged mishmash of a 9mm SMG and targetting system. Stand clear!"
faction = list(FACTION_FRONTIER, "Turret")
subsystem_type = /datum/controller/subsystem/processing/fastprocess
integrity_failure = 0.6
max_integrity = 180

icon_state = "standard_lethal"
base_icon_state = "standard"
Expand All @@ -994,27 +996,27 @@ DEFINE_BITFIELD(turret_flags, list(
stun_projectile_sound = 'sound/weapons/gun/smg/spitter.ogg'
lethal_projectile = /obj/projectile/bullet/c9mm
lethal_projectile_sound = 'sound/weapons/gun/smg/spitter.ogg'
shot_delay = 1
shot_delay = 2
scan_range = 6

/obj/machinery/porta_turret/ship/frontiersmen/light
name =
desc =
name = "Pounder Turret"
desc = "A low caliber SMG with an atrociously high cycle rate, frankensteined together with a targetting assembly."
stun_projectile = /obj/projectile/bullet/c22lr
stun_projectile_sound = 'sound/weapons/gun/energy/kalixpistol.ogg'
stun_projectile_sound = 'sound/weapons/gun/smg/pounder.ogg'
lethal_projectile = /obj/projectile/bullet/c22lr
lethal_projectile_sound = 'sound/weapons/gun/smg/pounder.ogg'
shot_delay = 1

/obj/machinery/porta_turret/ship/frontiersmen/heavy
name =
desc =
stun_projectile = /obj/projectile/bullet/c22lr
stun_projectile_sound = 'sound/weapons/gun/energy/kalixpistol.ogg'
lethal_projectile = /obj/projectile/bullet/c22lr
lethal_projectile_sound = 'sound/weapons/gun/smg/pounder.ogg'
var/pellets


name = "Mulcher Turret"
desc = "An abombination made out of the components of a Shredder and an automatic targetting system. Careful now."
stun_projectile = /obj/projectile/bullet/slug/beanbag
stun_projectile_sound = 'sound/weapons/gun/hmg/shredder.ogg'
lethal_projectile = /obj/projectile/bullet/slug
lethal_projectile_sound = 'sound/weapons/gun/hmg/shredder.ogg'
shot_delay = 3
scan_range = 8

////////////////////////
//Turret Control Panel//
Expand Down

0 comments on commit e12ad43

Please sign in to comment.