Merge pull request #144 from Very-Soft/roguestarmobs

Map swap and stuff
TS-Rogue-Star · Feb 19, 2024 · 0a9eb44 · 0a9eb44
2 parents 001b222 + 858f18d
commit 0a9eb44
Show file tree

Hide file tree

Showing 45 changed files with 645 additions and 45 deletions.
diff --git a/code/game/atoms.dm b/code/game/atoms.dm
@@ -544,6 +544,11 @@
 				M.create_chat_message(src, "[runemessage]", FALSE, list("emote"), audible = FALSE)
 		else if(blind_message)
 			M.show_message(blind_message, AUDIBLE_MESSAGE)
+		if(isliving(M))
+			var/mob/living/L = M
+			if(L.ai_holder)
+				var/datum/ai_holder/AI = L.ai_holder
+				AI.on_hear_emote(src, message)
 
 // Show a message to all mobs and objects in earshot of this atom
 // Use for objects performing audible actions
@@ -570,6 +575,11 @@
 		M.show_message(msg, AUDIBLE_MESSAGE, deaf_message, VISIBLE_MESSAGE)
 		if(runemessage != -1)
 			M.create_chat_message(src, "[runemessage || message]", FALSE, list("emote"))
+		if(isliving(M))
+			var/mob/living/L = M
+			if(L.ai_holder)
+				var/datum/ai_holder/AI = L.ai_holder
+				AI.on_hear_emote(src, message)
 
 /atom/movable/proc/dropInto(var/atom/destination)
 	while(istype(destination))

diff --git a/code/game/objects/effects/wire_deleter.dm b/code/game/objects/effects/wire_deleter.dm
@@ -6,12 +6,13 @@
 	unacidable = TRUE
 	simulated = FALSE
 	invisibility = 100
+	var/wire_deletion_rate = 33
 
 /obj/effect/wire_deleter/Initialize(mapload)
 	. = ..()
-	
+
 	for(var/c in loc.contents)
 		if(istype(c, /obj/structure/cable))
-			if(prob(33))
+			if(prob(wire_deletion_rate))
 				qdel(c)
-	qdel(src)
+	qdel(src)
diff --git a/code/modules/ai/ai_holder_communication.dm b/code/modules/ai/ai_holder_communication.dm
@@ -122,9 +122,16 @@
 /datum/ai_holder/proc/on_hear_say(mob/living/speaker, message)
 	return
 
+/datum/ai_holder/proc/on_hear_emote(mob/living/speaker, message)
+	return
+
 // This is to make responses feel a bit more natural and not instant.
-/datum/ai_holder/proc/delayed_say(var/message, var/mob/speak_to)
-	spawn(rand(1 SECOND, 2 SECONDS))
+/datum/ai_holder/proc/delayed_say(var/message, var/mob/speak_to, min, max)
+	if(!min)
+		min = 1
+	if(!max)
+		max = 2
+	spawn(rand(min SECOND, max SECONDS))
 		if(!src || !holder || !can_act())  // We might've died/got deleted/etc in the meantime.
 			return
 

diff --git a/code/modules/ai/ai_holder_targeting.dm b/code/modules/ai/ai_holder_targeting.dm
@@ -27,6 +27,7 @@
 	var/destructive = FALSE					// Will target 'neutral' structures/objects and not just 'hostile' ones.
 
 	var/forgive_resting = TRUE				//VOREStation add - If TRUE on a RETALIATE mob, then mob will drop target if it becomes hostile to you but hasn't taken damage
+	var/grab_hostile = TRUE
 
 // A lot of this is based off of /TG/'s AI code.
 
@@ -272,6 +273,9 @@
 	if(!belly_attack)
 		if(isbelly(holder.loc))
 			return FALSE
+	if(!grab_hostile && holder.health == holder.maxHealth)
+		ai_log("react_to_attack() : Was attacked by [attacker], but they did no damage and the AI has grab_hostile set to false.", AI_LOG_TRACE)
+		return FALSE
 	if(holder.IIsAlly(attacker)) // I'll overlook it THIS time...
 		ai_log("react_to_attack() : Was attacked by [attacker], but they were an ally.", AI_LOG_TRACE)
 		return FALSE

diff --git a/code/modules/emotes/definitions/audible_emotes_RS.dm b/code/modules/emotes/definitions/audible_emotes_RS.dm
@@ -0,0 +1,29 @@
+/decl/emote/audible/yip
+	key = "yip"
+	emote_message_1p = "You yip! Yip!"
+	emote_message_3p = "yips!"
+
+	emote_message_impaired = "makes a sound but you can't hear it."
+
+	emote_message_1p_target = "You yip at TARGET! Yip!!!"
+	emote_message_3p_target = "yips at TARGET!"
+
+	emote_sound = null
+	var/list/soundlist = list('sound/rogue-star/yip/yip1.ogg', 'sound/rogue-star/yip/yip2.ogg', 'sound/rogue-star/yip/yip3.ogg', 'sound/rogue-star/yip/yip4.ogg', 'sound/rogue-star/yip/yip5.ogg', 'sound/rogue-star/yip/yip6.ogg', 'sound/rogue-star/yip/yip7.ogg', 'sound/rogue-star/yip/yip8.ogg', 'sound/rogue-star/yip/yip9.ogg', 'sound/rogue-star/yip/yip10.ogg', 'sound/rogue-star/yip/yip11.ogg', 'sound/rogue-star/yip/yip12.ogg', 'sound/rogue-star/yip/yip13.ogg', 'sound/rogue-star/yip/yip14.ogg', 'sound/rogue-star/yip/yip15.ogg')
+	sound_vary = TRUE
+
+/decl/emote/audible/yip/get_emote_sound(var/mob/living/user)
+	emote_sound = pick(soundlist)
+
+	. = ..()
+
+/decl/emote/audible/yip/yap
+	key = "yap"
+	emote_message_1p = "You yap! Yap yap!"
+	emote_message_3p = "yaps!"
+
+	emote_message_impaired = "makes a sound but you can't hear it."
+
+	emote_message_1p_target = "You yap at TARGET! Yap yap!!!"
+	emote_message_3p_target = "yaps at TARGET!"
+	soundlist = list('sound/rogue-star/yap/yap1.ogg', 'sound/rogue-star/yap/yap2.ogg', 'sound/rogue-star/yap/yap4.ogg', 'sound/rogue-star/yap/yap5.ogg', 'sound/rogue-star/yap/yap6.ogg', 'sound/rogue-star/yap/yap7.ogg', 'sound/rogue-star/yap/yap8.ogg', 'sound/rogue-star/yap/yap9.ogg', 'sound/rogue-star/yap/yap10.ogg', 'sound/rogue-star/yap/yap11.ogg', 'sound/rogue-star/yap/yap12.ogg', 'sound/rogue-star/yap/yap13.ogg', 'sound/rogue-star/yap/yap14.ogg')
diff --git a/code/modules/emotes/emote_mob.dm b/code/modules/emotes/emote_mob.dm
@@ -221,6 +221,11 @@
 						message = "<span class='emote'><B>[src]</B> ([ghost_follow_link(src, M)]) [input]</span>"
 					M.show_message(message, m_type)
 					M.create_chat_message(src, "[runemessage]", FALSE, list("emote"), (m_type == AUDIBLE_MESSAGE))
+					if(isliving(M))
+						var/mob/living/L = M
+						if(L.ai_holder)
+							var/datum/ai_holder/AI = L.ai_holder
+							AI.on_hear_emote(src, message)
 
 		for(var/obj/O as anything in o_viewers)
 			spawn(0)

diff --git a/code/modules/mob/ghost_simplemob_spawn.dm b/code/modules/mob/ghost_simplemob_spawn.dm
@@ -10,6 +10,7 @@ GLOBAL_LIST_INIT(ghost_spawnable_mobs,list(
 	"Deathclaw" = /mob/living/simple_mob/vore/aggressive/deathclaw,
 	"Deer" = /mob/living/simple_mob/vore/deer,
 	"Defanged Xenomorph" = /mob/living/simple_mob/vore/xeno_defanged,
+	"Doglin" = /mob/living/simple_mob/vore/doglin/basic,
 	"Dragon" = /mob/living/simple_mob/vore/aggressive/dragon,
 	"Dragon - V3b" = /mob/living/simple_mob/vore/aggressive/dragon/virgo3b,
 	"Dragon - Giant" = /mob/living/simple_mob/vore/bigdragon/friendly/maintpred,

diff --git a/code/modules/mob/living/carbon/human/emote.dm b/code/modules/mob/living/carbon/human/emote.dm
@@ -172,9 +172,11 @@ var/list/_human_default_emotes = list(
 	/decl/emote/audible/lwarble,
 	/decl/emote/audible/croak_skrell,
 	/decl/emote/audible/roarbark,
-	/decl/emote/audible/dook
-
+	/decl/emote/audible/dook,
 	//VOREStation Add End
+	//RS ADD START
+	/decl/emote/audible/yip,
+	/decl/emote/audible/yip/yap
 )
 
 	//VOREStation Add Start
@@ -315,7 +317,9 @@ var/list/_simple_mob_default_emotes = list(
 	/decl/emote/audible/vox_shriek,
 	/decl/emote/audible/purr,
 	/decl/emote/audible/purrlong,
-	/decl/emote/audible/dook
+	/decl/emote/audible/dook,
+	/decl/emote/audible/yip,
+	/decl/emote/audible/yip/yap
 
 	)
 	//VOREStation Add End