Merge remote-tracking branch 'citadel/master' into projectiles_2

code/game/objects/items/grenades/chem_grenade.dm

@@ -97,8 +97,7 @@
 		to_chat(user, "<span class='notice'>You add [A] to the [initial(name)] assembly.</span>")
 
 	else if(stage == EMPTY && istype(I, /obj/item/stack/cable_coil))
-		var/obj/item/stack/cable_coil/C = I
-		if (C.use(1))
+		if (I.use_tool(src, user, 0, 1, max_level = JOB_SKILL_BASIC))
 			det_time = 50 // In case the cable_coil was removed and readded.
 			stage_change(WIRED)
 			to_chat(user, "<span class='notice'>You rig the [initial(name)] assembly.</span>")

code/game/objects/items/handcuffs.dm

@@ -118,7 +118,7 @@
 	righthand_file = 'icons/mob/inhands/equipment/tools_righthand.dmi'
 	custom_materials = list(/datum/material/iron=150, /datum/material/glass=75)
 	breakouttime = 300 //Deciseconds = 30s
-	cuffsound = 'sound/weapons/cablecuff.ogg' 
+	cuffsound = 'sound/weapons/cablecuff.ogg'
 
 /obj/item/restraints/handcuffs/cable/attack_self(mob/user)
 	to_chat(user, "<span class='notice'>You start unwinding the cable restraints back into coil</span>")
@@ -130,7 +130,7 @@
 	user.put_in_hands(coil)
 	coil.color = color
 	to_chat(user, "<span class='notice'>You unwind the cable restraints back into coil</span>")
-	
+
 /obj/item/restraints/handcuffs/cable/red
 	color = "#ff0000"
 
@@ -225,7 +225,6 @@
 /obj/item/restraints/handcuffs/fake/kinky
 	name = "kinky handcuffs"
 	desc = "Fake handcuffs meant for erotic roleplay."
-	icon = 'modular_citadel/icons/obj/items_and_weapons.dmi'
 	icon_state = "handcuffgag"
 	item_state = "kinkycuff"
 

code/game/objects/items/melee/misc.dm

@@ -325,7 +325,7 @@
 			else
 				target.LAssailant = WEAKREF(user)
 			cooldown_check = world.time + cooldown
-			user.adjustStaminaLossBuffered(getweight())//CIT CHANGE - makes swinging batons cost stamina
+			user.adjustStaminaLossBuffered(getweight(user, STAM_COST_BATON_MOB_MULT))
 		else
 			var/wait_desc = get_wait_description()
 			if(wait_desc)

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

@@ -59,6 +59,9 @@
 	self_delay = 20
 	grind_results = list(/datum/reagent/medicine/styptic_powder = 10)
 
+/obj/item/stack/medical/bruise_pack/one
+	amount = 1
+
 /obj/item/stack/medical/bruise_pack/heal(mob/living/M, mob/user)
 	if(M.stat == DEAD)
 		to_chat(user, "<span class='notice'> [M] is dead. You can not help [M.p_them()]!</span>")
@@ -134,6 +137,9 @@
 	singular_name = "sterilized medical gauze"
 	self_delay = 5
 
+/obj/item/stack/medical/gauze/adv/one
+	amount = 1
+
 /obj/item/stack/medical/gauze/cyborg
 	custom_materials = null
 	is_cyborg = 1
@@ -151,6 +157,9 @@
 	self_delay = 20
 	grind_results = list(/datum/reagent/medicine/silver_sulfadiazine = 10)
 
+/obj/item/stack/medical/ointment/one
+	amount = 1
+
 /obj/item/stack/medical/ointment/heal(mob/living/M, mob/user)
 	if(M.stat == DEAD)
 		to_chat(user, "<span class='notice'> [M] is dead. You can not help [M.p_them()]!</span>")

code/game/objects/items/stacks/sheets/glass.dm

@@ -69,7 +69,7 @@ GLOBAL_LIST_INIT(glass_recipes, list ( \
 		if (get_amount() < 1 || CC.get_amount() < 5)
 			to_chat(user, "<span class='warning>You need five lengths of coil and one sheet of glass to make wired glass!</span>")
 			return
-		CC.use(5)
+		CC.use_tool(src, user, 0, 5, max_level = JOB_SKILL_BASIC)
 		use(1)
 		to_chat(user, "<span class='notice'>You attach wire to the [name].</span>")
 		var/obj/item/stack/light_w/new_tile = new(user.loc)

code/game/objects/items/stunbaton.dm

@@ -163,7 +163,7 @@
 	if(status)
 		if(baton_stun(M, user, disarming))
 			user.do_attack_animation(M)
-			user.adjustStaminaLossBuffered(getweight())		//CIT CHANGE - makes stunbatonning others cost stamina
+			user.adjustStaminaLossBuffered(getweight(user, STAM_COST_BATON_MOB_MULT))
 	else if(user.a_intent != INTENT_HARM)			//they'll try to bash in the last proc.
 		M.visible_message("<span class='warning'>[user] has prodded [M] with [src]. Luckily it was off.</span>", \
 						"<span class='warning'>[user] has prodded you with [src]. Luckily it was off</span>")
@@ -232,11 +232,8 @@
 /obj/item/melee/baton/stunsword
 	name = "stunsword"
 	desc = "not actually sharp, this sword is functionally identical to a stunbaton"
-	icon = 'modular_citadel/icons/obj/stunsword.dmi'
 	icon_state = "stunsword"
 	item_state = "sword"
-	lefthand_file = 'modular_citadel/icons/mob/inhands/stunsword_left.dmi'
-	righthand_file = 'modular_citadel/icons/mob/inhands/stunsword_right.dmi'
 
 /obj/item/melee/baton/stunsword/get_belt_overlay()
 	if(istype(loc, /obj/item/storage/belt/sabre))

code/game/objects/items/toys.dm

@@ -241,11 +241,13 @@
 		playsound(user, activation_sound, transform_volume, 1)
 		w_class = WEIGHT_CLASS_BULKY
 		AddElement(/datum/element/sword_point)
+		total_mass = total_mass_on
 	else
 		to_chat(user, "<span class='notice'>[deactivation_message]</span>")
 		playsound(user, deactivation_sound, transform_volume, 1)
 		w_class = WEIGHT_CLASS_SMALL
 		RemoveElement(/datum/element/sword_point)
+		total_mass = initial(total_mass)
 
 	update_icon()
 	add_fingerprint(user)
@@ -287,9 +289,6 @@
 	else
 		return ..()
 
-/obj/item/toy/sword/getweight()
-	return (active ? total_mass_on : total_mass) || w_class *1.25
-
 /obj/item/toy/sword/cx
 	name = "\improper DX Non-Euplastic LightSword"
 	desc = "A deluxe toy replica of an energy sword. Realistic visuals and sounds! Ages 8 and up."