Merge branch 'garrow-fixes-2' of https://github.com/DexterDude/PvE-CM…

…SS13 into pr/266

code/__DEFINES/__game.dm

@@ -382,6 +382,7 @@ block( \
 #define WALL_DEVWALL "devwall"
 #define WALL_DEVWALL_R "devwall_r"
 #define WALL_HUNTERSHIP "metal"//DMI specific name
+#define WALL_AICORE "aiwall"
 
 //Defines for dropship weapon gimbals
 #define GIMBAL_LEFT -1

code/game/area/shuttles.dm

@@ -43,6 +43,7 @@
 
 /area/shuttle/vehicle_elevator
 	name = "Vehicle ASRS"
+	base_lighting_alpha = 0
 
 /area/shuttle/ert
 	icon = 'icons/turf/area_almayer.dmi'

code/game/machinery/doors/poddoor.dm

@@ -298,6 +298,10 @@
 		/obj/structure/machinery/door/airlock,
 	)
 
+/obj/structure/machinery/door/poddoor/almayer/LateInitialize()
+	. = ..()
+	relativewall_neighbours()
+
 /obj/structure/machinery/door/poddoor/almayer/open
 	density = FALSE
 
@@ -315,9 +319,19 @@
 /obj/structure/machinery/door/poddoor/almayer/blended/white/open
 	density = FALSE
 
-/obj/structure/machinery/door/poddoor/almayer/Initialize()
-	. = ..()
-	addtimer(CALLBACK(src, TYPE_PROC_REF(/atom, relativewall_neighbours)), 10)
+/obj/structure/machinery/door/poddoor/almayer/blended/aicore
+	icon_state = "aidoor1"
+	base_icon_state = "aidoor"
+
+/obj/structure/machinery/door/poddoor/almayer/blended/aicore/open
+	density = FALSE
+
+/obj/structure/machinery/door/poddoor/almayer/blended/white_aicore
+	icon_state = "w_aidoor1"
+	base_icon_state = "w_aidoor"
+
+/obj/structure/machinery/door/poddoor/almayer/blended/white_aicore/open
+	density = FALSE
 
 /obj/structure/machinery/door/poddoor/almayer/locked
 	unacidable = TRUE

code/game/objects/structures/window.dm

@@ -604,6 +604,34 @@
 	unacidable = TRUE
 	health = 1000000 //Failsafe, shouldn't matter
 
+/obj/structure/window/framed/almayer/aicore
+	icon_state = "ai_rwindow0"
+	basestate = "ai_rwindow"
+	window_frame = /obj/structure/window_frame/almayer/aicore
+
+/obj/structure/window/framed/almayer/aicore/hull
+	name = "hull window"
+	desc = "An ultra-reinforced window designed to protect the AI Core. Made out of exotic materials to prevent hull breaches, nothing will get through here."
+	not_damageable = TRUE
+	not_deconstructable = TRUE
+	unslashable = TRUE
+	unacidable = TRUE
+	health = 1000000 //Failsafe, shouldn't matter
+
+/obj/structure/window/framed/almayer/aicore/white
+	icon_state = "w_ai_rwindow0"
+	basestate = "w_ai_rwindow"
+	window_frame = /obj/structure/window_frame/almayer/aicore/white
+
+/obj/structure/window/framed/almayer/aicore/white/hull
+	name = "hull window"
+	desc = "An ultra-reinforced window designed to protect the AI Core. Made out of exotic materials to prevent hull breaches, nothing will get through here."
+	not_damageable = TRUE
+	not_deconstructable = TRUE
+	unslashable = TRUE
+	unacidable = TRUE
+	health = 1000000 //Failsafe, shouldn't matter
+
 /obj/structure/window/framed/colony
 	name = "window"
 	icon_state = "col_window0"

code/game/objects/structures/window_frame.dm

@@ -174,6 +174,16 @@
 	basestate = "white_window"
 	window_type = /obj/structure/window/framed/almayer/white
 
+/obj/structure/window_frame/almayer/aicore
+	icon_state = "ai_window0_frame"
+	basestate = "ai_window"
+	window_type = /obj/structure/window/framed/almayer/aicore
+
+/obj/structure/window_frame/almayer/aicore/white
+	icon_state = "w_ai_window0_frame"
+	basestate = "w_ai_window"
+	window_type = /obj/structure/window/framed/almayer/aicore/white
+
 /obj/structure/window_frame/almayer/requisitions/attackby(obj/item/W, mob/living/user)
 	if(istype(W, sheet_type))
 		to_chat(user, SPAN_WARNING("You can't repair this window."))

code/game/turfs/floor_types.dm

@@ -180,7 +180,22 @@
 /turf/open/floor/plating/plating_catwalk/shiva
 	icon = 'icons/turf/floors/ice_colony/shiva_floor.dmi'
 
+/turf/open/floor/plating/plating_catwalk/aicore
+	icon = 'icons/turf/floors/aicore.dmi'
+	icon_state = "ai_plating_catwalk"
 
+/turf/open/floor/plating/plating_catwalk/aicore/update_icon()
+	. = ..()
+	if(covered)
+		overlays += image(icon, src, "ai_catwalk", CATWALK_LAYER)
+
+/turf/open/floor/plating/plating_catwalk/aicore/white
+	icon_state = "w_ai_plating_catwalk"
+
+/turf/open/floor/plating/plating_catwalk/aicore/white/update_icon()
+	. = ..()
+	if(covered)
+		overlays += image(icon, src, "w_ai_catwalk", CATWALK_LAYER)
 
 /turf/open/floor/plating/ironsand
 	name = "Iron Sand"
@@ -301,6 +316,27 @@
 	allow_construction = FALSE
 	hull_floor = TRUE
 
+/turf/open/floor/almayer/aicore
+	icon = 'icons/turf/floors/aicore.dmi'
+	icon_state = "ai_floor1"
+
+/turf/open/floor/almayer/aicore/glowing
+	icon_state = "ai_floor2"
+	light_color = "#d69c46"
+	light_range = 2
+
+/turf/open/floor/almayer/aicore/glowing/Initialize(mapload, ...)
+	. = ..()
+	set_light_on(TRUE)
+
+/turf/open/floor/almayer/aicore/no_build
+	allow_construction = FALSE
+	hull_floor = TRUE
+
+/turf/open/floor/almayer/aicore/glowing/no_build
+	allow_construction = FALSE
+	hull_floor = TRUE
+
 // RESEARCH STUFF
 /turf/open/floor/almayer/research/containment/entrance
 	icon_state = "containment_entrance"

code/game/turfs/walls/wall_types.dm

@@ -195,7 +195,39 @@
 	icon_state = "containment_window"
 	opacity = FALSE
 
+//AI Core
 
+/turf/closed/wall/almayer/aicore
+	walltype = WALL_AICORE
+	icon = 'icons/turf/walls/almayer_aicore.dmi'
+	icon_state = "aiwall"
+
+/turf/closed/wall/almayer/aicore/reinforced
+	name = "reinforced hull"
+	damage_cap = HEALTH_WALL_REINFORCED
+	icon_state = "reinforced"
+
+/turf/closed/wall/almayer/aicore/hull
+	name = "ultra reinforced hull"
+	desc = "An extremely reinforced metal wall used to isolate potentially dangerous areas"
+	hull = TRUE
+	icon_state = "hull"
+
+/turf/closed/wall/almayer/aicore/white
+	walltype = WALL_AICORE
+	icon = 'icons/turf/walls/almayer_aicore_white.dmi'
+	icon_state = "aiwall"
+
+/turf/closed/wall/almayer/aicore/white/reinforced
+	name = "reinforced hull"
+	damage_cap = HEALTH_WALL_REINFORCED
+	icon_state = "reinforced"
+
+/turf/closed/wall/almayer/aicore/white/hull
+	name = "ultra reinforced hull"
+	desc = "An extremely reinforced metal wall used to isolate potentially dangerous areas"
+	hull = TRUE
+	icon_state = "hull"
 
 
 //Sulaco walls.

code/modules/almayer/machinery.dm

@@ -195,11 +195,15 @@
 	unslashable = TRUE
 	unacidable = TRUE
 
+/obj/structure/prop/almayer/ship_memorial/golden_arrow
+	name = "memorial"
+	desc = "A memorial plaque dedicated to those of the Golden Arrow who have fallen in combat. It's an unfortunately long list of names."
+	icon_state = "garrow_memorial"
+
 /obj/structure/prop/almayer/ship_memorial/centcomm
 	name = "slab of remembrance"
 	desc = "A memorial to all Maintainer Team members that have retired from working on CM. No mentor names are present."
 
-
 /obj/structure/prop/almayer/ship_memorial/centcomm/admin
 	desc = "A memorial to all Admins and Moderators who have retired from CM. No mentor names are present."