Merge branch 'PvE-CMSS13:master' into master

cmss13-devs · Apr 8, 2024 · 5c27cc6 · 5c27cc6
2 parents 298847c + 0976be2
commit 5c27cc6
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 1 deletion.
diff --git a/code/modules/clothing/suits/marine_armor.dm b/code/modules/clothing/suits/marine_armor.dm
@@ -396,6 +396,9 @@
 		/obj/item/device/motiondetector,
 		/obj/item/device/walkman,
 	)
+	var/list/smartgun_back = list(
+		/obj/item/storage/large_holster/machete,
+	)
 
 /obj/item/clothing/suit/storage/marine/smartgunner/Initialize()
 	. = ..()
@@ -424,6 +427,10 @@
 	if(slot != WEAR_BACK)
 		return
 
+
+	if(is_type_in_list(equipping_item, smartgun_back))
+		return
+
 	. = COMPONENT_HUMAN_CANCEL_ATTEMPT_EQUIP
 
 	if(equipping_item.flags_equip_slot == SLOT_BACK)

diff --git a/code/modules/projectiles/gun_helpers.dm b/code/modules/projectiles/gun_helpers.dm
@@ -312,7 +312,7 @@ DEFINES in setup.dm, referenced here.
 			var/tac_reload_time = 15
 			if(user.skills)
 				tac_reload_time = max(15 - 5*user.skills.get_skill_level(SKILL_FIREARMS), 5)
-			if(do_after(user,tac_reload_time, INTERRUPT_ALL, BUSY_ICON_FRIENDLY) && magazine.loc == old_mag_loc && !current_mag)
+			if(do_after(user,tac_reload_time, (INTERRUPT_ALL & (~INTERRUPT_MOVED)) , BUSY_ICON_FRIENDLY) && magazine.loc == old_mag_loc && !current_mag)
 				if(isstorage(magazine.loc))
 					var/obj/item/storage/master_storage = magazine.loc
 					master_storage.remove_from_storage(magazine)

diff --git a/icons/mob/humans/onmob/belt.dmi b/icons/mob/humans/onmob/belt.dmi
diff --git a/icons/obj/structures/doors/securedoor.dmi b/icons/obj/structures/doors/securedoor.dmi