commit

code/game/machinery/porta_turret/portable_turret.dm

@@ -87,9 +87,9 @@
 	if(has_cover)
 		cover = new /obj/machinery/porta_turret_cover(loc)
 		cover.parent_turret = src
-		var/mutable_appearance/base = mutable_appearance('icons/obj/turrets.dmi', "basedark")
-		base.layer = NOT_HIGH_OBJ_LAYER
-		underlays += base
+		var/mutable_appearance/base = mutable_appearance('icons/obj/turrets.dmi', "basedark")
+		base.layer = NOT_HIGH_OBJ_LAYER
+		underlays += base
 	if(!has_cover)
 		INVOKE_ASYNC(src, .proc/popUp)
 
@@ -554,7 +554,7 @@
 	use_power = 0
 	has_cover = 0
 	scan_range = 9
-	req_access = list(GLOB.access_syndicate)
+	req_access = list(GLOB.access_syndicate)
 	stun_projectile = /obj/item/projectile/bullet
 	lethal_projectile = /obj/item/projectile/bullet
 	lethal_projectile_sound = 'sound/weapons/Gunshot.ogg'
@@ -564,6 +564,15 @@
 	faction = "syndicate"
 	emp_vunerable = 0
 
+/obj/machinery/porta_turret/syndicate/energy
+	icon_state = "standard_stun"
+	base_icon_state = "standard"
+	stun_projectile = /obj/item/projectile/energy/electrode
+	stun_projectile_sound = 'sound/weapons/Taser.ogg'
+	lethal_projectile = /obj/item/projectile/beam/laser/heavylaser
+	lethal_projectile_sound = 'sound/weapons/lasercannonfire.ogg'
+
+
 /obj/machinery/porta_turret/syndicate/setup()
 	return
 
@@ -571,8 +580,8 @@
 	return 10 //Syndicate turrets shoot everything not in their faction
 
 /obj/machinery/porta_turret/syndicate/pod
-	max_integrity = 40
-	integrity_failure = 20
+	max_integrity = 40
+	integrity_failure = 20
 	obj_integrity = 40
 	stun_projectile = /obj/item/projectile/bullet/weakbullet3
 	lethal_projectile = /obj/item/projectile/bullet/weakbullet3
@@ -948,7 +957,7 @@
 	var/atom/target
 	var/turf/target_turf
 	var/warned = FALSE
-	var/mouseparams
+	var/mouseparams
 
 //BUCKLE HOOKS
 
@@ -992,8 +1001,8 @@
 	icon = 'icons/obj/weapons.dmi'
 	icon_state = "offhand"
 	w_class = WEIGHT_CLASS_HUGE
-	flags = ABSTRACT | NODROP | NOBLUDGEON
-	resistance_flags = FIRE_PROOF | UNACIDABLE | ACID_PROOF
+	flags = ABSTRACT | NODROP | NOBLUDGEON
+	resistance_flags = FIRE_PROOF | UNACIDABLE | ACID_PROOF
 	var/obj/machinery/manned_turret/turret
 
 /obj/item/gun_control/New(obj/machinery/manned_turret/MT)
@@ -1005,22 +1014,22 @@
 /obj/item/gun_control/CanItemAutoclick()
 	return 1
 
-/obj/item/gun_control/attack_obj(obj/O, mob/living/user)
-	user.changeNext_move(CLICK_CD_MELEE)
-	O.attacked_by(src, user)
-
-/obj/item/gun_control/attack(mob/living/M, mob/living/user)
-	user.lastattacked = M
-	M.lastattacker = user
-	M.attacked_by(src, user)
-	add_fingerprint(user)
-
-/obj/item/gun_control/afterattack(atom/targeted_atom, mob/user, flag, params)
+/obj/item/gun_control/attack_obj(obj/O, mob/living/user)
+	user.changeNext_move(CLICK_CD_MELEE)
+	O.attacked_by(src, user)
+
+/obj/item/gun_control/attack(mob/living/M, mob/living/user)
+	user.lastattacked = M
+	M.lastattacker = user
+	M.attacked_by(src, user)
+	add_fingerprint(user)
+
+/obj/item/gun_control/afterattack(atom/targeted_atom, mob/user, flag, params)
 	..()
 	var/obj/machinery/manned_turret/E = user.buckled
 	E.setDir(get_dir(E,targeted_atom))
 	user.setDir(E.dir)
-	E.mouseparams = params
+	E.mouseparams = params
 	switch(E.dir)
 		if(NORTH)
 			E.layer = BELOW_MOB_LAYER
@@ -1068,15 +1077,15 @@
 	else
 		cooldown = world.time + cooldown_duration
 		warned = FALSE
-		volley(user)
+		volley(user)
 
-/obj/machinery/manned_turret/proc/volley(mob/user)
+/obj/machinery/manned_turret/proc/volley(mob/user)
 	target_turf = get_turf(target)
 	for(var/i in 1 to number_of_shots)
-		addtimer(CALLBACK(src, /obj/machinery/manned_turret/.proc/fire_helper, user), i*rate_of_fire)
+		addtimer(CALLBACK(src, /obj/machinery/manned_turret/.proc/fire_helper, user), i*rate_of_fire)
 
 
-/obj/machinery/manned_turret/proc/fire_helper(mob/user)
+/obj/machinery/manned_turret/proc/fire_helper(mob/user)
 	if(!src)
 		return
 	var/turf/targets_from = get_turf(src)
@@ -1085,10 +1094,10 @@
 	var/obj/item/projectile/P = new projectile_type(targets_from)
 	P.current = targets_from
 	P.starting = targets_from
-	P.firer = user
+	P.firer = user
 	P.original = target
 	playsound(src, 'sound/weapons/Gunshot_smg.ogg', 75, 1)
-	P.preparePixelProjectile(target, target_turf, user, mouseparams, rand(-9, 9))
+	P.preparePixelProjectile(target, target_turf, user, mouseparams, rand(-9, 9))
 	P.fire()
 
 /obj/machinery/manned_turret/ultimate  // Admin-only proof of concept for autoclicker automatics
@@ -1102,4 +1111,4 @@
 	if(target == user || target == get_turf(src))
 		return
 	target_turf = get_turf(target)
-	fire_helper(user)
+	fire_helper(user)