Skrem is Less Dumb Edition: Modern Medievalism: Bows, Arrows, and Cloaks, oh my!

_maps/RandomRuins/LavaRuins/lavaland_surface_ash_walker1.dmm

@@ -1224,10 +1224,10 @@
 	dir = 4
 	},
 /obj/structure/table/wood,
-/obj/item/storage/belt/quiver/ashwalker{
+/obj/item/storage/belt/quiver/weaver/ashwalker{
 	pixel_y = 2
 	},
-/obj/item/storage/belt/quiver/ashwalker{
+/obj/item/storage/belt/quiver/weaver/ashwalker{
 	pixel_y = -2
 	},
 /obj/item/gun/ballistic/bow/ashen{

_maps/RandomRuins/LavaRuins/lavaland_surface_meteorite.dmm

@@ -277,7 +277,7 @@
 "fO" = (
 /obj/structure/fluff/grave/empty,
 /obj/effect/mob_spawn/human/corpse/damaged/legioninfested,
-/obj/item/ammo_casing/caseless/arrow/ash{
+/obj/item/ammo_casing/reusable/arrow/ash{
 	pixel_x = 11;
 	pixel_y = 2
 	},
@@ -809,7 +809,7 @@
 /turf/open/floor/plating/asteroid/basalt/lava_land_surface,
 /area/lavaland/surface/outdoors)
 "ov" = (
-/obj/item/ammo_casing/caseless/arrow/ash{
+/obj/item/ammo_casing/reusable/arrow/ash{
 	pixel_x = -10;
 	pixel_y = 7
 	},
@@ -1755,23 +1755,23 @@
 	pixel_x = 1;
 	pixel_y = 1
 	},
-/obj/item/storage/belt/quiver/ashwalker{
+/obj/item/storage/belt/quiver/weaver/ashwalker{
 	pixel_x = -9;
 	pixel_y = -3
 	},
 /obj/item/circular_saw/bone{
 	pixel_x = 7
 	},
-/obj/item/ammo_casing/caseless/arrow/ash,
-/obj/item/ammo_casing/caseless/arrow/ash{
+/obj/item/ammo_casing/reusable/arrow/ash,
+/obj/item/ammo_casing/reusable/arrow/ash{
 	pixel_x = 4;
 	pixel_y = -4
 	},
-/obj/item/ammo_casing/caseless/arrow/ash{
+/obj/item/ammo_casing/reusable/arrow/ash{
 	pixel_x = -5;
 	pixel_y = 2
 	},
-/obj/item/ammo_casing/caseless/arrow/ash{
+/obj/item/ammo_casing/reusable/arrow/ash{
 	pixel_x = 9;
 	pixel_y = -6
 	},
@@ -2449,11 +2449,11 @@
 /area/lavaland/surface/outdoors)
 "RF" = (
 /obj/structure/marker_beacon,
-/obj/item/ammo_casing/caseless/arrow/ash{
+/obj/item/ammo_casing/reusable/arrow/ash{
 	pixel_x = 6;
 	pixel_y = -11
 	},
-/obj/item/ammo_casing/caseless/arrow/ash,
+/obj/item/ammo_casing/reusable/arrow/ash,
 /turf/open/floor/plating/asteroid/basalt/lava_land_surface,
 /area/lavaland/surface/outdoors)
 "RG" = (

_maps/RandomRuins/StationRuins/maint/10x5/10x5_bamboo.dmm

@@ -1,14 +1,14 @@
 //MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
 "b" = (
-/obj/item/ammo_casing/caseless/arrow/bamboo{
+/obj/item/ammo_casing/reusable/arrow/bamboo{
 	pixel_x = 2;
 	pixel_y = -1
 	},
-/obj/item/ammo_casing/caseless/arrow/bamboo{
+/obj/item/ammo_casing/reusable/arrow/bamboo{
 	pixel_x = -3;
 	pixel_y = 2
 	},
-/obj/item/ammo_casing/caseless/arrow/bamboo{
+/obj/item/ammo_casing/reusable/arrow/bamboo{
 	pixel_x = -7;
 	pixel_y = 5
 	},

code/__DEFINES/combat.dm

@@ -201,6 +201,15 @@ GLOBAL_LIST_INIT(shove_disarming_types, typecacheof(list(
 #define REFLECT_NORMAL 				(1<<0)
 #define REFLECT_FAKEPROJECTILE		(1<<1)
 
+// Casing Flags //
+/* Flags for /obj/item/ammo_casing */
+/// If the ammo casing doesn't have a different live and spent icon, it will just use the non-live sprite instead
+#define CASINGFLAG_NO_LIVE_SPRITE 	(1<<0)
+/// If the ammo casing should be force eject when fired even when the gun is not semi-auto, useful for casings that delete themselves. Only works with balistic weapons
+#define CASINGFLAG_FORCE_CLEAR_CHAMBER		(1<<1)
+/// If the ammo casing should not spin when thrown
+#define CASINGFLAG_NOT_HEAVY_METAL	(1<<2)
+
 //Object/Item sharpness
 #define SHARP_NONE			0
 #define SHARP_EDGED			1
@@ -250,15 +259,15 @@ GLOBAL_LIST_INIT(shove_disarming_types, typecacheof(list(
 
 //bullet_act() return values
 /// It's a successful hit, whatever that means in the context of the thing it's hitting.
-#define BULLET_ACT_HIT				"HIT"		//It's a successful hit, whatever that means in the context of the thing it's hitting.
+#define BULLET_ACT_HIT				(1<<0)		//It's a successful hit, whatever that means in the context of the thing it's hitting.
 /// It's a blocked hit, whatever that means in the context of the thing it's hitting.
-#define BULLET_ACT_BLOCK			"BLOCK"
+#define BULLET_ACT_BLOCK			(1<<1)
 /// It pierces through the object regardless of the bullet being piercing by default.
-#define BULLET_ACT_FORCE_PIERCE		"PIERCE"
+#define BULLET_ACT_FORCE_PIERCE		(1<<2)
 /// It hit us but it should hit something on the same turf too. Usually used for turfs.
-#define BULLET_ACT_TURF				"TURF"
+#define BULLET_ACT_TURF				(1<<3)
 /// It hit something, but it should just keep going until it hit something else
-#define BULLET_ACT_PENETRATE		"PENETRATE"
+#define BULLET_ACT_PENETRATE		(1<<4)
 
 // Weather immunities //
 #define WEATHER_STORM "storm"

code/__DEFINES/dcs/signals/signals_mob/signals_mob.dm

@@ -141,6 +141,10 @@
 ///Called on user, from base of /datum/strippable_item/try_(un)equip() (atom/target, obj/item/equipping?)
 #define COMSIG_TRY_STRIP "try_strip"
 	#define COMPONENT_CANT_STRIP (1<<0)
+///Called on user by /mob/verb/quick_equip() (atom/target, obj/item/equipping?)
+#define COMSIG_MOB_QUICK_EQUIP "quick_equip"
+	/// return this if you want to stop the rest of the quick equip logic
+	#define COMPONENT_BLOCK_QUICK_EQUIP (1<<0)
 ///From /datum/component/creamed/Initialize()
 #define COMSIG_MOB_CREAMED "mob_creamed"
 ///From /obj/item/gun/proc/check_botched()

code/__DEFINES/dcs/signals/signals_object.dm

@@ -146,6 +146,24 @@
 ///from base of obj/item/hit_reaction(): (list/args)
 #define COMSIG_ITEM_HIT_REACT "item_hit_react"
 	#define COMPONENT_HIT_REACTION_BLOCK (1<<0)
+
+/// Called before an item is embedded (mob/living/carbon/target = carbon that it is getting embedded into)
+#define COMSIG_ITEM_EMBEDDED "mob_carbon_embedded" 
+	// Prevents the embed
+	#define COMSIG_ITEM_BLOCK_EMBED (1 << 0)
+
+/// Called before an item is removed from being embedded (mob/living/carbon/embedded = carbon that is currently embedded)
+#define COMSIG_ITEM_EMBED_REMOVAL "mob_carbon_embed_removal" 
+	// Prevents the removal of the embed
+	#define COMSIG_ITEM_BLOCK_EMBED_REMOVAL (1 << 0)
+	// Qdels the object when it is removed instead of droping it
+	#define COMSIG_ITEM_QDEL_EMBED_REMOVAL (1 << 1)
+
+/// Called every life tick for the embedded mob when the item is embedded (mob/living/carbon/embedded = carbon that is currently embedded)
+#define COMSIG_ITEM_EMBED_TICK "mob_carbon_embed_tick" 
+	// Prevents the rest of the tick logic for the item from proccessing
+	#define COMSIG_ITEM_BLOCK_EMBED_TICK (1 << 0)
+
 ///from base of item/sharpener/attackby(): (amount, max)
 #define COMSIG_ITEM_SHARPEN_ACT "sharpen_act"
 	#define COMPONENT_BLOCK_SHARPEN_APPLIED (1<<0)

code/__DEFINES/inventory.dm

@@ -38,7 +38,8 @@
 #define ITEM_SLOT_NECK			(1<<13)
 #define ITEM_SLOT_HANDS			(1<<14)
 #define ITEM_SLOT_BACKPACK		(1<<15)
-#define ITEM_SLOT_SUIT			(1<<16) //yogs: suit storage inventory check
+/// Prevents items from being stored in suit storage
+#define ITEM_SLOT_DENY_S_STORE	(1<<16)
 
 //SLOTS
 #define SLOT_BACK			1
@@ -100,8 +101,6 @@
 			. = ITEM_SLOT_HANDS
 		if(SLOT_IN_BACKPACK)
 			. = ITEM_SLOT_BACKPACK
-		if(SLOT_S_STORE) //yogs: suit storage inventory check
-			. = ITEM_SLOT_SUIT //yogs
 
 
 //Bit flags for the flags_inv variable, which determine when a piece of clothing hides another. IE a helmet hiding glasses.

code/__DEFINES/spells.dm

@@ -0,0 +1,11 @@
+// Invocation Defines
+#define SPELL_INVOCATION_NONE		0	// Doesn't have an invocation
+#define SPELL_INVOCATION_SAY		1	// Forces the user to say the invocation message
+#define SPELL_INVOCATION_WHISPER	2	// Forces the user to whisper the invocation message
+#define SPELL_INVOCATION_EMOTE		3	// Forces the user to emote the invocation message
+#define SPELL_INVOCATION_MESSAGE	4	// The user creates a visible message, with the invocation being visaible to others and invocation_emote_self being visible to the user
+
+// Charge Type Defines
+#define SPELL_CHARGE_TYPE_RECHARGE	0	// Spell needs to recharge between uses
+#define SPELL_CHARGE_TYPE_CHARGES	1	// Spell has a set number of uses
+#define SPELL_CHARGE_TYPE_HOLDERVAR	2	// Spell adjusts the users 'holder_var_type' by 'holder_var_amount' on use

code/_onclick/hud/radial.dm

@@ -14,16 +14,17 @@ GLOBAL_LIST_EMPTY(radial_menus)
 	var/choice
 	var/next_page = FALSE
 	var/tooltips = FALSE
+	var/active = FALSE
 
 /atom/movable/screen/radial/slice/MouseEntered(location, control, params)
 	. = ..()
-	icon_state = "radial_slice_focus"
+	icon_state = "radial_slice[active ? "_active" : ""]_focus"
 	if(tooltips)
 		openToolTip(usr, src, params, title = name, content = desc)
 
 /atom/movable/screen/radial/slice/MouseExited(location, control, params)
 	. = ..()
-	icon_state = "radial_slice"
+	icon_state = "radial_slice[active ? "_active" : ""]"
 	if(tooltips)
 		closeToolTip(usr)
 
@@ -217,6 +218,9 @@ GLOBAL_LIST_EMPTY(radial_menus)
 		var/datum/radial_menu_choice/choice_datum = choice_datums[choice_id]
 		if(choice_datum && istext(choice_datum.info))
 			E.desc = choice_datum.info
+			if(choice_datum.active)
+				E.active = TRUE
+				E.icon_state = "radial_slice_active"
 
 		E.choice = choice_id
 		E.maptext = null
@@ -349,6 +353,9 @@ GLOBAL_LIST_EMPTY(radial_menus)
 	/// If provided, will display an info button that will put this text in your chat
 	var/info
 
+	/// If the radial slice should use the active icon
+	var/active = FALSE
+
 /datum/radial_menu_choice/Destroy(force, ...)
 	. = ..()
 	QDEL_NULL(image)

code/datums/components/butchering.dm

@@ -42,6 +42,9 @@
 		for(var/i in 1 to amount)
 			new sinew (T)
 		meat.guaranteed_butcher_results.Remove(sinew)
+	var/mob/living/carbon/C = meat
+	if(istype(C))
+		C.remove_all_embedded_objects()
 	if(butcher)
 		meat.visible_message(span_notice("[butcher] butchers [meat]."))
 	ButcherEffects(meat)

code/datums/components/crafting/antag.dm

@@ -104,39 +104,77 @@
 	always_available = FALSE
 
 /datum/crafting_recipe/bola_arrow
-	name = "Bola arrow"
-	result = /obj/item/ammo_casing/caseless/arrow/bola
-	time = 3 SECONDS
-	reqs = list(/obj/item/ammo_casing/caseless/arrow = 1,
-				/obj/item/stack/sheet/silk = 1,
+	name = "Bola Arrow"
+	result = /obj/item/ammo_casing/reusable/arrow
+	time = 1.5 SECONDS
+	reqs = list(/obj/item/ammo_casing/reusable/arrow = 1,
+				/obj/item/restraints/handcuffs/cable = 1,
 				/obj/item/restraints/legcuffs/bola = 1)
-	parts = list(/obj/item/ammo_casing/caseless/arrow = 1, /obj/item/restraints/legcuffs/bola = 1)
+	blacklist = list(/obj/item/ammo_casing/reusable/arrow/toy)
+	parts = list(/obj/item/ammo_casing/reusable/arrow = 1, /obj/item/restraints/handcuffs/cable = 1, /obj/item/restraints/legcuffs/bola = 1)
 	category = CAT_WEAPONRY
 	subcategory = CAT_AMMO
 	always_available = FALSE
 
-/*
 /datum/crafting_recipe/explosive_arrow
-	name = "Explosive arrow"
-	result = /obj/item/ammo_casing/caseless/arrow/explosive
-	time = 3 SECONDS
-	reqs = list(/obj/item/ammo_casing/caseless/arrow = 1,
-				/obj/item/stack/sheet/silk = 1,
+	name = "Explosive Arrow"
+	result = /obj/item/ammo_casing/reusable/arrow
+	time = 1.5 SECONDS
+	reqs = list(/obj/item/ammo_casing/reusable/arrow = 1,
+				/obj/item/restraints/handcuffs/cable = 1,
 				/obj/item/grenade = 1)
-	parts = list(/obj/item/ammo_casing/caseless/arrow = 1, /obj/item/grenade = 1)
+	blacklist = list(/obj/item/ammo_casing/reusable/arrow/toy)
+	parts = list(/obj/item/ammo_casing/reusable/arrow = 1, /obj/item/restraints/handcuffs/cable = 1, /obj/item/grenade = 1)
 	category = CAT_WEAPONRY
 	subcategory = CAT_AMMO
 	always_available = FALSE
-*/
 
 /datum/crafting_recipe/flaming_arrow
-	name = "Flaming arrow"
-	result = /obj/item/ammo_casing/caseless/arrow/flaming
-	time = 3 SECONDS
-	reqs = list(/obj/item/ammo_casing/caseless/arrow = 1,
+	name = "Fire Arrow"
+	result = /obj/item/ammo_casing/reusable/arrow
+	time = 1.5 SECONDS
+	reqs = list(/obj/item/ammo_casing/reusable/arrow = 1,
 				/obj/item/stack/sheet/cloth = 1,
 				/datum/reagent/fuel = 10)
-	parts = list(/obj/item/ammo_casing/caseless/arrow = 1)
+	blacklist = list(/obj/item/ammo_casing/reusable/arrow/toy)
+	parts = list(/obj/item/ammo_casing/reusable/arrow = 1)
+	category = CAT_WEAPONRY
+	subcategory = CAT_AMMO
+	always_available = FALSE
+
+/datum/crafting_recipe/syringe_arrow
+	name = "Syringe Arrow"
+	result = /obj/item/ammo_casing/reusable/arrow
+	time = 1.5 SECONDS
+	reqs = list(/obj/item/ammo_casing/reusable/arrow = 1,
+				/obj/item/restraints/handcuffs/cable = 1,
+				/obj/item/reagent_containers/syringe = 1)
+	blacklist = list(/obj/item/ammo_casing/reusable/arrow/toy)
+	parts = list(/obj/item/ammo_casing/reusable/arrow = 1, /obj/item/restraints/handcuffs/cable = 1, /obj/item/reagent_containers/syringe = 1)
 	category = CAT_WEAPONRY
 	subcategory = CAT_AMMO
 	always_available = FALSE
+/*
+/datum/crafting_recipe/supermatter_sliver_arrow
+	name = "Supermatter Sliver Arrow"
+	result = /obj/item/ammo_casing/reusable/arrow/supermatter/sliver
+	time = 5 SECONDS // Need to be very careful
+	reqs = list(/obj/item/nuke_core/supermatter_sliver = 1,
+				/obj/item/scalpel/supermatter = 1,	// Needed so the sliver doesn't destroy the rod and so atmos techs can't mass produce instant dust arrows
+				/obj/item/stack/rods = 1)
+	category = CAT_WEAPONRY
+	subcategory = CAT_AMMO
+	always_available = FALSE
+
+/datum/crafting_recipe/singularity_shard_arrow
+	name = "Singularity Shard Arrow"
+	result = /obj/item/ammo_casing/reusable/arrow/singulo
+	time = 5 SECONDS
+	reqs = list(/obj/item/singularity_shard = 1,
+				/obj/item/stack/rods = 1, 
+				/obj/item/stack/cable_coil = 3)
+	parts = list(/obj/item/singularity_shard = 1)
+	category = CAT_WEAPONRY
+	subcategory = CAT_AMMO
+	always_available = FALSE
+*/

code/datums/components/crafting/tailoring.dm

@@ -541,7 +541,7 @@
 	subcategory = CAT_EQUIPMENT
 
 /datum/crafting_recipe/resinband
-	name = "Resin armband"
+	name = "Resin Armband"
 	result = /obj/item/clothing/accessory/resinband
 	time = 2 SECONDS
 	reqs = list(/obj/item/stack/sheet/ashresin = 3)
@@ -573,11 +573,18 @@
 	subcategory = CAT_EQUIPMENT
 
 /datum/crafting_recipe/quiver
-	name = "Quiver"
+	name = "Leather Quiver"
 	result = /obj/item/storage/belt/quiver
 	time = 8 SECONDS
-	reqs = list(/obj/item/stack/sheet/leather = 3,
-				/obj/item/stack/sheet/sinew = 4)
+	reqs = list(/obj/item/stack/sheet/leather = 4)
+	category = CAT_APPAREL
+	subcategory = CAT_EQUIPMENT
+
+/datum/crafting_recipe/chitinquiver
+	name = "Chitin Quiver"
+	result = /obj/item/storage/belt/quiver/weaver
+	time = 8 SECONDS
+	reqs = list(/obj/item/stack/sheet/animalhide/weaver_chitin = 4) //Just one spider!
 	category = CAT_APPAREL
 	subcategory = CAT_EQUIPMENT
 
@@ -589,3 +596,12 @@
 				/obj/item/stack/sheet/animalhide/goliath_hide = 1)
 	category = CAT_APPAREL
 	subcategory = CAT_EQUIPMENT
+
+/datum/crafting_recipe/chitingloves
+	name = "Weaver Chitin Gloves"
+	result = /obj/item/clothing/gloves/fingerless/weaver
+	time = 2 SECONDS
+	reqs = list(/obj/item/stack/sheet/leather = 1,
+				/obj/item/stack/sheet/animalhide/weaver_chitin = 3) //Also just one spider!
+	category = CAT_APPAREL
+	subcategory = CAT_EQUIPMENT