Merge branch 'cmss13-devs:master' into HangarStorageRoom

code/__DEFINES/job.dm

@@ -9,6 +9,7 @@
 #define SQUAD_MARINE_4 "Delta"
 #define SQUAD_MARINE_5 "Echo"
 #define SQUAD_MARINE_CRYO "Foxtrot"
+#define SQUAD_MARINE_INTEL "Intel"
 #define SQUAD_SOF "SOF"
 
 // Job name defines

code/__DEFINES/minimap.dm

@@ -52,6 +52,7 @@ GLOBAL_LIST_INIT(all_minimap_flags, bitfield2list(MINIMAP_FLAG_ALL))
 #define MINIMAP_SQUAD_ECHO "#00b043"
 #define MINIMAP_SQUAD_FOXTROT "#fe7b2e"
 #define MINIMAP_SQUAD_SOF "#400000"
+#define MINIMAP_SQUAD_INTEL "#053818"
 
 #define MINIMAP_ICON_BACKGROUND_CIVILIAN "#7D4820"
 #define MINIMAP_ICON_BACKGROUND_CIC "#3f3f3f"

code/_onclick/hud/screen_objects.dm

@@ -144,7 +144,7 @@
 
 /atom/movable/screen/zone_sel/clicked(mob/user, list/mods)
 	if (..())
-		return 1
+		return TRUE
 
 	var/icon_x = text2num(mods["icon-x"])
 	var/icon_y = text2num(mods["icon-y"])
@@ -209,7 +209,11 @@
 	icon = 'icons/mob/hud/screen1_robot.dmi'
 
 /atom/movable/screen/clicked(mob/user)
-	if(!user) return 1
+	if(!user)
+		return TRUE
+
+	if(isobserver(user))
+		return TRUE
 
 	switch(name)
 		if("equip")

code/game/jobs/job/command/auxiliary/intel.dm

@@ -6,7 +6,7 @@
 	allow_additional = 1
 	scaled = 1
 	supervisors = "the auxiliary support officer"
-	flags_startup_parameters = ROLE_ADD_TO_DEFAULT
+	flags_startup_parameters = ROLE_ADD_TO_DEFAULT|ROLE_ADD_TO_SQUAD
 	gear_preset = "USCM Intelligence Officer (IO) (Cryo)"
 	entry_message_body = "<a href='"+URL_WIKI_IO_GUIDE+"'>Your job is to assist the marines in collecting intelligence related</a> to the current operation to better inform command of their opposition. You are in charge of gathering any data disks, folders, and notes you may find on the operational grounds and decrypt them to grant the USCM additional resources."
 

code/game/jobs/job/marine/squads.dm

@@ -31,6 +31,8 @@
 	var/tracking_id = null //Used for the tracking subsystem
 	/// Maximum number allowed in a squad. Defaults to infinite
 	var/max_positions = -1
+	/// If uses the overlay
+	var/use_stripe_overlay = TRUE
 	/// Color for the squad marines gear overlays
 	var/equipment_color = "#FFFFFF"
 	/// The alpha for the armor overlay used by equipment color
@@ -108,6 +110,9 @@
 
 	var/minimap_color = MINIMAP_SQUAD_UNKNOWN
 
+	///Should we add the name of our squad in front of their name? Ex: Alpha Hospital Corpsman
+	var/prepend_squad_name_to_assignment = TRUE
+
 
 /datum/squad/marine
 	name = "Root"
@@ -175,6 +180,23 @@
 	roundstart = FALSE
 	locked = TRUE
 
+/datum/squad/marine/intel
+	name = SQUAD_MARINE_INTEL
+	use_stripe_overlay = FALSE
+	equipment_color = "#053818"
+	minimap_color = MINIMAP_SQUAD_INTEL
+	radio_freq = null
+
+	roundstart = FALSE
+	prepend_squad_name_to_assignment = FALSE
+
+	max_engineers = 0
+	max_medics = 0
+	max_specialists = 0
+	max_tl = 0
+	max_smartgun = 0
+	max_leaders = 0
+
 /datum/squad/marine/sof
 	name = SQUAD_SOF
 	equipment_color = "#400000"
@@ -496,7 +518,10 @@
 	marines_list += M
 	M.assigned_squad = src //Add them to the squad
 	C.access += (src.access + extra_access) //Add their squad access to their ID
-	C.assignment = "[name] [assignment]"
+	if(prepend_squad_name_to_assignment)
+		C.assignment = "[name] [assignment]"
+	else
+		C.assignment = assignment
 
 	SEND_SIGNAL(M, COMSIG_SET_SQUAD)
 
@@ -505,7 +530,7 @@
 	C.name = "[C.registered_name]'s ID Card ([C.assignment])"
 
 	var/obj/item/device/radio/headset/almayer/marine/headset = locate() in list(M.wear_l_ear, M.wear_r_ear)
-	if(headset)
+	if(headset && radio_freq)
 		headset.set_frequency(radio_freq)
 	M.update_inv_head()
 	M.update_inv_wear_suit()

code/game/jobs/role_authority.dm

@@ -652,6 +652,15 @@ I hope it's easier to tell what the heck this proc is even doing, unlike previou
 		if (S.roundstart && S.usable && S.faction == H.faction && S.name != "Root")
 			mixed_squads += S
 
+	//Deal with IOs first
+	if(H.job == JOB_INTEL)
+		var/datum/squad/intel_squad = get_squad_by_name(SQUAD_MARINE_INTEL)
+		if(!intel_squad || !istype(intel_squad)) //Something went horribly wrong!
+			to_chat(H, "Something went wrong with randomize_squad()! Tell a coder!")
+			return
+		intel_squad.put_marine_in_squad(H) //Found one, finish up
+		return
+
 	//Deal with non-standards first.
 	//Non-standards are distributed regardless of squad population.
 	//If the number of available positions for the job are more than max_whatever, it will break.

code/game/machinery/vending/vendor_types/requisitions.dm

@@ -19,16 +19,16 @@
 /obj/structure/machinery/cm_vending/sorted/cargo_guns/populate_product_list(scale)
 	listed_products = list(
 		list("PRIMARY FIREARMS", -1, null, null),
-		list("M37A2 Pump Shotgun", round(scale * 10), /obj/item/weapon/gun/shotgun/pump, VENDOR_ITEM_REGULAR),
-		list("M39 Submachinegun", round(scale * 15), /obj/item/weapon/gun/smg/m39, VENDOR_ITEM_REGULAR),
-		list("M41A Pulse Rifle MK2", round(scale * 20), /obj/item/weapon/gun/rifle/m41a, VENDOR_ITEM_REGULAR),
+		list("M37A2 Pump Shotgun", round(scale * 30), /obj/item/weapon/gun/shotgun/pump, VENDOR_ITEM_REGULAR),
+		list("M39 Submachinegun", round(scale * 60), /obj/item/weapon/gun/smg/m39, VENDOR_ITEM_REGULAR),
+		list("M41A Pulse Rifle MK2", round(scale * 60), /obj/item/weapon/gun/rifle/m41a, VENDOR_ITEM_REGULAR),
 		list("M4RA Battle Rifle", round(scale * 20), /obj/item/weapon/gun/rifle/m4ra, VENDOR_ITEM_REGULAR),
 
 		list("SIDEARMS", -1, null, null),
-		list("88 Mod 4 Combat Pistol", round(scale * 15), /obj/item/weapon/gun/pistol/mod88, VENDOR_ITEM_REGULAR),
-		list("M44 Combat Revolver", round(scale * 10), /obj/item/weapon/gun/revolver/m44, VENDOR_ITEM_REGULAR),
-		list("M4A3 Service Pistol", round(scale * 20), /obj/item/weapon/gun/pistol/m4a3, VENDOR_ITEM_REGULAR),
-		list("M82F Flare Gun", round(scale * 8), /obj/item/weapon/gun/flare, VENDOR_ITEM_REGULAR),
+		list("88 Mod 4 Combat Pistol", round(scale * 50), /obj/item/weapon/gun/pistol/mod88, VENDOR_ITEM_REGULAR),
+		list("M44 Combat Revolver", round(scale * 50), /obj/item/weapon/gun/revolver/m44, VENDOR_ITEM_REGULAR),
+		list("M4A3 Service Pistol", round(scale * 50), /obj/item/weapon/gun/pistol/m4a3, VENDOR_ITEM_REGULAR),
+		list("M82F Flare Gun", round(scale * 20), /obj/item/weapon/gun/flare, VENDOR_ITEM_REGULAR),
 
 		list("RESTRICTED FIREARMS", -1, null, null),
 		list("VP78 Pistol", round(scale * 4), /obj/item/storage/box/guncase/vp78, VENDOR_ITEM_REGULAR),
@@ -220,17 +220,17 @@
 /obj/structure/machinery/cm_vending/sorted/cargo_ammo/populate_product_list(scale)
 	listed_products = list(
 		list("REGULAR AMMUNITION", -1, null, null),
-		list("Box Of Buckshot Shells", round(scale * 2), /obj/item/ammo_magazine/shotgun/buckshot, VENDOR_ITEM_REGULAR),
-		list("Box Of Flechette Shells", round(scale * 2), /obj/item/ammo_magazine/shotgun/flechette, VENDOR_ITEM_REGULAR),
-		list("Box Of Shotgun Slugs", round(scale * 2), /obj/item/ammo_magazine/shotgun/slugs, VENDOR_ITEM_REGULAR),
-		list("M4RA Magazine (10x24mm)", round(scale * 20.8), /obj/item/ammo_magazine/rifle/m4ra, VENDOR_ITEM_REGULAR),
-		list("M41A MK2 Magazine (10x24mm)", round(scale * 18), /obj/item/ammo_magazine/rifle, VENDOR_ITEM_REGULAR),
-		list("M39 HV Magazine (10x20mm)", round(scale * 17.1), /obj/item/ammo_magazine/smg/m39, VENDOR_ITEM_REGULAR),
-		list("M44 Speed Loader (.44)", round(scale * 18.1), /obj/item/ammo_magazine/revolver, VENDOR_ITEM_REGULAR),
-		list("M4A3 Magazine (9mm)", round(scale * 20.5), /obj/item/ammo_magazine/pistol, VENDOR_ITEM_REGULAR),
+		list("Box Of Buckshot Shells", round(scale * 20), /obj/item/ammo_magazine/shotgun/buckshot, VENDOR_ITEM_REGULAR),
+		list("Box Of Flechette Shells", round(scale * 8), /obj/item/ammo_magazine/shotgun/flechette, VENDOR_ITEM_REGULAR),
+		list("Box Of Shotgun Slugs", round(scale * 20), /obj/item/ammo_magazine/shotgun/slugs, VENDOR_ITEM_REGULAR),
+		list("M4RA Magazine (10x24mm)", round(scale * 30), /obj/item/ammo_magazine/rifle/m4ra, VENDOR_ITEM_REGULAR),
+		list("M41A MK2 Magazine (10x24mm)", round(scale * 50), /obj/item/ammo_magazine/rifle, VENDOR_ITEM_REGULAR),
+		list("M39 HV Magazine (10x20mm)", round(scale * 50), /obj/item/ammo_magazine/smg/m39, VENDOR_ITEM_REGULAR),
+		list("M44 Speed Loader (.44)", round(scale * 40), /obj/item/ammo_magazine/revolver, VENDOR_ITEM_REGULAR),
+		list("M4A3 Magazine (9mm)", round(scale * 50), /obj/item/ammo_magazine/pistol, VENDOR_ITEM_REGULAR),
 
 		list("ARMOR-PIERCING AMMUNITION", -1, null, null),
-		list("88 Mod 4 AP Magazine (9mm)", round(scale * 16.7), /obj/item/ammo_magazine/pistol/mod88, VENDOR_ITEM_REGULAR),
+		list("88 Mod 4 AP Magazine (9mm)", round(scale * 50), /obj/item/ammo_magazine/pistol/mod88, VENDOR_ITEM_REGULAR),
 		list("M4RA AP Magazine (10x24mm)", round(scale * 15.7), /obj/item/ammo_magazine/rifle/m4ra/ap, VENDOR_ITEM_REGULAR),
 		list("M39 AP Magazine (10x20mm)", round(scale * 11.9), /obj/item/ammo_magazine/smg/m39/ap, VENDOR_ITEM_REGULAR),
 		list("M41A MK2 AP Magazine (10x24mm)", round(scale * 10.5), /obj/item/ammo_magazine/rifle/ap, VENDOR_ITEM_REGULAR),
@@ -259,9 +259,9 @@
 		list("M2C Box Magazine", round(scale * 2), /obj/item/ammo_magazine/m2c, VENDOR_ITEM_REGULAR),
 
 		list("SHOTGUN SHELL BOXES", -1, null, null),
-		list("Shotgun Shell Box (Buckshot x 100)", round(scale * 1), /obj/item/ammo_box/magazine/shotgun/buckshot, VENDOR_ITEM_REGULAR),
-		list("Shotgun Shell Box (Flechette x 100)", round(scale * 1), /obj/item/ammo_box/magazine/shotgun/flechette, VENDOR_ITEM_REGULAR),
-		list("Shotgun Shell Box (Slugs x 100)", round(scale * 1), /obj/item/ammo_box/magazine/shotgun, VENDOR_ITEM_REGULAR),
+		list("Shotgun Shell Box (Buckshot x 100)", round(scale * 2), /obj/item/ammo_box/magazine/shotgun/buckshot, VENDOR_ITEM_REGULAR),
+		list("Shotgun Shell Box (Flechette x 100)", round(scale * 2), /obj/item/ammo_box/magazine/shotgun/flechette, VENDOR_ITEM_REGULAR),
+		list("Shotgun Shell Box (Slugs x 100)", round(scale * 2), /obj/item/ammo_box/magazine/shotgun, VENDOR_ITEM_REGULAR),
 		)
 
 /obj/structure/machinery/cm_vending/sorted/cargo_ammo/stock(obj/item/item_to_stock, mob/user)

code/modules/gear_presets/_select_equipment.dm

@@ -430,7 +430,6 @@
 		/obj/item/tool/hatchet = null,
 		/obj/item/tool/hatchet = null,
 		/obj/item/storage/box/MRE = null,
-		/obj/item/clothing/mask/gas/pmc = null,
 		/obj/item/clothing/glasses/night/m42_night_goggles/upp = null,
 		/obj/item/storage/box/handcuffs = null,
 		/obj/item/storage/pill_bottle/happy = null,

code/modules/mob/dead/observer/orbit.dm

@@ -1,5 +1,4 @@
 /datum/orbit_menu
-	var/auto_observe = FALSE
 	var/mob/dead/observer/owner
 
 /datum/orbit_menu/New(mob/dead/observer/new_owner)
@@ -24,6 +23,7 @@
 	switch(action)
 		if("orbit")
 			var/ref = params["ref"]
+			var/auto_observe = params["auto_observe"]
 			var/atom/movable/poi = locate(ref) in GLOB.mob_list
 			if (poi == null)
 				poi = locate(ref) in GLOB.all_multi_vehicles
@@ -38,19 +38,11 @@
 		if("refresh")
 			update_static_data(owner)
 			. = TRUE
-		if("toggle_observe")
-			auto_observe = !auto_observe
-			if(auto_observe && owner.orbit_target)
-				owner.do_observe(owner.orbit_target)
-			else
-				owner.reset_perspective(null)
-			. = TRUE
 
 
 
 /datum/orbit_menu/ui_data(mob/user)
 	var/list/data = list()
-	data["auto_observe"] = auto_observe
 	return data
 
 /datum/orbit_menu/ui_static_data(mob/user)

code/modules/mob/living/carbon/human/update_icons.dm

@@ -494,7 +494,7 @@ Applied by gun suicide and high impact bullet executions, removed by rejuvenate,
 		if(istype(head, /obj/item/clothing/head/helmet/marine))
 			var/obj/item/clothing/head/helmet/marine/marine_helmet = head
 			if(assigned_squad && marine_helmet.flags_marine_helmet & HELMET_SQUAD_OVERLAY)
-				if(assigned_squad && assigned_squad.equipment_color)
+				if(assigned_squad && assigned_squad.equipment_color && assigned_squad.use_stripe_overlay)
 					var/leader = assigned_squad.squad_leader
 					var/image/helmet_overlay = image(marine_helmet.helmet_overlay_icon, icon_state = "std-helmet")
 					if(leader == src)
@@ -556,7 +556,7 @@ Applied by gun suicide and high impact bullet executions, removed by rejuvenate,
 		if(istype(wear_suit, /obj/item/clothing/suit/storage/marine))
 			var/obj/item/clothing/suit/storage/marine/marine_armor = wear_suit
 			if(marine_armor.flags_marine_armor & ARMOR_SQUAD_OVERLAY)
-				if(assigned_squad && assigned_squad.equipment_color)
+				if(assigned_squad && assigned_squad.equipment_color && assigned_squad.use_stripe_overlay)
 					var/leader = assigned_squad.squad_leader
 					var/image/squad_overlay = image(marine_armor.squad_overlay_icon, icon_state = "std-armor")
 					if(leader == src)

code/modules/mob/mob_verbs.dm

@@ -159,7 +159,7 @@
 // M.Login() //wat
 	return
 
-/*/mob/dead/observer/verb/observe()
+/mob/dead/observer/verb/observe()
 	set name = "Observe"
 	set category = "Ghost"
 
@@ -169,7 +169,7 @@
 	if(!target)
 		return
 
-	do_observe(target) */ //disabled thanks to le exploiterinos
+	do_observe(target)
 
 /mob/verb/cancel_camera()
 	set name = "Cancel Camera View"

html/changelogs/AutoChangeLog-pr-4303.yml

@@ -0,0 +1,4 @@
+author: "Huffie56"
+delete-after: True
+changes:
+  - balance: "made it so that req as double what a standard vendor as in ammo and guns."

html/changelogs/AutoChangeLog-pr-4345.yml

@@ -0,0 +1,4 @@
+author: "BeagleGaming1"
+delete-after: True
+changes:
+  - rscadd: "Uncommented the \"Observe\" verb for ghosts, allowing ghosts to see from a humans HUD"

html/changelogs/AutoChangeLog-pr-4375.yml

@@ -0,0 +1,4 @@
+author: "TheGamerdk, ihatethisengine"
+delete-after: True
+changes:
+  - rscadd: "IOs start in their own squad now"

html/changelogs/AutoChangeLog-pr-4379.yml

@@ -0,0 +1,5 @@
+author: "c4xmaniac2"
+delete-after: True
+changes:
+  - mapadd: "Readds yard to Science Annex"
+  - maptweak: "Redid the yard loot to be more in line with current surv loot standards."

html/changelogs/AutoChangeLog-pr-4386.yml

@@ -0,0 +1,5 @@
+author: "SpartanBobby, GSDPathe"
+delete-after: True
+changes:
+  - maptweak: "Changes to LV522 loot table surrounding metal spawns"
+  - maptweak: "Redectorates areas around LV522 that were underwhelming before"

html/changelogs/AutoChangeLog-pr-4420.yml

@@ -0,0 +1,4 @@
+author: "Morrow"
+delete-after: True
+changes:
+  - balance: "Removed some PMC gear on maps"

html/changelogs/archive/2023-09.yml

@@ -233,3 +233,15 @@
   - rscdel: Disables Shivas Snowball
   Private Tristan:
   - spellcheck: acid runners are now properly informed of their corrosive acid's strength.
+2023-09-19:
+  Hopek:
+  - rscadd: 'New facehugger strain:  Watcher. The Watcher loses their ability to hide
+      in exchange to see further and the ability to no longer take damage outside
+      of weeds.'
+  c4xmaniac2:
+  - balance: Moved 1/3 of all intel into the cave systems.
+  - maptweak: 1/3 of all Intel has been redistributed into the caves.
+  - maptweak: Nightmare inserts on the colony side and in the caves of LV now have
+      their intel distribution standardized.
+  realforest2001:
+  - bugfix: Fixes the CMB tradeband scanner not being able to do it's job.

maps/map_files/BigRed/standalone/crashlanding-offices.dmm

@@ -1453,15 +1453,6 @@
 	icon_state = "rasputin3"
 	},
 /area/bigredv2/outside/office_complex)
-"od" = (
-/obj/structure/bed/chair/dropship/passenger{
-	dir = 4
-	},
-/obj/item/clothing/gloves/marine/veteran/pmc,
-/turf/open/shuttle/dropship{
-	icon_state = "rasputin15"
-	},
-/area/bigredv2/outside/office_complex)
 "oF" = (
 /obj/structure/bed/chair/dropship/passenger{
 	dir = 4
@@ -1626,15 +1617,6 @@
 	icon_state = "rasputin15"
 	},
 /area/bigredv2/outside/office_complex)
-"Ra" = (
-/obj/structure/bed/chair/dropship/passenger{
-	dir = 8
-	},
-/obj/item/clothing/gloves/marine/veteran/pmc,
-/turf/open/shuttle/dropship{
-	icon_state = "rasputin15"
-	},
-/area/bigredv2/outside/office_complex)
 "Vg" = (
 /obj/effect/landmark/objective_landmark/medium,
 /turf/open/shuttle/dropship{
@@ -1939,7 +1921,7 @@ dP
 aV
 id
 yS
-od
+yS
 cE
 cM
 cM
@@ -2092,7 +2074,7 @@ aN
 bv
 dL
 bm
-od
+yS
 yS
 yS
 cu
@@ -2155,7 +2137,7 @@ bv
 aV
 fv
 dA
-Ra
+bp
 cF
 cN
 cN