Merge remote-tracking branch 'upstream/master' into spatial-sound

code/datums/components/bonus_damage_stack.dm

@@ -60,7 +60,7 @@
 	var/color = COLOR_BONUS_DAMAGE
 	var/intensity = bonus_damage_stacks / (initial(bonus_damage_cap) * 2)
 	// if intensity is too high of a value, the hex code will become invalid
-	color += num2text(BONUS_DAMAGE_MAX_ALPHA * clamp(intensity, 0, 0.5), 1, 16)
+	color += num2text(BONUS_DAMAGE_MAX_ALPHA * clamp(intensity, 0, 0.5), 2, 16)
 	if(parent)
 		var/atom/A = parent
 		A.add_filter("bonus_damage_stacks", 2, list("type" = "outline", "color" = color, "size" = 1 + clamp(intensity, 0, 1)))

code/game/machinery/vending/vendor_types/crew/combat_correspondent.dm

@@ -3,9 +3,11 @@
 GLOBAL_LIST_INIT(cm_vending_clothing_combat_correspondent, list(
 		list("STANDARD EQUIPMENT (TAKE ALL)", 0, null, null, null),
 		list("Essential Reporter's Set", 0, /obj/effect/essentials_set/cc, MARINE_CAN_BUY_ESSENTIALS, VENDOR_ITEM_MANDATORY),
+		list("Leather Satchel", 0, /obj/item/storage/backpack/satchel, MARINE_CAN_BUY_BACKPACK, VENDOR_ITEM_REGULAR),
+
+		list("CIVILIAN EQUIPMENT (TAKE ALL)", 0, null, null, null),
 		list("Portable Press Fax Machine", 0, /obj/item/device/fax_backpack, CIVILIAN_CAN_BUY_BACKPACK, VENDOR_ITEM_RECOMMENDED),
 		list("Press Broadcasting Camera", 0, /obj/item/device/camera/broadcasting, CIVILIAN_CAN_BUY_UTILITY, VENDOR_ITEM_RECOMMENDED),
-		list("Leather Satchel", 0, /obj/item/storage/backpack/satchel, MARINE_CAN_BUY_BACKPACK, VENDOR_ITEM_REGULAR),
 
 		list("UNIFORM (CHOOSE 1)", 0, null, null, null),
 		list("Black Uniform", 0, /obj/item/clothing/under/marine/reporter/black, MARINE_CAN_BUY_UNIFORM, VENDOR_ITEM_REGULAR),

code/game/machinery/vending/vendor_types/crew/staff_officer_armory.dm

@@ -18,7 +18,7 @@ GLOBAL_LIST_INIT(cm_vending_clothing_staff_officer_armory, list(
 		list("Marine Combat Gloves", 0, /obj/item/clothing/gloves/marine, MARINE_CAN_BUY_GLOVES, VENDOR_ITEM_MANDATORY),
 		list("MRE", 0, /obj/item/storage/box/MRE, MARINE_CAN_BUY_MRE, VENDOR_ITEM_MANDATORY),
 		list("Aviator Shades", 0, /obj/item/clothing/glasses/sunglasses/aviator, MARINE_CAN_BUY_GLASSES, VENDOR_ITEM_REGULAR),
-		list("Bayonet", 0, /obj/item/attachable/bayonet, null, VENDOR_ITEM_REGULAR),
+		list("Bayonet", 0, /obj/item/attachable/bayonet, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR),
 
 		list("SPECIALISATION KIT (CHOOSE 1)", 0, null, null, null),
 		list("Essential Engineer Set", 0, /obj/effect/essentials_set/engi, MARINE_CAN_BUY_ESSENTIALS, VENDOR_ITEM_RECOMMENDED),

code/game/machinery/vending/vendor_types/crew/synthetic.dm

@@ -188,7 +188,7 @@ GLOBAL_LIST_INIT(cm_vending_clothing_synth, list(
 GLOBAL_LIST_INIT(cm_vending_clothing_synth_snowflake, list(
 	list("USCM UNIFORMS", 0, null, null, null),
 	list("Medical Scrubs, Blue", 12, /obj/item/clothing/under/rank/medical/blue, null, VENDOR_ITEM_REGULAR),
-	list("Medical Scrubs, Light Blue", 0, /obj/item/clothing/under/rank/medical/lightblue, null, VENDOR_ITEM_REGULAR),
+	list("Medical Scrubs, Light Blue", 12, /obj/item/clothing/under/rank/medical/lightblue, null, VENDOR_ITEM_REGULAR),
 	list("Medical Scrubs, Green", 12, /obj/item/clothing/under/rank/medical/green, null, VENDOR_ITEM_REGULAR),
 	list("Medical Scrubs, Purple", 12, /obj/item/clothing/under/rank/medical/purple, null, VENDOR_ITEM_REGULAR),
 	list("Medical Scrubs, Olive", 12, /obj/item/clothing/under/rank/medical/olive, null, VENDOR_ITEM_REGULAR),

code/game/objects/items/stacks/flags.dm

@@ -106,7 +106,7 @@
 	user.visible_message(SPAN_NOTICE("[user] starts taking [src] down..."), SPAN_NOTICE("You start taking [src] down..."))
 
 	playsound(loc, 'sound/effects/flag_raising.ogg', 30)
-	if(!do_after(user, 6 SECONDS, INTERRUPT_ALL, BUSY_ICON_GENERIC))
+	if(!do_after(user, 6 SECONDS, INTERRUPT_ALL, BUSY_ICON_GENERIC) || QDELETED(src))
 		return
 
 	playsound(loc, 'sound/effects/flag_raised.ogg', 30)
@@ -170,7 +170,11 @@
 	icon = 'icons/obj/structures/plantable_flag.dmi'
 	inhand_x_dimension = 64
 	inhand_y_dimension = 64
+	force = 15
+	throwforce = 5
+	hitsound = "swing_hit"
 	unacidable = TRUE
+	indestructible = TRUE
 	item_icons = list(
 		WEAR_L_HAND = 'icons/mob/humans/onmob/items_lefthand_64.dmi',
 		WEAR_R_HAND = 'icons/mob/humans/onmob/items_righthand_64.dmi'
@@ -233,12 +237,10 @@
 	if(play_warcry && user.faction == faction && user.a_intent == INTENT_HARM)
 		var/allies_nearby = 0
 		if(COOLDOWN_FINISHED(src, warcry_cooldown_item))
-			for (var/mob/living/carbon/human in orange(planted_flag, 7))
-				if (human.is_dead() || human.faction != faction)
+			for(var/mob/living/carbon/human in orange(planted_flag, 7))
+				if(human.is_dead() || human.faction != faction)
 					continue
 				allies_nearby++
-				if (prob(40) && human != user)
-					human.emote("warcry")
 
 		user.show_speech_bubble("warcry")
 		if(allies_nearby >= allies_required)

code/game/objects/structures/stool_bed_chair_nest/wheelchair.dm

@@ -36,12 +36,12 @@
 			move_delay += 4 //harder to move a wheelchair with a single hand
 			working_hands--
 		else if((left_hand.status & LIMB_BROKEN) && !(left_hand.status & LIMB_SPLINTED))
-			move_delay++
+			move_delay ++
 		if(!right_hand || (right_hand.status & LIMB_DESTROYED))
 			move_delay += 4
 			working_hands--
 		else if((right_hand.status & LIMB_BROKEN) && !(right_hand.status & LIMB_SPLINTED))
-			move_delay += 2
+			move_delay++
 		if(!working_hands)
 			return // No hands to drive your chair? Tough luck!
 		if(driver.pulling && driver.pulling.drag_delay && driver.get_pull_miltiplier()) //Dragging stuff can slow you down a bit.

code/modules/gear_presets/other.dm

@@ -504,29 +504,6 @@
 	new_human.equip_if_possible(new /obj/item/clothing/glasses/sunglasses, WEAR_EYES)
 	new_human.equip_if_possible(new /obj/item/clipboard, WEAR_WAIST)
 
-//*****************************************************************************************************/
-
-/datum/equipment_preset/other/compression_suit
-	name = "Mk50 Compression Suit"
-	flags = EQUIPMENT_PRESET_EXTRA
-	faction = FACTION_PMC
-	skills = /datum/skills/pfc
-	idtype = /obj/item/card/id/data
-
-/datum/equipment_preset/other/compression_suit/load_gear(mob/living/carbon/human/new_human)
-	//TODO: add backpacks and satchels
-	new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/magboots, WEAR_FEET)
-
-	new_human.equip_to_slot_or_del(new /obj/item/clothing/under/colonist, WEAR_BODY)
-	new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/space/compression, WEAR_JACKET)
-	new_human.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/space/compression, WEAR_HEAD)
-	var /obj/item/tank/jetpack/J = new /obj/item/tank/jetpack/oxygen(new_human)
-	new_human.equip_to_slot_or_del(J, WEAR_BACK)
-	J.toggle()
-	new_human.equip_to_slot_or_del(new /obj/item/clothing/mask/breath, WEAR_FACE)
-	J.Topic(null, list("stat" = 1))
-	spawn_merc_weapon(new_human)
-
 
 //*****************************************************************************************************/
 

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

@@ -105,12 +105,6 @@
 	//Can we act
 	if(is_mob_restrained()) return 0
 
-	//Do we have a working jetpack
-	if(istype(back, /obj/item/tank/jetpack))
-		var/obj/item/tank/jetpack/J = back
-		if(((!check_drift) || (check_drift && J.stabilization_on)) && (body_position == STANDING_UP) && (J.allow_thrust(0.01, src)))
-			inertia_dir = 0
-			return 1
 // if(!check_drift && J.allow_thrust(0.01, src))
 // return 1
 

colonialmarines.dme

@@ -1249,7 +1249,6 @@
 #include "code\game\objects\items\storage\toolbox.dm"
 #include "code\game\objects\items\storage\toolkit.dm"
 #include "code\game\objects\items\storage\wallets.dm"
-#include "code\game\objects\items\tanks\jetpack.dm"
 #include "code\game\objects\items\tanks\tank_types.dm"
 #include "code\game\objects\items\tanks\tanks.dm"
 #include "code\game\objects\items\tools\cleaning_tools.dm"
@@ -1346,7 +1345,6 @@
 #include "code\game\objects\structures\crates_lockers\closets\gimmick.dm"
 #include "code\game\objects\structures\crates_lockers\closets\job_closets.dm"
 #include "code\game\objects\structures\crates_lockers\closets\l3closet.dm"
-#include "code\game\objects\structures\crates_lockers\closets\malfunction.dm"
 #include "code\game\objects\structures\crates_lockers\closets\utility_closets.dm"
 #include "code\game\objects\structures\crates_lockers\closets\wall_locker.dm"
 #include "code\game\objects\structures\crates_lockers\closets\wardrobe.dm"

html/changelogs/AutoChangeLog-pr-6676.yml

@@ -0,0 +1,4 @@
+author: "realforest2001"
+delete-after: True
+changes:
+  - rscadd: "The Combat Correspondant's civilian equipment is now in it's own category to make it easier to tell why you can't click it as the military version."

html/changelogs/AutoChangeLog-pr-6713.yml

@@ -0,0 +1,4 @@
+author: "SpypigDev"
+delete-after: True
+changes:
+  - bugfix: "SO Armory vendors no longer infinitely supply knives"

html/changelogs/AutoChangeLog-pr-6717.yml

@@ -0,0 +1,4 @@
+author: "Drathek"
+delete-after: True
+changes:
+  - bugfix: "Fixed light blue scrubs having no cost in snowflake vendor."

html/changelogs/AutoChangeLog-pr-6720.yml

@@ -0,0 +1,4 @@
+author: "cuberound"
+delete-after: True
+changes:
+  - bugfix: "having left hand broken and not splinted has the same effect on wheelchair movement speed as right hand"

html/changelogs/AutoChangeLog-pr-6729.yml

@@ -0,0 +1,4 @@
+author: "cuberound"
+delete-after: True
+changes:
+  - rscdel: "Removed malfanction closet"

html/changelogs/AutoChangeLog-pr-6737.yml

@@ -0,0 +1,6 @@
+author: "Zonespace, Vile Beggar"
+delete-after: True
+changes:
+  - rscadd: "Handheld planted flags are now indestructible and do a small amount of damage on hit."
+  - bugfix: "Plantable flags can no longer be duplicated."
+  - rscdel: "Planting a UA flag no longer forces anyone but the planter to warcry."

html/changelogs/AutoChangeLog-pr-6738.yml

@@ -0,0 +1,4 @@
+author: "cuberound"
+delete-after: True
+changes:
+  - bugfix: "corrects holoround highligh alpha value"

html/changelogs/AutoChangeLog-pr-6745.yml

@@ -0,0 +1,4 @@
+author: "kiVts"
+delete-after: True
+changes:
+  - bugfix: "Surgery sound and alike is fixed"

maps/map_files/FOP_v3_Sciannex/Fiorina_SciAnnex.dmm

@@ -25377,7 +25377,6 @@
 /turf/open/floor/prison/sterile_white/southwest,
 /area/fiorina/station/medbay)
 "tpE" = (
-/obj/item/tank/jetpack/carbondioxide,
 /obj/structure/surface/rack,
 /turf/open/floor/prison/floor_plate,
 /area/fiorina/tumor/servers)