TGS Test Merge (#6015)

code/datums/map_config.dm

@@ -83,18 +83,20 @@
 		/datum/equipment_preset/synth/survivor/medical_synth,
 		/datum/equipment_preset/synth/survivor/emt_synth,
 		/datum/equipment_preset/synth/survivor/scientist_synth,
+		/datum/equipment_preset/synth/survivor/archaeologist_synth,
 		/datum/equipment_preset/synth/survivor/engineer_synth,
-		/datum/equipment_preset/synth/survivor/janitor_synth,
 		/datum/equipment_preset/synth/survivor/chef_synth,
 		/datum/equipment_preset/synth/survivor/teacher_synth,
+		/datum/equipment_preset/synth/survivor/surveyor_synth,
 		/datum/equipment_preset/synth/survivor/freelancer_synth,
 		/datum/equipment_preset/synth/survivor/trucker_synth,
 		/datum/equipment_preset/synth/survivor/bartender_synth,
-		/datum/equipment_preset/synth/survivor/detective_synth,
+		/datum/equipment_preset/synth/survivor/atc_synth,
 		/datum/equipment_preset/synth/survivor/cmb_synth,
 		/datum/equipment_preset/synth/survivor/wy/security_synth,
 		/datum/equipment_preset/synth/survivor/wy/protection_synth,
 		/datum/equipment_preset/synth/survivor/wy/corporate_synth,
+		/datum/equipment_preset/synth/survivor/icc_synth,
 		/datum/equipment_preset/synth/survivor/radiation_synth,
 	)
 

code/game/objects/items/tools/kitchen_tools.dm

@@ -126,7 +126,7 @@
 	flags_atom = FPRINT|CONDUCT
 	sharp = IS_SHARP_ITEM_ACCURATE
 	edge = 1
-	force = 10
+	force = MELEE_FORCE_TIER_4
 	w_class = SIZE_MEDIUM
 	throwforce = 6
 	throw_speed = SPEED_VERY_FAST
@@ -143,7 +143,7 @@
 	icon_state = "butch"
 	desc = "A huge thing used for chopping and chopping up meat. This includes clowns and clown-by-products."
 	flags_atom = FPRINT|CONDUCT
-	force = 15
+	force = MELEE_FORCE_NORMAL
 	w_class = SIZE_SMALL
 	throwforce = 8
 	throw_speed = SPEED_VERY_FAST

code/game/objects/items/tools/mining_tools.dm

@@ -8,10 +8,11 @@
 	icon_state = "pickaxe"
 	flags_atom = FPRINT|CONDUCT
 	flags_equip_slot = SLOT_WAIST
-	force = 15
+	force = MELEE_FORCE_STRONG
 	throwforce = 4
 	item_state = "pickaxe"
 	w_class = SIZE_LARGE
+	hitsound = 'sound/weapons/bladeslice.ogg'
 	matter = list("metal" = 3750)
 	/// moving the delay to an item var so R&D can make improved picks. --NEO
 	var/digspeed = 40

code/game/objects/items/weapons/swords_axes_etc.dm

@@ -23,7 +23,7 @@
 	icon_state = "baton"
 	item_state = "classic_baton"
 	flags_equip_slot = SLOT_WAIST
-	force = MELEE_FORCE_WEAK
+	force = MELEE_FORCE_NORMAL
 
 /obj/item/weapon/classic_baton/attack(mob/M as mob, mob/living/user as mob)
 	if(!..())

code/modules/gear_presets/survivors/lv_522/forcon_survivors.dm

@@ -278,7 +278,7 @@
 //----------------------\\
 
 /datum/equipment_preset/synth/survivor/forecon
-	name = "Survivor - USCM Synthetic"
+	name = "Survivor - Synthetic - FORECON Synth"
 	assignment = JOB_FORECON_SYN
 	faction_group = list(FACTION_MARINE, FACTION_SURVIVOR)
 	idtype = /obj/item/card/id/gold

code/modules/gear_presets/survivors/trijent/crashlanding_upp_bar_insert_trijent.dm

@@ -209,4 +209,5 @@
 	new_human.equip_to_slot_or_del(new /obj/item/clothing/accessory/patch/upp/airborne, WEAR_ACCESSORY)
 	new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/marine/veteran, WEAR_HANDS)
 	new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/tools/uppsynth, WEAR_R_STORE)
+	new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/survival/synth/full, WEAR_L_STORE)
 	new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/upp/knife, WEAR_FEET)

code/modules/gear_presets/synths.dm

@@ -119,7 +119,7 @@
 		WEAR_WAIST = /obj/item/storage/belt/utility/full,
 		WEAR_R_STORE = /obj/item/storage/pouch/tools/full,
 		WEAR_FEET = /obj/item/clothing/shoes/marine/knife,
-		WEAR_L_HAND = /obj/item/weapon/twohanded/fireaxe
+		WEAR_L_HAND = /obj/item/maintenance_jack
 	)
 
 	var/survivor_variant = CIVILIAN_SURVIVOR
@@ -173,6 +173,7 @@
 		WEAR_FACE = /obj/item/clothing/mask/surgical,
 		WEAR_EYES = /obj/item/clothing/glasses/hud/health,
 		WEAR_BODY = /obj/item/clothing/under/rank/medical,
+		WEAR_ACCESSORY = /obj/item/clothing/accessory/armband/medgreen,
 		WEAR_BACK = /obj/item/storage/backpack/satchel/med,
 		WEAR_IN_BACK = /obj/item/roller/surgical,
 		WEAR_JACKET = /obj/item/clothing/suit/storage/hazardvest/blue,
@@ -194,6 +195,7 @@
 		WEAR_FACE = /obj/item/clothing/mask/surgical,
 		WEAR_EYES = /obj/item/clothing/glasses/hud/health,
 		WEAR_BODY = /obj/item/clothing/under/colonist/ua_civvies,
+		WEAR_ACCESSORY = /obj/item/clothing/accessory/armband/med,
 		WEAR_BACK = /obj/item/storage/backpack/satchel/med,
 		WEAR_IN_BACK = /obj/item/storage/firstaid/adv,
 		WEAR_IN_BACK = /obj/item/tool/extinguisher/mini,
@@ -230,21 +232,38 @@
 
 	survivor_variant = SCIENTIST_SURVIVOR
 
+/datum/equipment_preset/synth/survivor/archaeologist_synth
+	name = "Survivor - Synthetic - Archaeologist Synth"
+	equipment_to_spawn = list(
+		WEAR_HEAD = /obj/item/clothing/head/hardhat/orange,
+		WEAR_BODY = /obj/item/clothing/under/rank/miner,
+		WEAR_BACK = /obj/item/storage/backpack/satchel/eng,
+		WEAR_IN_BACK = /obj/item/tool/shovel/spade,
+		WEAR_JACKET = /obj/item/clothing/suit/storage/utility_vest,
+		WEAR_IN_JACKET = /obj/item/explosive/plastic,
+		WEAR_WAIST = /obj/item/device/flashlight/lantern,
+		WEAR_R_HAND = /obj/item/stack/sandbags_empty/half,
+		WEAR_FEET = /obj/item/clothing/shoes/marine/knife,
+		WEAR_L_HAND = /obj/item/tool/pickaxe/hammer
+	)
+
+	survivor_variant = SCIENTIST_SURVIVOR
+
 /datum/equipment_preset/synth/survivor/engineer_synth
 	name = "Survivor - Synthetic - Engineer Synth"
 	equipment_to_spawn = list(
 		WEAR_HEAD = /obj/item/clothing/head/hardhat,
 		WEAR_BODY = /obj/item/clothing/under/rank/engineer,
+		WEAR_ACCESSORY = /obj/item/clothing/accessory/armband/engine,
 		WEAR_BACK = /obj/item/storage/backpack/satchel/eng,
-		WEAR_IN_BACK = /obj/item/ammo_magazine/smg/nailgun,
+		WEAR_IN_BACK = /obj/item/stack/sheet/metal/med_small_stack,
 		WEAR_JACKET = /obj/item/clothing/suit/storage/hazardvest/yellow,
 		WEAR_IN_JACKET = /obj/item/ammo_magazine/smg/nailgun,
-		WEAR_IN_JACKET = /obj/item/ammo_magazine/smg/nailgun,
 		WEAR_J_STORE = /obj/item/weapon/gun/smg/nailgun/compact,
 		WEAR_WAIST = /obj/item/storage/belt/utility/full,
 		WEAR_R_STORE = /obj/item/storage/pouch/tools/full,
 		WEAR_FEET = /obj/item/clothing/shoes/marine/knife,
-		WEAR_L_HAND = /obj/item/weapon/twohanded/fireaxe
+		WEAR_L_HAND = /obj/item/maintenance_jack
 	)
 
 	survivor_variant = ENGINEERING_SURVIVOR
@@ -259,6 +278,7 @@
 		WEAR_HEAD = /obj/item/clothing/head/soft/purple,
 		WEAR_EYES = /obj/item/clothing/glasses/mgoggles,
 		WEAR_BODY = /obj/item/clothing/under/rank/janitor,
+		WEAR_ACCESSORY = /obj/item/clothing/accessory/armband/med,
 		WEAR_BACK = /obj/item/storage/backpack/satchel/vir,
 		WEAR_IN_BACK = /obj/item/reagent_container/glass/bucket,
 		WEAR_IN_BACK = /obj/item/tool/wet_sign,
@@ -269,7 +289,7 @@
 		WEAR_R_HAND = /obj/item/tool/mop,
 		WEAR_R_STORE = /obj/item/storage/pouch/tools/full,
 		WEAR_FEET = /obj/item/clothing/shoes/galoshes,
-		WEAR_L_HAND = /obj/item/weapon/twohanded/fireaxe
+		WEAR_L_HAND = /obj/item/weapon/twohanded/spear
 	)
 
 /datum/equipment_preset/synth/survivor/chef_synth
@@ -285,7 +305,7 @@
 		WEAR_JACKET = /obj/item/clothing/suit/chef,
 		WEAR_HANDS = /obj/item/clothing/gloves/latex,
 		WEAR_FEET = /obj/item/clothing/shoes/marine/knife,
-		WEAR_L_HAND = /obj/item/weapon/twohanded/fireaxe
+		WEAR_L_HAND = /obj/item/tool/kitchen/knife/butcher
 	)
 
 /datum/equipment_preset/synth/survivor/teacher_synth
@@ -294,14 +314,14 @@
 		WEAR_EYES = /obj/item/clothing/glasses/regular/hipster,
 		WEAR_BODY = /obj/item/clothing/under/colonist/wy_davisone,
 		WEAR_BACK = /obj/item/storage/backpack/satchel/norm,
-		WEAR_IN_BACK = /obj/item/reagent_container/food/snacks/wrapped/booniebars,
 		WEAR_IN_BACK = /obj/item/reagent_container/food/snacks/wy_chips/pepper,
-		WEAR_IN_BACK = /obj/item/reagent_container/spray/cleaner,
+		WEAR_IN_BACK = /obj/item/storage/box/pdt_kit,
 		WEAR_JACKET = /obj/item/clothing/suit/storage/bomber/alt,
-		WEAR_IN_JACKET = /obj/item/storage/box/pdt_kit,
+		WEAR_IN_JACKET = /obj/item/device/healthanalyzer,
+		WEAR_WAIST = /obj/item/reagent_container/spray/cleaner,
 		WEAR_R_HAND = /obj/item/storage/fancy/crayons,
 		WEAR_FEET = /obj/item/clothing/shoes/marine/knife,
-		WEAR_L_HAND = /obj/item/storage/large_holster/machete/full
+		WEAR_L_HAND = /obj/item/weapon/butterfly/switchblade
 	)
 
 /datum/equipment_preset/synth/survivor/freelancer_synth
@@ -321,6 +341,24 @@
 		WEAR_L_HAND = /obj/item/storage/large_holster/katana/full
 	)
 
+/datum/equipment_preset/synth/survivor/surveyor_synth
+	name = "Survivor - Synthetic - Surveyor Synth"
+	equipment_to_spawn = list(
+		WEAR_HEAD = /obj/item/clothing/head/cmcap/flap,
+		WEAR_FACE = /obj/item/clothing/mask/tornscarf,
+		WEAR_BODY = /obj/item/clothing/under/rank/synthetic/utility,
+		WEAR_BACK = /obj/item/storage/backpack/lightpack/five_slot,
+		WEAR_IN_BACK = /obj/item/storage/box/m94,
+		WEAR_JACKET = /obj/item/clothing/suit/storage/windbreaker/windbreaker_covenant,
+		WEAR_IN_JACKET = /obj/item/device/binoculars,
+		WEAR_WAIST = /obj/item/storage/backpack/general_belt,
+		WEAR_IN_BELT = /obj/item/stack/flag/green,
+		WEAR_HANDS = /obj/item/clothing/gloves/marine/veteran,
+		WEAR_R_HAND = /obj/item/storage/box/lightstick,
+		WEAR_FEET = /obj/item/clothing/shoes/marine/knife,
+		WEAR_L_HAND = /obj/item/storage/large_holster/machete/full
+	)
+
 /datum/equipment_preset/synth/survivor/trucker_synth
 	name = "Survivor - Synthetic - Trucker Synth"
 	equipment_to_spawn = list(
@@ -343,13 +381,31 @@
 		WEAR_IN_BACK = /obj/item/reagent_container/food/drinks/bottle/tequila,
 		WEAR_IN_BACK = /obj/item/reagent_container/food/drinks/bottle/cognac,
 		WEAR_IN_BACK = /obj/item/reagent_container/food/drinks/bottle/grenadine,
-		WEAR_IN_BACK = /obj/item/reagent_container/food/drinks/bottle/rum,
-		WEAR_JACKET = /obj/item/clothing/suit/storage/lawyer/bluejacket,
+		WEAR_JACKET = /obj/item/clothing/suit/storage/wcoat,
+		WEAR_IN_JACKET = /obj/item/reagent_container/food/drinks/bottle/rum,
 		WEAR_HANDS = /obj/item/clothing/gloves/marine/black,
 		WEAR_R_HAND = /obj/item/storage/beer_pack,
 		WEAR_R_STORE = /obj/item/storage/pouch/tools/full,
 		WEAR_FEET = /obj/item/clothing/shoes/marine/knife,
-		WEAR_L_HAND = /obj/item/weapon/twohanded/fireaxe
+		WEAR_L_HAND = /obj/item/weapon/baseballbat
+	)
+
+/datum/equipment_preset/synth/survivor/atc_synth
+	name = "Survivor - Synthetic - Landing Pad Attendant Synth"
+	equipment_to_spawn = list(
+		WEAR_R_EAR = /obj/item/clothing/ears/earmuffs,
+		WEAR_HEAD = /obj/item/clothing/head/cmcap,
+		WEAR_BODY = /obj/item/clothing/under/rank/synthetic/utility/yellow,
+		WEAR_BACK = /obj/item/storage/backpack/satchel/norm,
+		WEAR_IN_BACK = /obj/item/storage/box/m94,
+		WEAR_JACKET = /obj/item/clothing/suit/storage/hazardvest,
+		WEAR_IN_JACKET = /obj/item/device/binoculars,
+		WEAR_WAIST = /obj/item/storage/backpack/general_belt,
+		WEAR_IN_BELT = /obj/item/stack/flag/red,
+		WEAR_HANDS = /obj/item/clothing/gloves/marine/veteran,
+		WEAR_R_HAND = /obj/item/storage/box/lightstick/red,
+		WEAR_FEET = /obj/item/clothing/shoes/marine/knife,
+		WEAR_L_HAND = /obj/item/storage/large_holster/machete/full
 	)
 
 /datum/equipment_preset/synth/survivor/detective_synth
@@ -405,13 +461,15 @@
 		WEAR_EYES = /obj/item/clothing/glasses/sunglasses/sechud,
 		WEAR_BODY = /obj/item/clothing/under/colonist/white_service,
 		WEAR_BACK = /obj/item/storage/backpack/satchel/sec,
-		WEAR_IN_BACK = /obj/item/weapon/telebaton,
+		WEAR_IN_BACK = /obj/item/handcuffs/zip,
+		WEAR_IN_BACK = /obj/item/handcuffs/zip,
 		WEAR_JACKET = /obj/item/clothing/suit/storage/webbing,
+		WEAR_IN_JACKET = /obj/item/weapon/telebaton,
 		WEAR_WAIST = /obj/item/storage/belt/security/MP/full,
 		WEAR_HANDS = /obj/item/clothing/gloves/black,
 		WEAR_R_STORE = /obj/item/storage/pouch/tools/full,
 		WEAR_FEET = /obj/item/clothing/shoes/marine/knife,
-		WEAR_L_HAND = /obj/item/weapon/twohanded/fireaxe
+		WEAR_L_HAND = /obj/item/weapon/classic_baton
 	)
 
 	survivor_variant = SECURITY_SURVIVOR
@@ -427,9 +485,7 @@
 		WEAR_BODY = /obj/item/clothing/under/marine/veteran/pmc,
 		WEAR_ACCESSORY = /obj/item/clothing/accessory/storage/droppouch,
 		WEAR_IN_ACCESSORY = /obj/item/explosive/grenade/flashbang,
-		WEAR_IN_ACCESSORY = /obj/item/handcuffs/zip,
-		WEAR_IN_ACCESSORY = /obj/item/handcuffs/zip,
-		WEAR_BACK = /obj/item/storage/backpack/lightpack,
+		WEAR_BACK = /obj/item/storage/backpack/lightpack/five_slot,
 		WEAR_IN_BACK = /obj/item/device/binoculars,
 		WEAR_JACKET = /obj/item/clothing/suit/storage/hazardvest/black,
 		WEAR_IN_JACKET = /obj/item/weapon/telebaton,
@@ -446,13 +502,12 @@
 	role_comm_title = "WY Syn"
 	equipment_to_spawn = list(
 		WEAR_L_EAR = /obj/item/device/radio/headset/distress/WY,
+		WEAR_R_EAR = /obj/item/tool/pen/clicky,
 		WEAR_BODY = /obj/item/clothing/under/suit_jacket/trainee,
 		WEAR_BACK = /obj/item/storage/backpack/satchel/lockable,
-		WEAR_IN_BACK = /obj/item/paper,
-		WEAR_IN_BACK = /obj/item/paper,
+		WEAR_IN_BACK = /obj/item/notepad,
 		WEAR_IN_BACK = /obj/item/folder,
 		WEAR_IN_BACK = /obj/item/paper/research_notes/good,
-		WEAR_IN_BACK = /obj/item/tool/pen/clicky,
 		WEAR_IN_BACK = /obj/item/device/taperecorder,
 		WEAR_WAIST = /obj/item/storage/belt/utility/full,
 		WEAR_HANDS = /obj/item/clothing/gloves/botanic_leather,
@@ -463,20 +518,42 @@
 
 	survivor_variant = CORPORATE_SURVIVOR
 
+/datum/equipment_preset/synth/survivor/icc_synth
+	name = "Survivor - Synthetic - Interstellar Commerce Commission Synthetic"
+	idtype = /obj/item/card/id/silver/cl
+	role_comm_title = "ICC Syn"
+	equipment_to_spawn = list(
+		WEAR_L_EAR = /obj/item/device/radio/headset/distress/CMB/limited,
+		WEAR_R_EAR = /obj/item/tool/pen/clicky,
+		WEAR_HEAD = /obj/item/clothing/head/hardhat/white,
+		WEAR_BODY = /obj/item/clothing/under/liaison_suit/black,
+		WEAR_BACK = /obj/item/storage/backpack/satchel/lockable,
+		WEAR_IN_BACK = /obj/item/notepad,
+		WEAR_IN_BACK = /obj/item/folder,
+		WEAR_IN_BACK = /obj/item/paper/research_notes/good,
+		WEAR_WAIST = /obj/item/clipboard,
+		WEAR_JACKET = /obj/item/clothing/suit/storage/hazardvest/yellow,
+		WEAR_IN_JACKET = /obj/item/device/taperecorder,
+		WEAR_FEET = /obj/item/clothing/shoes/dress,
+		WEAR_R_HAND = /obj/item/device/camera,
+		WEAR_L_HAND = /obj/item/weapon/twohanded/fireaxe
+	)
+
+	survivor_variant = CORPORATE_SURVIVOR
+
 /datum/equipment_preset/synth/survivor/radiation_synth
 	name = "Survivor - Synthetic - Radiation Synth"
 	equipment_to_spawn = list(
 		WEAR_HEAD = /obj/item/clothing/head/radiation,
 		WEAR_BODY = /obj/item/clothing/under/marine/officer/engi,
 		WEAR_BACK = /obj/item/storage/backpack/satchel/eng,
 		WEAR_IN_BACK = /obj/item/tool/weldingtool/hugetank,
-		WEAR_IN_BACK = /obj/item/storage/firstaid/toxin,
 		WEAR_JACKET = /obj/item/clothing/suit/radiation,
 		WEAR_WAIST = /obj/item/tank/emergency_oxygen/double,
 		WEAR_HANDS = /obj/item/clothing/gloves/yellow,
-		WEAR_R_HAND = /obj/item/device/motiondetector,
+		WEAR_R_HAND = /obj/item/storage/pouch/electronics/full,
 		WEAR_FEET = /obj/item/clothing/shoes/marine/knife,
-		WEAR_L_HAND = /obj/item/weapon/twohanded/fireaxe
+		WEAR_L_HAND = /obj/item/maintenance_jack
 	)
 
 	survivor_variant = ENGINEERING_SURVIVOR