Merge branch 'master' into limbs

2020-08-27 18:06:35 +01:00
parent bc2c658395 bb67323585
commit fe25046410
58 changed files with 614 additions and 284 deletions
@@ -87,7 +87,7 @@
 		if(user != src && (user.a_intent == INTENT_HELP || user.a_intent == INTENT_DISARM))
 			for(var/datum/surgery/S in surgeries)
 				if(S.next_step(user,user.a_intent))
-					return 1
+					return STOP_ATTACK_PROC_CHAIN

 	if(!all_wounds || !(user.a_intent == INTENT_HELP || user == src))
 		return ..()
@@ -95,7 +95,7 @@
 	for(var/i in shuffle(all_wounds))
 		var/datum/wound/W = i
 		if(W.try_treating(I, user))
-			return 1
+			return STOP_ATTACK_PROC_CHAIN

 	return ..()

@@ -7,6 +7,11 @@
 	message = "cries."
 	emote_type = EMOTE_AUDIBLE

+/datum/emote/living/carbon/human/cry/run_emote(mob/user, params)
+	. = ..()
+	if(. && isipcperson(user))
+		do_fake_sparks(5,FALSE,user)
+
 /datum/emote/living/carbon/human/dap
 	key = "dap"
 	key_third_person = "daps"
@@ -187,3 +192,71 @@
 	key_third_person = "chimes"
 	message = "chimes."
 	sound = 'sound/machines/chime.ogg'
+
+//rock paper scissors emote handling
+/mob/living/carbon/human/proc/beginRockPaperScissors(var/chosen_move)
+	GLOB.rockpaperscissors_players[src] = list(chosen_move, ROCKPAPERSCISSORS_NOT_DECIDED)
+	do_after_advanced(src, ROCKPAPERSCISSORS_TIME_LIMIT, src, DO_AFTER_REQUIRES_USER_ON_TURF|DO_AFTER_NO_COEFFICIENT|DO_AFTER_NO_PROGRESSBAR|DO_AFTER_DISALLOW_MOVING_ABSOLUTE_USER, CALLBACK(src, .proc/rockpaperscissors_tick))
+	var/new_entry = GLOB.rockpaperscissors_players[src]
+	if(new_entry[2] == ROCKPAPERSCISSORS_NOT_DECIDED)
+		to_chat(src, "You put your hand back down.")
+	GLOB.rockpaperscissors_players -= src
+
+/mob/living/carbon/human/proc/rockpaperscissors_tick() //called every cycle of the progress bar for rock paper scissors while waiting for an opponent
+	var/mob/living/carbon/human/opponent
+	for(var/mob/living/carbon/human/potential_opponent in (GLOB.rockpaperscissors_players - src)) //dont play against yourself
+		if(get_dist(src, potential_opponent) <= ROCKPAPERSCISSORS_RANGE)
+			opponent = potential_opponent
+			break
+	if(opponent)
+		//we found an opponent before they found us
+		var/move_to_number = list("rock" = 0, "paper" = 1, "scissors" = 2)
+		var/our_move = move_to_number[GLOB.rockpaperscissors_players[src][1]]
+		var/their_move = move_to_number[GLOB.rockpaperscissors_players[opponent][1]]
+		var/result_us = ROCKPAPERSCISSORS_WIN
+		var/result_them = ROCKPAPERSCISSORS_LOSE
+		if(our_move == their_move)
+			result_us = ROCKPAPERSCISSORS_TIE
+			result_them = ROCKPAPERSCISSORS_TIE
+		else
+			if(((our_move + 1) % 3) == their_move)
+				result_us = ROCKPAPERSCISSORS_LOSE
+				result_them = ROCKPAPERSCISSORS_WIN
+		//we decided our results so set them in the list
+		GLOB.rockpaperscissors_players[src][2] = result_us
+		GLOB.rockpaperscissors_players[opponent][2] = result_them
+
+		//show what happened
+		src.visible_message("<b>[src]</b> makes [GLOB.rockpaperscissors_players[src][1]] with their hand!")
+		opponent.visible_message("<b>[opponent]</b> makes [GLOB.rockpaperscissors_players[opponent][1]] with their hands!")
+		switch(result_us)
+			if(ROCKPAPERSCISSORS_TIE)
+				src.visible_message("It was a tie!")
+			if(ROCKPAPERSCISSORS_WIN)
+				src.visible_message("<b>[src]</b> wins!")
+			if(ROCKPAPERSCISSORS_LOSE)
+				src.visible_message("<b>[opponent]</b> wins!")
+
+		//make the progress bar end so that each player can handle the result
+		return DO_AFTER_STOP
+
+	//no opponent was found, so keep searching
+	return DO_AFTER_PROCEED
+
+//the actual emotes
+/datum/emote/living/carbon/human/rockpaperscissors
+	message = "is attempting to play rock paper scissors!"
+
+/datum/emote/living/carbon/human/rockpaperscissors/rock
+	key = "rock"
+
+/datum/emote/living/carbon/human/rockpaperscissors/paper
+	key = "paper"
+
+/datum/emote/living/carbon/human/rockpaperscissors/scissors
+	key = "scissors"
+
+/datum/emote/living/carbon/human/rockpaperscissors/run_emote(mob/living/carbon/human/user, params)
+	if(!(user in GLOB.rockpaperscissors_players)) //no using the emote again while already playing!
+		. = ..()
+		user.beginRockPaperScissors(key)
@@ -114,6 +114,9 @@ GLOBAL_LIST_EMPTY(roundstart_race_names)
 	/// Our default override for typing indicator state
 	var/typing_indicator_state

+	//the ids you can use for your species, if empty, it means default only and not changeable
+	var/list/allowed_limb_ids
+
 ///////////
 // PROCS //
 ///////////
@@ -121,7 +124,9 @@ GLOBAL_LIST_EMPTY(roundstart_race_names)
 /datum/species/New()

 	if(!limbs_id)	//if we havent set a limbs id to use, just use our own id
-		limbs_id = id
+		mutant_bodyparts["limbs_id"] = id //done this way to be non-intrusive to the existing system
+	else
+		mutant_bodyparts["limbs_id"] = limbs_id
 	..()

 	//update our mutant bodyparts to include unlocked ones
@@ -13,10 +13,11 @@
 	meat = /obj/item/reagent_containers/food/snacks/meat/slab/human/mutant/insect
 	liked_food = MEAT | FRUIT
 	disliked_food = TOXIC
-	icon_limbs = DEFAULT_BODYPART_ICON_CITADEL
 	exotic_bloodtype = "BUG"
 	exotic_blood_color = BLOOD_COLOR_BUG

 	tail_type = "mam_tail"
 	wagging_type = "mam_waggingtail"
-	species_type = "insect"
+	species_type = "insect"
+
+	allowed_limb_ids = list("insect","apid","moth","moth_not_greyscale")
@@ -2,7 +2,6 @@
 	name = "Anthromorph"
 	id = "mammal"
 	default_color = "4B4B4B"
-	icon_limbs = DEFAULT_BODYPART_ICON_CITADEL
 	species_traits = list(MUTCOLORS,EYECOLOR,LIPS,HAIR,HORNCOLOR,WINGCOLOR,HAS_FLESH,HAS_BONE)
 	inherent_biotypes = MOB_ORGANIC|MOB_HUMANOID|MOB_BEAST
 	mutant_bodyparts = list("mcolor" = "FFFFFF","mcolor2" = "FFFFFF","mcolor3" = "FFFFFF", "mam_snouts" = "Husky", "mam_tail" = "Husky", "mam_ears" = "Husky", "deco_wings" = "None",
@@ -17,3 +16,5 @@
 	tail_type = "mam_tail"
 	wagging_type = "mam_waggingtail"
 	species_type = "furry"
+
+	allowed_limb_ids = list("mammal","aquatic","avian")
@@ -3,7 +3,6 @@
 	id = "ipc"
 	say_mod = "beeps"
 	default_color = "00FF00"
-	icon_limbs = DEFAULT_BODYPART_ICON_CITADEL
 	blacklisted = 0
 	sexes = 0
 	species_traits = list(MUTCOLORS,NOEYES,NOTRANSSTING,HAS_FLESH,HAS_BONE)
@@ -21,6 +21,8 @@

 	species_type = "plant"

+	allowed_limb_ids = list("pod","mush")
+
 /datum/species/pod/on_species_gain(mob/living/carbon/C, datum/species/old_species)
 	. = ..()
 	C.faction |= "plants"
@@ -1,7 +1,6 @@
 /datum/species/synthliz
 	name = "Synthetic Lizardperson"
 	id = "synthliz"
-	icon_limbs = DEFAULT_BODYPART_ICON_CITADEL
 	say_mod = "beeps"
 	default_color = "00FF00"
 	species_traits = list(MUTCOLORS,NOTRANSSTING,EYECOLOR,LIPS,HAIR,HAS_FLESH,HAS_BONE)
@@ -61,7 +61,7 @@
 		mutant_organs = S.mutant_organs.Copy()
 		nojumpsuit = S.nojumpsuit
 		no_equip = S.no_equip.Copy()
-		limbs_id = S.limbs_id
+		limbs_id = S.mutant_bodyparts["limbs_id"]
 		use_skintones = S.use_skintones
 		fixed_mut_color = S.fixed_mut_color
 		hair_color = S.hair_color
@@ -4,7 +4,6 @@
 	id = "xeno"
 	say_mod = "hisses"
 	default_color = "00FF00"
-	icon_limbs = DEFAULT_BODYPART_ICON_CITADEL
 	species_traits = list(MUTCOLORS,EYECOLOR,LIPS,CAN_SCAR)
 	mutant_bodyparts = list("xenotail"="Xenomorph Tail","xenohead"="Standard","xenodorsal"="Standard", "mam_body_markings" = "Xeno","mcolor" = "0F0","mcolor2" = "0F0","mcolor3" = "0F0","taur" = "None", "legs" = "Digitigrade")
 	attack_verb = "slash"
@@ -660,7 +660,7 @@ use_mob_overlay_icon: if FALSE, it will always use the default_icon_file even if

 //produces a key based on the human's limbs
 /mob/living/carbon/human/generate_icon_render_key()
-	. = "[dna.species.limbs_id]"
+	. = "[dna.species.mutant_bodyparts["limbs_id"]]"

 	if(dna.check_mutation(HULK))
 		. += "-coloured-hulk"
@@ -8,8 +8,6 @@

 	spill_organs(no_brain, no_organs, no_bodyparts)

-	release_vore_contents(silent = TRUE) // return of the bomb safe internals.
-
 	if(!no_bodyparts)
 		spread_bodyparts(no_brain, no_organs)

@@ -46,7 +44,6 @@
 		buckled.unbuckle_mob(src, force = TRUE)

 	dust_animation()
-	release_vore_contents(silent = TRUE) //technically grief protection, I guess? if they're SM'd it doesn't matter seconds after anyway.
 	spawn_dust(just_ash)
 	QDEL_IN(src,5) // since this is sometimes called in the middle of movement, allow half a second for movement to finish, ghosting to happen and animation to play. Looks much nicer and doesn't cause multiple runtimes.

@@ -103,5 +100,5 @@
 	for(var/s in sharedSoullinks)
 		var/datum/soullink/S = s
 		S.sharerDies(gibbed)
-
+	release_vore_contents(silent = TRUE)
 	return TRUE
@@ -9,6 +9,11 @@
 	key_third_person = "blushes"
 	message = "blushes."

+/datum/emote/living/blush/run_emote(mob/user, params)
+	. = ..()
+	if(. && isipcperson(user))
+		do_fake_sparks(5,FALSE,user)
+
 /datum/emote/living/bow
 	key = "bow"
 	key_third_person = "bows"
@@ -289,50 +289,57 @@
 		return FALSE
 	return ISINRANGE(T1.x, T0.x - interaction_range, T0.x + interaction_range) && ISINRANGE(T1.y, T0.y - interaction_range, T0.y + interaction_range)

-/mob/living/silicon/robot/attackby(obj/item/W, mob/user, params)
-	if(istype(W, /obj/item/weldingtool) && (user.a_intent != INTENT_HARM || user == src))
+/mob/living/silicon/robot/proc/attempt_welder_repair(obj/item/weldingtool/W, mob/user)
+	if (!getBruteLoss())
+		to_chat(user, "<span class='warning'>[src] is already in good condition!</span>")
+		return
+	if (!W.tool_start_check(user, amount=0)) //The welder has 1u of fuel consumed by it's afterattack, so we don't need to worry about taking any away.
+		return
+	user.DelayNextAction(CLICK_CD_MELEE)
+	if(src == user)
+		to_chat(user, "<span class='notice'>You start fixing yourself...</span>")
+		if(!W.use_tool(src, user, 50))
+			return
+		adjustBruteLoss(-10)
+	else
+		to_chat(user, "<span class='notice'>You start fixing [src]...</span>")
+		if(!do_after(user, 30, target = src))
+			return
+		adjustBruteLoss(-30)
+	updatehealth()
+	add_fingerprint(user)
+	visible_message("<span class='notice'>[user] has fixed some of the dents on [src].</span>")
+
+/mob/living/silicon/robot/proc/attempt_cable_repair(obj/item/stack/cable_coil/W, mob/user)
+	if (getFireLoss() > 0 || getToxLoss() > 0)
 		user.DelayNextAction(CLICK_CD_MELEE)
-		if (!getBruteLoss())
-			to_chat(user, "<span class='warning'>[src] is already in good condition!</span>")
-			return
-		if (!W.tool_start_check(user, amount=0)) //The welder has 1u of fuel consumed by it's afterattack, so we don't need to worry about taking any away.
-			return
 		if(src == user)
 			to_chat(user, "<span class='notice'>You start fixing yourself...</span>")
-			if(!W.use_tool(src, user, 50))
+			if(!W.use_tool(src, user, 50, 1, skill_gain_mult = TRIVIAL_USE_TOOL_MULT))
+				to_chat(user, "<span class='warning'>You need more cable to repair [src]!</span>")
 				return
-			adjustBruteLoss(-10)
+			adjustFireLoss(-10)
+			adjustToxLoss(-10)
 		else
 			to_chat(user, "<span class='notice'>You start fixing [src]...</span>")
-			if(!do_after(user, 30, target = src))
+			if(!W.use_tool(src, user, 30, 1))
+				to_chat(user, "<span class='warning'>You need more cable to repair [src]!</span>")
 				return
-			adjustBruteLoss(-30)
-		updatehealth()
-		add_fingerprint(user)
-		visible_message("<span class='notice'>[user] has fixed some of the dents on [src].</span>")
+			adjustFireLoss(-30)
+			adjustToxLoss(-30)
+			updatehealth()
+			user.visible_message("[user] has fixed some of the burnt wires on [src].", "<span class='notice'>You fix some of the burnt wires on [src].</span>")
+	else
+		to_chat(user, "The wires seem fine, there's no need to fix them.")
+
+/mob/living/silicon/robot/attackby(obj/item/W, mob/user, params)
+	if(istype(W, /obj/item/weldingtool) && (user.a_intent != INTENT_HARM || user == src))
+		INVOKE_ASYNC(src, .proc/attempt_welder_repair, W, user)
 		return

 	else if(istype(W, /obj/item/stack/cable_coil) && wiresexposed)
-		user.DelayNextAction(CLICK_CD_MELEE)
-		if (getFireLoss() > 0 || getToxLoss() > 0)
-			if(src == user)
-				to_chat(user, "<span class='notice'>You start fixing yourself...</span>")
-				if(!W.use_tool(src, user, 50, 1, skill_gain_mult = TRIVIAL_USE_TOOL_MULT))
-					to_chat(user, "<span class='warning'>You need more cable to repair [src]!</span>")
-					return
-				adjustFireLoss(-10)
-				adjustToxLoss(-10)
-			else
-				to_chat(user, "<span class='notice'>You start fixing [src]...</span>")
-				if(!W.use_tool(src, user, 30, 1))
-					to_chat(user, "<span class='warning'>You need more cable to repair [src]!</span>")
-					return
-				adjustFireLoss(-30)
-				adjustToxLoss(-30)
-				updatehealth()
-				user.visible_message("[user] has fixed some of the burnt wires on [src].", "<span class='notice'>You fix some of the burnt wires on [src].</span>")
-		else
-			to_chat(user, "The wires seem fine, there's no need to fix them.")
+		INVOKE_ASYNC(src, .proc/attempt_cable_repair, W, user)
+		return

 	else if(istype(W, /obj/item/crowbar))	// crowbar means open or close the cover
 		if(opened)
@@ -661,7 +661,7 @@ Difficulty: Normal
 				continue
 			to_chat(M.occupant, "<span class='userdanger'>Your [M.name] is struck by a [name]!</span>")
 		playsound(M,'sound/weapons/sear.ogg', 50, 1, -4)
-		M.take_damage(damage, BURN, 0, 0)
+		M.take_damage(damage, BURN, 0, 0, null, 50)

 /obj/effect/hierophant
 	name = "hierophant beacon"
@@ -200,6 +200,8 @@
 			L.Stun(75)
 		L.adjustBruteLoss(rand(15,20)) // Less stun more harm
 		latched = TRUE
+	for(var/obj/mecha/M in loc)
+		M.take_damage(20, BRUTE, null, null, null, 25)
 	if(!latched)
 		retract()
 	else
@@ -19,8 +19,11 @@ GLOBAL_LIST_INIT(ventcrawl_machinery, typecacheof(list(
 		to_chat(src, "You can't vent crawl while you're restrained!")
 		return
 	if(has_buckled_mobs())
-		to_chat(src, "You can't vent crawl with other creatures on you!")
-		return
+		// attempt once
+		unbuckle_all_mobs()
+		if(has_buckled_mobs())
+			to_chat(src, "You can't vent crawl with other creatures on you!")
+			return
 	if(buckled)
 		to_chat(src, "You can't vent crawl while buckled!")
 		return