Merge branch 'master' of https://github.com/PvE-CMSS13/PvE-CMSS13 int…

…o conscripts-gone

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/controllers/subsystem/item_cleanup.dm

@@ -3,7 +3,7 @@ var/global/list/item_cleanup_list = list()
 SUBSYSTEM_DEF(item_cleanup)
 	name = "Item Cleanup"
 	wait = 10 MINUTES //should be adjusted for WO
-	var/start_processing_time = 35 MINUTES //should be adjusted for WO
+	var/start_processing_time = INFINITY //should be adjusted for WO
 	var/percentage_of_garbage_to_delete = 0.5 //should be adjusted for WO
 	//We keep a separate, private list
 	//So we don't get instant deletions of items

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/computer/dropship_weapons.dm

@@ -694,10 +694,10 @@
 				if(CEILING_GLASS)
 					is_outside = TRUE
 		if(!is_outside && !cavebreaker) //cavebreaker doesn't care
-			to_chat(weapon_operator, SPAN_WARNING("INVALID TARGET: target must be visible from high altitude."))
+			to_chat(weapon_operator, SPAN_WARNING("WARNING: Target obstructed by terrain features."))
 			return FALSE
 		if (protected_by_pylon(TURF_PROTECTION_CAS, TU))
-			to_chat(weapon_operator, SPAN_WARNING("INVALID TARGET: biological-pattern interference with signal."))
+			to_chat(weapon_operator, SPAN_WARNING("WARNING: Signal garbled, launch aborted."))
 			return FALSE
 		if(!DEW.ammo_equipped.can_fire_at(TU, weapon_operator))
 			return FALSE
@@ -807,10 +807,10 @@
 	if (!istype(dropship))
 		return FALSE
 	if (!dropship.in_flyby || dropship.mode != SHUTTLE_CALL)
-		to_chat(user, SPAN_WARNING("Has to be in Fly By mode"))
+		to_chat(user, SPAN_WARNING("You must be making a flyby!"))
 		return FALSE
 	if (dropship.timer && dropship.timeLeft(1) < firemission_envelope.flyoff_period)
-		to_chat(user, SPAN_WARNING("Not enough time to complete the Fire Mission"))
+		to_chat(user, SPAN_WARNING("Not enough time on station to complete the firemission."))
 		return FALSE
 	var/datum/cas_signal/recorded_loc = firemission_envelope.recorded_loc
 	var/obj/source = recorded_loc.signal_loc
@@ -846,7 +846,7 @@
 		return
 	if(firemission_envelope.recorded_loc.obstructed_signal())
 		if(firemission_envelope.user_is_guided(user))
-			to_chat(user, SPAN_WARNING("Signal Obstructed. You have to go in blind."))
+			to_chat(user, SPAN_WARNING("Signal obstructed. You have to go in blind."))
 		return
 	var/sx = 0
 	var/sy = 0
@@ -872,7 +872,7 @@
 	var/area/laser_area = get_area(shootloc)
 	if(!istype(laser_area) || CEILING_IS_PROTECTED(laser_area.ceiling, CEILING_PROTECTION_TIER_1))
 		if(firemission_envelope.user_is_guided(user))
-			to_chat(user, SPAN_WARNING("Vision Obstructed. You have to go in blind."))
+			to_chat(user, SPAN_WARNING("Vision obstructed. You have to go in blind."))
 		firemission_envelope.change_current_loc()
 	else
 		firemission_envelope.change_current_loc(shootloc)

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/machinery/vending/vending_types.dm

@@ -258,6 +258,20 @@
 		/obj/item/tape/regulation = 5,
 	)
 
+/obj/structure/machinery/vending/security/upp
+	name = "\improper People's Police Equipment Vendor"
+	desc = "A standard security vendor used by security forces of the UPP."
+	req_access = list(ACCESS_CIVILIAN_BRIG)
+	products = list(
+		/obj/item/handcuffs = 8,
+		/obj/item/reagent_container/spray/pepper = 4,
+		/obj/item/device/flashlight = 4,
+		/obj/item/storage/belt/security/MP/UPP = 4,
+		/obj/item/device/flash = 5,
+		/obj/item/storage/box/evidence = 6,
+		/obj/item/tape/regulation = 5,
+	)
+
 /obj/structure/machinery/vending/sea
 	name = "\improper SeaTech"
 	desc = "An equipment vendor designed to save lives"

code/game/objects/items/devices/motion_detector.dm

@@ -217,6 +217,10 @@
 
 	range_bounds.set_shape(cur_turf.x, cur_turf.y, detector_range * 2)
 
+	var/list/ping_receivers = list()
+	for(var/mob/living/carbon/human/humans in range(1, human_user))
+		ping_receivers += humans
+
 	var/list/ping_candidates = SSquadtree.players_in_range(range_bounds, cur_turf.z, QTREE_EXCLUDE_OBSERVER | QTREE_SCAN_MOBS)
 
 	for(var/A in ping_candidates)
@@ -230,7 +234,8 @@
 		apply_debuff(M)
 		ping_count++
 		if(human_user)
-			show_blip(human_user, M)
+			for(var/mob/living/carbon/human/show_ping_to as anything in ping_receivers)
+				show_blip(show_ping_to, M)
 
 	for(var/mob/hologram/holo as anything in GLOB.hologram_list)
 		if(!holo.motion_sensed)

code/game/objects/items/storage/belt.dm

@@ -88,6 +88,7 @@
 	desc = "The M276 is the standard load-bearing equipment of the USCM. It consists of a modular belt with various clips. This version lacks any combat functionality, and is commonly used by engineers to transport important tools."
 	icon_state = "utilitybelt"
 	item_state = "utility"
+	max_w_class = SIZE_MEDIUM
 	can_hold = list(
 		/obj/item/tool/crowbar,
 		/obj/item/tool/screwdriver,
@@ -1685,7 +1686,7 @@
 		/obj/item/device/flashlight/flare,
 		/obj/item/weapon/gun/flare,
 		/obj/item/weapon/gun/pistol,
-		/obj/item/weapon/gun/revolver/m44,
+		/obj/item/weapon/gun/revolver,
 		/obj/item/ammo_magazine/revolver,
 		/obj/item/ammo_magazine/pistol,
 		/obj/item/ammo_magazine/smartgun,

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/prop.dm

@@ -291,3 +291,22 @@
 /obj/item/prop/magazine/boots/n055
 	name = "Boots!: Issue No.55"
 	desc = "The only official USCM magazine, the headline reads 'TEN tips to keep your UD4 cockpit both safer and more relaxing.'"
+
+/obj/item/prop/scrap
+	name = "scrap metal"
+	icon = 'icons/obj/items/fishing_atoms.dmi'
+	icon_state = "sheet-scrap"
+	item_state = ""
+	desc = "A rusty piece of scrap metal."
+	w_class = SIZE_MEDIUM
+
+/obj/item/prop/rock
+	name = "rock"
+	icon = 'icons/obj/items/plush.dmi'
+	icon_state = "rock"
+	item_state = ""
+	force = 30
+	throwforce = 25
+	desc = "The most ancient of tools."
+	w_class = SIZE_TINY
+	hitsound = 'sound/weapons/genhit3.ogg'

code/game/objects/structures/crates_lockers/closets/job_closets.dm

@@ -82,12 +82,6 @@
 
 /obj/structure/closet/secure_closet/platoon_sergeant/Initialize()
 	. = ..()
-	new /obj/item/weapon/gun/rifle/m41aMK1(src)
-	new /obj/item/ammo_magazine/rifle/m41aMK1(src)
-	new /obj/item/ammo_magazine/rifle/m41aMK1(src)
-	new /obj/item/ammo_magazine/rifle/m41aMK1(src)
-	new /obj/item/ammo_magazine/rifle/m41aMK1(src)
-	new /obj/item/ammo_magazine/rifle/m41aMK1(src)
 	new /obj/item/clothing/head/helmet/marine/leader(src)
 	new /obj/item/device/binoculars/range/designator(src)
 	new /obj/item/device/whistle(src)
@@ -99,12 +93,6 @@
 
 /obj/structure/closet/secure_closet/platoon_sergeant_forecon/Initialize()
 	. = ..()
-	new /obj/item/weapon/gun/rifle/m41aMK1(src)
-	new /obj/item/ammo_magazine/rifle/m41aMK1(src)
-	new /obj/item/ammo_magazine/rifle/m41aMK1(src)
-	new /obj/item/ammo_magazine/rifle/m41aMK1(src)
-	new /obj/item/ammo_magazine/rifle/m41aMK1(src)
-	new /obj/item/ammo_magazine/rifle/m41aMK1(src)
 	new /obj/item/device/binoculars/range/designator(src)
 	new /obj/item/device/whistle(src)
 
@@ -115,7 +103,6 @@
 
 /obj/structure/closet/secure_closet/squad_sergeant/Initialize()
 	. = ..()
-	new /obj/item/clothing/head/helmet/marine/rto(src)
 	new /obj/item/device/binoculars/range/designator(src)
 	new /obj/item/device/whistle(src)
 

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."