Garrow Modifications 2

code/__DEFINES/__game.dm

@@ -376,6 +376,7 @@
 #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/__DEFINES/shuttles.dm

@@ -143,3 +143,7 @@
 #define ESCAPE_SHUTTLE_SOUTH_PREFIX "escape_shuttle_s"
 
 #define ESCAPE_SHUTTLE_DOCK_PREFIX "almayer-hangar-escape-shuttle-"
+
+#define MOBILE_SHUTTLE_SHIPMAP_ELEVATOR_ONE "garrow_vehicle_elevator_one"
+#define MOBILE_SHUTTLE_SHIPMAP_ELEVATOR_TWO "garrow_vehicle_elevator_two"
+#define MOBILE_SHUTTLE_SHIPMAP_ELEVATOR_CARGO "garrow_cargo_elevator"

code/__DEFINES/sounds.dm

@@ -91,3 +91,4 @@
 #define SCAPE_PL_ENG list('sound/soundscape/engamb1.ogg', 'sound/soundscape/engamb2.ogg', 'sound/soundscape/engamb3.ogg', 'sound/soundscape/engamb4.ogg', 'sound/soundscape/engamb5.ogg', 'sound/soundscape/engamb6.ogg', 'sound/soundscape/engamb7.ogg', )
 #define SCAPE_PL_HANGAR list('sound/soundscape/hangaramb1.ogg', 'sound/soundscape/hangaramb2.ogg', 'sound/soundscape/hangaramb3.ogg', 'sound/soundscape/hangaramb4.ogg', 'sound/soundscape/hangaramb5.ogg', 'sound/soundscape/hangaramb6.ogg', 'sound/soundscape/hangaramb7.ogg', 'sound/soundscape/hangaramb8.ogg', 'sound/soundscape/hangaramb9.ogg', 'sound/soundscape/hangaramb10.ogg', )
 #define SCAPE_PL_ARES list('sound/soundscape/mother.ogg')
+#define SCAPE_PL_AICORE list('sound/soundscape/aicore/aicore_beep.ogg', 'sound/soundscape/aicore/aicore_ident.ogg', 'sound/soundscape/aicore/aicore_rumble1.ogg', 'sound/soundscape/aicore/aicore_rumble2.ogg', 'sound/soundscape/aicore/aicore_rumble3.ogg', 'sound/soundscape/aicore/aicore_rumble4.ogg', 'sound/soundscape/aicore/aicore_rumble5.ogg', 'sound/soundscape/aicore/aicore_tone1.ogg', 'sound/soundscape/aicore/aicore_tone2.ogg', 'sound/soundscape/aicore/aicore_tone3.ogg', 'sound/soundscape/aicore/aicore_tone4.ogg', 'sound/soundscape/aicore/aicore_tone5.ogg', 'sound/soundscape/aicore/aicore_tone6.ogg', 'sound/soundscape/aicore/aicore_tone7.ogg', 'sound/soundscape/aicore/aicore_tone8.ogg', 'sound/soundscape/aicore/aicore_tone9.ogg', 'sound/soundscape/aicore/aicore_tone10.ogg', 'sound/soundscape/aicore/aicore_tone11.ogg', 'sound/soundscape/aicore/aicore_tone12.ogg', 'sound/soundscape/aicore/aicore_tone13.ogg', 'sound/soundscape/aicore/aicore_tone14.ogg', 'sound/soundscape/aicore/aicore_tone15.ogg', 'sound/soundscape/aicore/aicore_tone16.ogg', 'sound/soundscape/aicore/aicore_tone17.ogg', 'sound/soundscape/aicore/aicore_tone18.ogg', )

code/datums/shuttles.dm

@@ -125,3 +125,22 @@
 
 /datum/map_template/shuttle/trijent_elevator/ice_elevator/requisitions
 	elevator_network = "Requisitions"
+
+/datum/map_template/shuttle/trijent_elevator/golden_arrow
+	shuttle_id = "unused"
+
+/datum/map_template/shuttle/trijent_elevator/golden_arrow/vehicleone
+	name = "Vehicle Elevator One"
+	shuttle_id = MOBILE_SHUTTLE_SHIPMAP_ELEVATOR_ONE
+	elevator_network = "ArrowVehicleOne"
+
+/datum/map_template/shuttle/trijent_elevator/golden_arrow/vehicletwo
+	name = "Vehicle Elevator Two"
+	shuttle_id = MOBILE_SHUTTLE_SHIPMAP_ELEVATOR_TWO
+	elevator_network = "ArrowVehicleTwo"
+
+/datum/map_template/shuttle/trijent_elevator/golden_arrow/cargo
+	name = "Cargo Elevator"
+	elevator_network = "garrow_cargo"
+	shuttle_id = MOBILE_SHUTTLE_SHIPMAP_ELEVATOR_CARGO
+	elevator_network = "ArrowCargo"

code/game/area/golden_arrow.dm

@@ -31,7 +31,7 @@
 	icon_state = "upperengineering"
 
 /area/golden_arrow/briefing
-	name = "\improper Briefing Area"
+	name = "\improper Assembly Room"
 	icon_state = "briefing"
 
 /area/golden_arrow/dorms
@@ -81,3 +81,50 @@
 /area/golden_arrow/platoonarmory
 	name = "\improper Platoon Armory"
 	icon_state = "alpha"
+
+/area/golden_arrow/ai_interface
+	name = "\improper Human AI Interface"
+	icon_state = "airoom"
+	soundscape_playlist = SCAPE_PL_AICORE
+	soundscape_interval = 7
+
+/area/golden_arrow/motor_pool
+	name = "\improper Motor Pool"
+	icon_state = "workshop"
+
+/area/golden_arrow/lower_cargo
+	name = "\improper Lower Cargo Bays"
+	icon_state = "req"
+
+/area/golden_arrow/supplydrop
+	name = "\improper Supply Drop Bay"
+	icon_state = "astronavigation"
+
+
+/area/golden_arrow/cargo_shuttle
+	name = "\improper cargo_shuttle"
+	icon_state = "lifeboat"
+
+/area/golden_arrow/cargo_shuttle/elevator
+	name = "\improper Cargo Elevator"
+	unlimited_power = TRUE
+	requires_power = FALSE
+
+/area/golden_arrow/cargo_shuttle/lower
+	name = "\improper Cargo Elevator Lower Level"
+
+/area/golden_arrow/cargo_shuttle/upper
+	name = "\improper Cargo Elevator Upper Level"
+
+/area/golden_arrow/vehicle_shuttle
+	name = "\improper Vehicle Elevator One"
+
+/area/golden_arrow/vehicle_shuttle/upper
+	name = "\improper Vehicle Elevator One Upper"
+
+/area/golden_arrow/vehicle_shuttle/two
+	name = "\improper Vehicle Elevator Two"
+
+/area/golden_arrow/vehicle_shuttle/two/upper
+	name = "\improper Vehicle Elevator Two Upper"
+

code/game/machinery/doors/poddoor.dm

@@ -298,6 +298,7 @@
 		/obj/structure/machinery/door/airlock,
 	)
 
+
 /obj/structure/machinery/door/poddoor/almayer/open
 	density = FALSE
 
@@ -319,6 +320,20 @@
 	. = ..()
 	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/items/toys/toys.dm

@@ -318,6 +318,11 @@
 	desc = "Mini-Mecha action figure! Collect them all! 11/11."
 	icon_state = "phazonprize"
 
+/obj/item/toy/prize/apc
+	name = "toy APC"
+	desc = "Limited edition APC action figure."
+	icon_state = "apctoy"
+
 /obj/item/toy/inflatable_duck
 	name = "inflatable duck"
 	desc = "No bother to sink or swim when you can just float!"

code/game/objects/structures/gun_rack.dm

@@ -91,3 +91,24 @@
 
 /obj/structure/gun_rack/m41/recon/unloaded
 	populate_type = /obj/item/weapon/gun/rifle/m41aMK1/forecon/unloaded
+
+/obj/structure/gun_rack/flamer
+	name = "M240A1 incinerator rack"
+	icon_state = "m240"
+	desc = "ARMAT-produced gun rack for storage of long guns. While initial model was supposed to be extremely modifiable, USCM comissioned racks with fixed slots which only fit M240A1 incinerators. Some say they were cheaper, and some say the main reason was marine's ability to easily break anything more complex than a tungsten ball."
+	max_stored = 2
+	initial_stored = 2
+	allowed_type = /obj/item/weapon/gun/flamer
+	populate_type = /obj/item/weapon/gun/flamer
+
+/obj/structure/gun_rack/flamer/unloaded
+	populate_type = /obj/item/weapon/gun/flamer/unloaded
+
+/obj/structure/gun_rack/mk221
+	name = "M120 shotgun rack"
+	icon_state = "mk221"
+	desc = "ARMAT-produced gun rack for storage of long guns. While initial model was supposed to be extremely modifiable, USCM comissioned racks with fixed slots which only fit M120 tactical shotguns. Some say they were cheaper, and some say the main reason was marine's ability to easily break anything more complex than a tungsten ball."
+	max_stored = 2
+	initial_stored = 2
+	allowed_type = /obj/item/weapon/gun/shotgun/combat
+	populate_type = /obj/item/weapon/gun/shotgun/combat

code/game/objects/structures/signs.dm

@@ -111,7 +111,32 @@
 /obj/structure/sign/banners/united_americas_flag
 	name = "\improper United Americas flag"
 	desc = "A flag of the United Americas. Inspires patriotism, fear, or revulsion depending on the viewer's political leanings."
-	icon_state = "ua_flag"
+	icon_state = "uaflag"
+
+/obj/structure/sign/banners/colonial_marines_flag
+	name = "\improper United States Colonial Marine Corps flag"
+	desc = "A flag of the United States Colonial Marine Corps. Inspires patriotism, fear, or revulsion depending on the viewer's political leanings."
+	icon_state = "cmflag"
+/obj/structure/sign/banners/colonial_marines_flag_worn
+	name = "\improper Worn United States Colonial Marine Corps flag"
+	desc = "A very worn flag of the United States Colonial Marine Corps. Inspires patriotism, fear, or revulsion depending on the viewer's political leanings."
+	icon_state = "cmflag_worn"
+/obj/structure/sign/banners/twe_flag
+	name = "\improper Three World Empire flag"
+	desc = "A flag of the Three World Empire. Inspires patriotism, fear, or revulsion depending on the viewer's political leanings."
+	icon_state = "tweflag"
+/obj/structure/sign/banners/twe_worn
+	name = "\improper Worn Three World Empire flag"
+	desc = "A very worn flag of the Three World Empire. Inspires patriotism, fear, or revulsion depending on the viewer's political leanings."
+	icon_state = "tweflag_worn"
+/obj/structure/sign/banners/upp_flag
+	name = "\improper Union of Progressive Peoples flag"
+	desc = "A flag of the Union of Progressive Peoples. Inspires patriotism, fear, or revulsion depending on the viewer's political leanings."
+	icon_state = "uppflag"
+/obj/structure/sign/banners/upp_worn
+	name = "\improper Worn Union of Progressive Peoples flag"
+	desc = "A very worn flag of the Union of Progressive Peoples. Inspires patriotism, fear, or revulsion depending on the viewer's political leanings."
+	icon_state = "uppflag_worn"
 
 //=====================//
 // SEMIOTIC STANDARD  //

code/game/objects/structures/tables_racks.dm

@@ -625,6 +625,14 @@
 	icon_state = "clothtable"
 	table_prefix = "cloth"
 
+/obj/structure/surface/table/reinforced/aicore
+	name = "AI interface table"
+	desc = "A rather fancy looking table for the ship's AI core."
+	icon_state = "aicoretable"
+
+/obj/structure/surface/table/reinforced/aicore/update_icon()
+	return
+
 /obj/structure/surface/table/reinforced/toc
 	name = "operations table"
 	desc = "A square metal surface resting on its fat metal bottom. You can't flip something that doesn't have legs."

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"
@@ -203,6 +218,21 @@
 	icon_state = "default"
 	plating_type = /turf/open/floor/plating/almayer
 
+/turf/open/floor/almayer/edge
+	icon_state = "floor_edge"
+
+/turf/open/floor/almayer/edge/smooth
+	icon_state = "floor_edge_smooth"
+
+/turf/open/floor/almayer/edge/smooth/corner
+	icon_state = "floor_edge_smooth_corner"
+
+/turf/open/floor/almayer/edge/smooth/endcap_right
+	icon_state = "floor_edge_smooth2"
+
+/turf/open/floor/almayer/edge/smooth/endcap_left
+	icon_state = "floor_edge_smooth3"
+
 /// Admin level thunderdome floor. Doesn't get damaged by explosions and such for pristine testing
 /turf/open/floor/tdome
 	icon = 'icons/turf/almayer.dmi'
@@ -271,6 +301,34 @@
 		for(var/obj/effect/decal/cleanable/C in contents) //for the off chance of someone bleeding mid=flight
 			qdel(C)
 
+/turf/open/floor/almayer/empty/golden_arrow
+	desc = "You can see the elevator down there. It's a pretty long fall though..."
+	var/area_type = /area/golden_arrow/cargo_shuttle/elevator
+
+/turf/open/floor/almayer/empty/golden_arrow/enter_depths(atom/movable/AM)
+	if(AM.anchored)
+		return
+	if(AM.throwing == 0 && istype(get_turf(AM), type))
+		AM.visible_message(SPAN_WARNING("[AM] falls into the depths!"), SPAN_WARNING("You fall into the depths!"))
+
+	var/list/area_turfs = get_area_turfs(area_type)
+	for(var/turf/turf in area_turfs)
+		if(turf.density)
+			area_turfs -= turf
+
+	AM.forceMove(pick(area_turfs))
+	if(ishuman(AM))
+		var/mob/living/carbon/human/human = AM
+		human.KnockDown(3)
+		human.take_limb_damage(30)
+		playsound(human, "punch", rand(20, 70), TRUE)
+
+/turf/open/floor/almayer/empty/golden_arrow/vehicle_one
+	area_type = /area/golden_arrow/vehicle_shuttle
+
+/turf/open/floor/almayer/empty/golden_arrow/vehicle_two
+	area_type = /area/golden_arrow/vehicle_shuttle/two
+
 //Others
 /turf/open/floor/almayer/uscm
 	icon_state = "logo_c"
@@ -286,6 +344,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"