Merge branch 'master' into wounds-part-2

code/modules/reagents/chemistry/reagents/alcohol_reagents.dm

@@ -1962,12 +1962,12 @@ All effects don't start immediately, but rather get worse over time; the rate is
 
 /datum/reagent/consumable/ethanol/bug_spray/on_mob_life(mob/living/carbon/M)
 //Bugs should not drink Bug spray.
-	if(ismoth(M) || isflyperson(M))
+	if(isinsect(M) || isflyperson(M))
 		M.adjustToxLoss(1,0)
 	return ..()
 
 /datum/reagent/consumable/ethanol/bug_spray/on_mob_add(mob/living/carbon/M)
-	if(ismoth(M) || isflyperson(M))
+	if(isinsect(M) || isflyperson(M))
 		M.emote("scream")
 	return ..()
 
@@ -2270,25 +2270,29 @@ All effects don't start immediately, but rather get worse over time; the rate is
 ////////////////////
 //Race-Base-Drinks//
 ////////////////////
+/datum/reagent/consumable/ethanol/species_drink
+	var/species_required
+	var/disgust = 25
+	boozepwr = 50
 
-/datum/reagent/consumable/ethanol/coldscales
+/datum/reagent/consumable/ethanol/species_drink/on_mob_life(mob/living/carbon/C)
+	if(C.dna.species && C.dna.species.species_type == species_required) //species have a species_type variable that refers to one of the drinks
+		quality = RACE_DRINK
+	else
+		C.adjust_disgust(disgust)
+
+/datum/reagent/consumable/ethanol/species_drink/coldscales
 	name = "Coldscales"
 	color = "#5AEB52" //(90, 235, 82)
 	description = "A cold looking drink made for people with scales."
-	boozepwr = 50 //strong!
 	taste_description = "dead flies"
 	glass_icon_state = "coldscales"
 	glass_name = "glass of Coldscales"
 	glass_desc = "A soft green drink that looks inviting!"
 
-/datum/reagent/consumable/ethanol/coldscales/on_mob_life(mob/living/carbon/M)
-	if(islizard(M))
-		quality = RACE_DRINK
-	else
-		M.adjust_disgust(25)
-	return ..()
+	species_required = "lizard"
 
-/datum/reagent/consumable/ethanol/oil_drum
+/datum/reagent/consumable/ethanol/species_drink/oil_drum
 	name = "Oil Drum"
 	color = "#000000" //(0, 0, 0)
 	description = "Industrial grade oil mixed with some ethanol to make it a drink. Somehow not known to be toxic."
@@ -2298,31 +2302,20 @@ All effects don't start immediately, but rather get worse over time; the rate is
 	glass_name = "Drum of oil"
 	glass_desc = "A gray can of booze and oil..."
 
-/datum/reagent/consumable/ethanol/oil_drum/on_mob_life(mob/living/carbon/M)
-	if(isipcperson(M) || issynthliz(M))
-		quality = RACE_DRINK
-	else
-		M.adjust_disgust(25)
-	return ..()
+	species_required = "robot"
 
-/datum/reagent/consumable/ethanol/nord_king
+/datum/reagent/consumable/ethanol/species_drink/nord_king
 	name = "Nord King"
 	color = "#EB1010" //(235, 16, 16)
 	description = "Strong mead mixed with more honey and ethanol. Beloved by its human patrons."
-	boozepwr = 50 //strong!
 	taste_description = "honey and red wine"
 	glass_icon_state = "nord_king"
 	glass_name = "Keg of Nord King"
 	glass_desc = "A dripping keg of red mead."
 
-/datum/reagent/consumable/ethanol/nord_king/on_mob_life(mob/living/carbon/M)
-	if(ishumanbasic(M) || isdwarf(M) || isangel(M)) //Humans and angel races are rare
-		quality = RACE_DRINK
-	else
-		M.adjust_disgust(25)
-	return ..()
+	species_required = "basic"
 
-/datum/reagent/consumable/ethanol/velvet_kiss
+/datum/reagent/consumable/ethanol/species_drink/velvet_kiss
 	name = "Velvet Kiss"
 	color = "#EB1010" //(235, 16, 16)
 	description = "A bloody drink mixed with wine."
@@ -2332,14 +2325,9 @@ All effects don't start immediately, but rather get worse over time; the rate is
 	glass_name = "glass of Velvet Kiss"
 	glass_desc = "Red and white drink for the upper classes or undead."
 
-/datum/reagent/consumable/ethanol/velvet_kiss/on_mob_life(mob/living/carbon/M)
-	if(iszombie(M) || isvampire(M) || isdullahan(M)) //Rare races!
-		quality = RACE_DRINK
-	else
-		M.adjust_disgust(25)
-	return ..()
+	species_required = "undead"
 
-/datum/reagent/consumable/ethanol/abduction_fruit
+/datum/reagent/consumable/ethanol/species_drink/abduction_fruit
 	name = "Abduction Fruit"
 	color = "#DEFACD" //(222, 250, 205)
 	description = "Mixing of juices to make an alien taste."
@@ -2349,14 +2337,9 @@ All effects don't start immediately, but rather get worse over time; the rate is
 	glass_name = "glass of Abduction Fruit"
 	glass_desc = "Mixed fruits that were never meant to be mixed..."
 
-/datum/reagent/consumable/ethanol/abduction_fruit/on_mob_life(mob/living/carbon/M)
-	if(isabductor(M) || isxenoperson(M))
-		quality = RACE_DRINK
-	else
-		M.adjust_disgust(25)
-	return ..()
+	species_required = "alien"
 
-/datum/reagent/consumable/ethanol/bug_zapper
+/datum/reagent/consumable/ethanol/species_drink/bug_zapper
 	name = "Bug Zapper"
 	color = "#F5882A" //(222, 250, 205)
 	description = "Copper and lemon juice. Hardly even a drink."
@@ -2366,14 +2349,9 @@ All effects don't start immediately, but rather get worse over time; the rate is
 	glass_name = "glass of Bug Zapper"
 	glass_desc = "An odd mix of copper, lemon juice and power meant for non-human consumption."
 
-/datum/reagent/consumable/ethanol/bug_zapper/on_mob_life(mob/living/carbon/M)
-	if(isinsect(M) || isflyperson(M) || ismoth(M))
-		quality = RACE_DRINK
-	else
-		M.adjust_disgust(25)
-	return ..()
+	species_required = "bug"
 
-/datum/reagent/consumable/ethanol/mush_crush
+/datum/reagent/consumable/ethanol/species_drink/mush_crush
 	name = "Mush Crush"
 	color = "#F5882A" //(222, 250, 205)
 	description = "Soil in a glass."
@@ -2383,14 +2361,9 @@ All effects don't start immediately, but rather get worse over time; the rate is
 	glass_name = "glass of Mush Crush"
 	glass_desc = "Popular among people that want to grow their own food rather than drink the soil."
 
-/datum/reagent/consumable/ethanol/mush_crush/on_mob_life(mob/living/carbon/M)
-	if(ispodperson(M) || ismush(M))
-		quality = RACE_DRINK
-	else
-		M.adjust_disgust(25)
-	return ..()
+	species_required = "plant"
 
-/datum/reagent/consumable/ethanol/darkbrew
+/datum/reagent/consumable/ethanol/species_drink/darkbrew
 	name = "Darkbrew"
 	color = "#000000" //(0, 0, 0)
 	description = "Contained dark matter mixed with coffee."
@@ -2400,31 +2373,21 @@ All effects don't start immediately, but rather get worse over time; the rate is
 	glass_name = "glass of Darkbrew"
 	glass_desc = "A pitch black drink that's commonly confused with a type of coffee."
 
-/datum/reagent/consumable/ethanol/darkbrew/on_mob_life(mob/living/carbon/M)
-	if(isshadow(M))
-		quality = RACE_DRINK
-	else
-		M.adjust_disgust(25)
-	return ..()
+	species_required = "shadow"
 
-/datum/reagent/consumable/ethanol/hollow_bone
+/datum/reagent/consumable/ethanol/species_drink/hollow_bone
 	name = "Hollow Bone"
 	color = "#FCF7D4" //(252, 247, 212)
-	description = "Shockingly none-harmful mix of toxins and milk."
+	description = "Shockingly non-harmful mix of toxins and milk."
 	boozepwr = 15
 	taste_description = "Milk and salt"
 	glass_icon_state = "hollow_bone"
 	glass_name = "skull of Hollow Bone"
-	glass_desc = "Mixing of milk and bone hurting juice for enjoyment for rather skinny people."
+	glass_desc = "Mixing of milk and bone hurting juice for the enjoyment of rather skinny people."
 
-/datum/reagent/consumable/ethanol/hollow_bone/on_mob_life(mob/living/carbon/M)
-	if(isplasmaman(M) || isskeleton(M))
-		quality = RACE_DRINK
-	else
-		M.adjust_disgust(25)
-	return ..()
+	species_required = "skeleton"
 
-/datum/reagent/consumable/ethanol/frisky_kitty
+/datum/reagent/consumable/ethanol/species_drink/frisky_kitty
 	name = "Frisky Kitty"
 	color = "#FCF7D4" //(252, 247, 212)
 	description = "Warm milk mixed with a catnip."
@@ -2434,14 +2397,9 @@ All effects don't start immediately, but rather get worse over time; the rate is
 	glass_name = "cup of Drisky Kitty"
 	glass_desc = "Warm milk and some catnip."
 
-/datum/reagent/consumable/ethanol/frisky_kitty/on_mob_life(mob/living/carbon/M)
-	if(ismammal(M) || iscatperson(M)) //well its not to bad for mammals
-		quality = RACE_DRINK
-	else
-		M.adjust_disgust(25)
-	return ..()
+	species_required = "furry"
 
-/datum/reagent/consumable/ethanol/jell_wyrm
+/datum/reagent/consumable/ethanol/species_drink/jell_wyrm
 	name = "Jell Wyrm"
 	color = "#FF6200" //(255, 98, 0)
 	description = "Horrible mix of Co2, toxins and heat. Meant for slime based life."
@@ -2451,15 +2409,9 @@ All effects don't start immediately, but rather get worse over time; the rate is
 	glass_name = "glass of Jell Wyrm"
 	glass_desc = "A bubbly drink that is rather inviting to those that don't know who it's meant for."
 
-/datum/reagent/consumable/ethanol/jell_wyrm/on_mob_life(mob/living/carbon/M)
-	if(isjellyperson(M) || isstartjelly(M) || isslimeperson(M) || isluminescent(M))
-		quality = RACE_DRINK
-	else
-		M.adjust_disgust(25)
-		M.adjustToxLoss(1, 0) //Low tox due to being carp + jell toxins.
-	return ..()
+	species_required = "jelly"
 
-/datum/reagent/consumable/ethanol/laval_spit //Yes Laval
+/datum/reagent/consumable/ethanol/species_drink/laval_spit //Yes Laval
 	name = "Laval Spit"
 	color = "#DE3009" //(222, 48, 9)
 	description = "Heat minerals and some mauna loa. Meant for rock based life."
@@ -2469,15 +2421,10 @@ All effects don't start immediately, but rather get worse over time; the rate is
 	glass_name = "glass of Laval Spit"
 	glass_desc = "Piping hot drink for those who can stomach the heat of lava."
 
-/datum/reagent/consumable/ethanol/laval_spit/on_mob_life(mob/living/carbon/M)
-	if(isgolem(M))
-		quality = RACE_DRINK
-	else
-		M.adjust_disgust(25)
-	return ..()
+	species_required = "golem"
 
 ///////////////
-//Barrle Wine//
+//Barrel Wine//
 ///////////////
 
 /datum/reagent/consumable/ethanol/fruit_wine

code/modules/reagents/chemistry/reagents/drug_reagents.dm

@@ -467,7 +467,7 @@
 /datum/reagent/drug/skooma/on_mob_metabolize(mob/living/L)
 	. = ..()
 	L.add_movespeed_modifier(/datum/movespeed_modifier/reagent/skooma)
-	L.next_move_modifier *= 2
+	L.action_cooldown_mod *= 2
 	if(ishuman(L))
 		var/mob/living/carbon/human/H = L
 		if(H.physiology)
@@ -480,7 +480,7 @@
 /datum/reagent/drug/skooma/on_mob_end_metabolize(mob/living/L)
 	. = ..()
 	L.remove_movespeed_modifier(/datum/movespeed_modifier/reagent/skooma)
-	L.next_move_modifier *= 0.5
+	L.action_cooldown_mod *= 0.5
 	if(ishuman(L))
 		var/mob/living/carbon/human/H = L
 		if(H.physiology)
@@ -542,13 +542,13 @@
 /datum/reagent/syndicateadrenals/on_mob_metabolize(mob/living/M)
 	. = ..()
 	if(istype(M))
-		M.next_move_modifier *= 0.5
+		M.action_cooldown_mod *= 0.5
 		to_chat(M, "<span class='notice'>You feel an intense surge of energy rushing through your veins.</span>")
 
 /datum/reagent/syndicateadrenals/on_mob_end_metabolize(mob/living/M)
 	. = ..()
 	if(istype(M))
-		M.next_move_modifier *= 2
+		M.action_cooldown_mod *= 2
 		to_chat(M, "<span class='notice'>You feel as though the world around you is going faster.</span>")
 
 /datum/reagent/syndicateadrenals/overdose_start(mob/living/M)

code/modules/reagents/reagent_containers.dm

@@ -69,7 +69,8 @@
 				to_chat(user, "<span class='notice'>[src]'s transfer amount is now [amount_per_transfer_from_this] units.</span>")
 				return
 
-/obj/item/reagent_containers/attack(mob/M, mob/user, def_zone)
+/obj/item/reagent_containers/attack(mob/living/M, mob/living/user, attackchain_flags = NONE, damage_multiplier = 1)
+	. = ..()
 	if(user.a_intent == INTENT_HARM)
 		return ..()
 

code/modules/reagents/reagent_containers/glass.dm

@@ -9,6 +9,11 @@
 	container_HP = 2
 
 /obj/item/reagent_containers/glass/attack(mob/M, mob/user, obj/target)
+	// WARNING: This entire section is shitcode and prone to breaking at any time.
+	INVOKE_ASYNC(src, .proc/attempt_feed, M, user, target)		// for example, the arguments in this proc are wrong
+	// but i don't have time to properly fix it right now.
+
+/obj/item/reagent_containers/glass/proc/attempt_feed(mob/M, mob/user, obj/target)
 	if(!canconsume(M, user))
 		return
 

code/modules/reagents/reagent_containers/hypospray.dm

@@ -368,13 +368,17 @@
 	obj_flags |= EMAGGED
 	return TRUE
 
-/obj/item/hypospray/mkii/attack_hand(mob/user, act_intent = user.a_intent, unarmed_attack_flags)
+/obj/item/hypospray/mkii/on_attack_hand(mob/user, act_intent = user.a_intent, unarmed_attack_flags)
 	. = ..() //Don't bother changing this or removing it from containers will break.
 
 /obj/item/hypospray/mkii/attack(obj/item/I, mob/user, params)
 	return
 
 /obj/item/hypospray/mkii/afterattack(atom/target, mob/user, proximity)
+	. = ..()
+	INVOKE_ASYNC(src, .proc/attempt_inject, target, user, proximity)
+
+/obj/item/hypospray/mkii/proc/attempt_inject(atom/target, mob/user, proximity)
 	if(!vial || !proximity || !isliving(target))
 		return
 	var/mob/living/L = target

code/modules/reagents/reagent_containers/maunamug.dm

@@ -88,7 +88,7 @@
 	user.visible_message("<span class='notice'>[user] inserts a power cell into [src].</span>", "<span class='notice'>You insert the power cell into [src].</span>")
 	update_icon()
 
-/obj/item/reagent_containers/glass/maunamug/attack_hand(mob/living/user, act_intent = user.a_intent, unarmed_attack_flags)
+/obj/item/reagent_containers/glass/maunamug/on_attack_hand(mob/living/user, act_intent = user.a_intent, unarmed_attack_flags)
 	if(cell && open)
 		cell.update_icon()
 		user.put_in_hands(cell)

code/modules/reagents/reagent_containers/pill.dm

@@ -28,22 +28,24 @@
 /obj/item/reagent_containers/pill/get_w_volume() // DEFAULT_VOLUME_TINY at 25u, DEFAULT_VOLUME_SMALL at 50u
 	return DEFAULT_VOLUME_TINY/2 + reagents.total_volume / reagents.maximum_volume * DEFAULT_VOLUME_TINY
 
-/obj/item/reagent_containers/pill/attack(mob/M, mob/user, def_zone)
+/obj/item/reagent_containers/pill/attack(mob/living/M, mob/living/user, attackchain_flags = NONE, damage_multiplier = 1)
+	INVOKE_ASYNC(src, .proc/attempt_feed, M, user)
+
+/obj/item/reagent_containers/pill/proc/attempt_feed(mob/living/M, mob/living/user)
 	if(!canconsume(M, user))
-		return 0
+		return FALSE
 
 	if(M == user)
 		M.visible_message("<span class='notice'>[user] attempts to [apply_method] [src].</span>")
 		if(self_delay)
 			if(!do_mob(user, M, self_delay))
-				return 0
+				return FALSE
 		to_chat(M, "<span class='notice'>You [apply_method] [src].</span>")
-
 	else
 		M.visible_message("<span class='danger'>[user] attempts to force [M] to [apply_method] [src].</span>", \
 							"<span class='userdanger'>[user] attempts to force [M] to [apply_method] [src].</span>")
 		if(!do_mob(user, M))
-			return 0
+			return FALSE
 		M.visible_message("<span class='danger'>[user] forces [M] to [apply_method] [src].</span>", \
 							"<span class='userdanger'>[user] forces [M] to [apply_method] [src].</span>")
 
@@ -56,8 +58,7 @@
 		reagents.reaction(M, apply_type)
 		reagents.trans_to(M, reagents.total_volume)
 	qdel(src)
-	return 1
-
+	return TRUE
 
 /obj/item/reagent_containers/pill/afterattack(obj/target, mob/user , proximity)
 	. = ..()
@@ -77,6 +78,7 @@
 						"<span class='notice'>You dissolve [src] in [target].</span>", vision_distance = 2)
 	reagents.trans_to(target, reagents.total_volume)
 	qdel(src)
+	return STOP_ATTACK_PROC_CHAIN
 
 /obj/item/reagent_containers/pill/tox
 	name = "toxins pill"

code/modules/reagents/reagent_containers/rags.dm

@@ -55,11 +55,10 @@
 		if(do_after(user, action_speed, target = A))
 			user.visible_message("[user] finishes wiping off [A]!", "<span class='notice'>You finish wiping off [A].</span>")
 			SEND_SIGNAL(A, COMSIG_COMPONENT_CLEAN_ACT, CLEAN_MEDIUM)
-	return
 
 /obj/item/reagent_containers/rag/alt_pre_attack(mob/living/M, mob/living/user, params)
 	if(istype(M) && user.a_intent == INTENT_HELP)
-		user.changeNext_move(CLICK_CD_MELEE)
+		user.DelayNextAction(CLICK_CD_MELEE)
 		if(M.on_fire)
 			user.visible_message("<span class='warning'>\The [user] uses \the [src] to pat out [M == user ? "[user.p_their()]" : "\the [M]'s"] flames!</span>")
 			if(hitsound)
@@ -193,4 +192,4 @@
 	extinguish_efficiency = 5
 	action_speed = 15
 	damp_threshold = 0.8
-	armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 20, "bio" = 20, "rad" = 20, "fire" = 50, "acid" = 50) //items don't provide armor to wearers unlike clothing yet.
+	armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 20, "bio" = 20, "rad" = 20, "fire" = 50, "acid" = 50) //items don't provide armor to wearers unlike clothing yet.

code/modules/reagents/reagent_containers/spray.dm

@@ -27,6 +27,8 @@
 
 /obj/item/reagent_containers/spray/afterattack(atom/A, mob/user)
 	. = ..()
+	if(!user.CheckActionCooldown(CLICK_CD_MELEE))
+		return
 	if(istype(A, /obj/structure/sink) || istype(A, /obj/structure/janitorialcart) || istype(A, /obj/machinery/hydroponics))
 		return
 
@@ -50,7 +52,7 @@
 	spray(A)
 
 	playsound(src.loc, 'sound/effects/spray2.ogg', 50, 1, -6)
-	user.changeNext_move(CLICK_CD_RANGE*2)
+	user.last_action = world.time
 	user.newtonian_move(get_dir(A, user))
 	var/turf/T = get_turf(src)
 	if(reagents.has_reagent(/datum/reagent/toxin/acid))

code/modules/reagents/reagent_containers/syringes.dm

@@ -43,8 +43,7 @@
 	mode = !mode
 	update_icon()
 
-//ATTACK HAND IGNORING PARENT RETURN VALUE
-/obj/item/reagent_containers/syringe/attack_hand()
+/obj/item/reagent_containers/syringe/on_attack_hand()
 	. = ..()
 	update_icon()
 
@@ -54,8 +53,11 @@
 /obj/item/reagent_containers/syringe/attackby(obj/item/I, mob/user, params)
 	return
 
-/obj/item/reagent_containers/syringe/afterattack(atom/target, mob/user , proximity)
+/obj/item/reagent_containers/syringe/afterattack(atom/target, mob/user, proximity)
 	. = ..()
+	INVOKE_ASYNC(src, .proc/attempt_inject, target, user, proximity)
+
+/obj/item/reagent_containers/syringe/proc/attempt_inject(atom/target, mob/user, proximity)
 	if(busy)
 		return
 	if(!proximity)

code/modules/reagents/reagent_dispenser.dm

@@ -79,7 +79,7 @@
 	else
 		. += "There are no paper cups left."
 
-/obj/structure/reagent_dispensers/water_cooler/attack_hand(mob/living/user, act_intent = user.a_intent, unarmed_attack_flags)
+/obj/structure/reagent_dispensers/water_cooler/on_attack_hand(mob/living/user, act_intent = user.a_intent, unarmed_attack_flags)
 	. = ..()
 	if(.)
 		return