Merge branch 'project/ares/sentries' into project/ares/tm_holder

code/game/machinery/sentry_holder.dm

@@ -16,6 +16,7 @@
 	var/ox = 0
 	var/oy = 0
 	var/require_red_alert = FALSE
+	var/base_icon_state = "sentry_system"
 
 /obj/structure/machinery/sentry_holder/Initialize()
 	. = ..()
@@ -76,7 +77,7 @@
 	deployment_cooldown = world.time + 50
 	deployed_turret.turned_on = TRUE
 	deployed_turret.forceMove(loc)
-	icon_state = "sentry_system_deployed"
+	icon_state = "[base_icon_state]_deployed"
 
 	for(var/mob/M in deployed_turret.loc)
 		if(deployed_turret.loc == src.loc)
@@ -103,7 +104,7 @@
 	deployed_turret.unset_range()
 	pixel_x = ox
 	pixel_y = oy
-	icon_state = "sentry_system_installed"
+	icon_state = "[base_icon_state]_installed"
 
 /obj/structure/machinery/sentry_holder/Destroy()
 	QDEL_NULL(deployed_turret)
@@ -115,5 +116,30 @@
 	turret_path = /obj/structure/machinery/defenses/sentry/premade/deployable/colony
 
 /obj/structure/machinery/sentry_holder/almayer
+	icon_state = "floor_sentry_installed"
 	turret_path = /obj/structure/machinery/defenses/sentry/premade/deployable/almayer
+	base_icon_state = "floor_sentry"
 	require_red_alert = TRUE
+
+/obj/structure/machinery/sentry_holder/almayer/mini
+	turret_path = /obj/structure/machinery/defenses/sentry/premade/deployable/almayer/mini
+
+/obj/structure/machinery/sentry_holder/almayer/mini/aicore
+
+/obj/structure/machinery/sentry_holder/almayer/mini/aicore/Initialize()
+	. = ..()
+	RegisterSignal(SSdcs, COMSIG_GLOB_AICORE_LOCKDOWN, PROC_REF(auto_deploy))
+	RegisterSignal(SSdcs, COMSIG_GLOB_AICORE_LIFT, PROC_REF(undeploy_sentry))
+
+/obj/structure/machinery/sentry_holder/almayer/mini/aicore/proc/auto_deploy()
+	if(deployed_turret.loc == src) //not deployed
+		if(stat & NOPOWER)
+			//to_chat(user, SPAN_WARNING("[src] is non-functional."))
+			return FALSE
+
+		deploy_sentry()
+		return TRUE
+
+/obj/structure/machinery/sentry_holder/almayer/mini/aicore/attack_hand(mob/user)
+	to_chat(user, SPAN_WARNING("[src] can only be deployed remotely."))
+	return

code/modules/defenses/sentry.dm

@@ -527,9 +527,25 @@
 	selected_categories[SENTRY_CATEGORY_IFF] = FACTION_COLONY
 
 /obj/structure/machinery/defenses/sentry/premade/deployable/almayer
-	fire_delay = 4
+	name = "UA-635C Static Gauss Turret"
+	desc = "A fully-automated defence turret with mid-range targeting capabilities. Armed with a modified M32-S Autocannon and an internal belt feed and modified for UA warship use."
+	fire_delay = 0.4 SECONDS
 	omni_directional = TRUE
 
+/obj/structure/machinery/defenses/sentry/premade/deployable/almayer/mini
+	name = "UA 512-S mini sentry"
+	desc = "A fully-automated defence turret with mid-range targeting capabilities. Armed with a modified M30 Autocannon and an internal belt feed and modified for UA warship use."
+	defense_type = "Mini"
+	fire_delay = 0.25 SECONDS
+	health = 150
+	health_max = 150
+	damage_mult = 0.6
+	density = FALSE
+	disassemble_time = 0.75 SECONDS
+	handheld_type = /obj/item/defenses/handheld/sentry/mini
+	composite_icon = FALSE
+
+
 //the turret inside the shuttle sentry deployment system
 /obj/structure/machinery/defenses/sentry/premade/dropship
 	density = TRUE

maps/map_files/USS_Almayer/USS_Almayer.dmm

@@ -23011,6 +23011,12 @@
 	icon_state = "plate"
 	},
 /area/almayer/maint/hull/upper/p_bow)
+"dJC" = (
+/obj/structure/machinery/sentry_holder/almayer/mini/aicore,
+/turf/open/floor/almayer/no_build{
+	icon_state = "plating"
+	},
+/area/almayer/command/airoom)
 "dJG" = (
 /obj/structure/pipes/standard/simple/hidden/supply{
 	dir = 9
@@ -141210,7 +141216,7 @@ daz
 daz
 eKJ
 yaZ
-ffE
+dJC
 hZj
 clw
 daz
@@ -142022,7 +142028,7 @@ daz
 daz
 eKJ
 yaZ
-ffE
+dJC
 hZj
 fQD
 daz