Merge pull request #6752 from Kyep/remap_centcom

CC Map Updates

code/game/area/Space Station 13 areas.dm

@@ -486,15 +486,19 @@ var/list/ghostteleportlocs = list()
 
 /area/centcom/control
 	name = "\improper Centcom Control"
+	icon_state = "centcom_ctrl"
 
 /area/centcom/evac
 	name = "\improper Centcom Emergency Shuttle"
+	icon_state = "centcom_evac"
 
 /area/centcom/suppy
 	name = "\improper Centcom Supply Shuttle"
+	icon_state = "centcom_supply"
 
 /area/centcom/ferry
 	name = "\improper Centcom Transport Shuttle"
+	icon_state = "centcom_ferry"
 
 /area/centcom/shuttle
 	name = "\improper Centcom Administration Shuttle"
@@ -507,9 +511,11 @@ var/list/ghostteleportlocs = list()
 
 /area/centcom/specops
 	name = "\improper Centcom Special Ops"
+	icon_state = "centcom_specops"
 
-/area/centcom/creed
-	name = "Creed's Office"
+/area/centcom/gamma
+	name = "\improper Centcom Gamma Armory"
+	icon_state = "centcom_gamma"
 
 /area/centcom/holding
 	name = "\improper Holding Facility"

code/game/machinery/portable_turret.dm

@@ -65,6 +65,7 @@
 	var/has_cover = 1		//Hides the cover
 
 /obj/machinery/porta_turret/centcom
+	name = "Centcom Turret"
 	enabled = 0
 	ailock = 1
 	check_synth	 = 0
@@ -74,6 +75,14 @@
 	check_weapons = 1
 	check_anomalies = 1
 
+/obj/machinery/porta_turret/centcom/pulse
+	name = "Pulse Turret"
+	health = 200
+	enabled = 1
+	lethal = 1
+	req_access = list(access_cent_commander)
+	installation = /obj/item/weapon/gun/energy/pulse/turret
+
 /obj/machinery/porta_turret/stationary
 	ailock = 1
 	lethal = 1
@@ -149,6 +158,10 @@
 			eshot_sound = 'sound/weapons/Laser.ogg'
 			egun = 1
 
+		if(/obj/item/weapon/gun/energy/pulse/turret)
+			eprojectile = /obj/item/projectile/beam/pulse
+			eshot_sound = 'sound/weapons/pulse.ogg'
+
 var/list/turret_icons
 /obj/machinery/porta_turret/update_icon()
 	if(!turret_icons)

code/modules/projectiles/guns/energy/pulse.dm

@@ -70,3 +70,16 @@
 
 /obj/item/weapon/gun/energy/pulse/pistol/m1911/isHandgun()
 	return 1
+
+/obj/item/weapon/gun/energy/pulse/turret
+	name = "pulse turret gun"
+	desc = "A heavy, turret-mounted pulse energy cannon."
+	icon_state = "turretlaser"
+	item_state = "turretlaser"
+	slot_flags = null
+	w_class = 5
+	ammo_type = list(/obj/item/ammo_casing/energy/electrode, /obj/item/ammo_casing/energy/laser/pulse)
+	weapon_weight = WEAPON_MEDIUM
+	can_flashlight = 0
+	trigger_guard = TRIGGER_GUARD_NONE
+	ammo_x_offset = 2