Merge branch 'asfharh' of https://github.com/ARF-SS13/coyote-bayou in…

…to asfharh

code/controllers/subsystem/chat.dm

@@ -60,7 +60,7 @@ SUBSYSTEM_DEF(chat)
 	priority = FIRE_PRIORITY_CHAT
 	init_order = INIT_ORDER_CHAT
 
-	var/forbid_ghosting = TRUE
+	var/forbid_ghosting = FALSE
 	var/chat_display_plane = RUNECHAT_PLANE
 	/* 
 	** Base 

code/datums/components/spawner.dm

@@ -329,8 +329,11 @@
 	var/atom/P = parent
 	for(var/mob/living/butt in LAZYACCESS(SSmobs.clients_by_zlevel, P?.z)) // client-containing mobs, NOT clients
 		var/mrange = (get_dist(P, butt))
-		if(mrange <= range && mrange > min_range)
-			return TRUE
+		if(mrange <= range)
+			if(am_special)
+				return TRUE
+			else if(mrange > min_range)
+				return TRUE
 
 /// first checks if anyone is in range, then if so, turns itself on for another 20ish seconds
 /datum/component/spawner/proc/old_spawn()
@@ -346,8 +349,24 @@
 	// 		return
 	// 	activate()
 	if(something_in_range())
+		if(!am_special && blocked())
+			return
 		try_to_spawn()
 
+/// checks if we're blocked by something
+/datum/component/spawner/proc/blocked()
+	var/atom/A = parent
+	var/turf/here = get_turf(A)
+	for(var/obj/structure/respawner_blocker/RB in SSmonster_wave.spawn_blockers)
+		if(here.z != RB.z)
+			continue
+		var/maxdist = RB.protection_radius
+		if(maxdist <= 0)
+			continue
+		if(get_dist(RB, here) <= maxdist)
+			RB.blocked_something()
+			return TRUE
+
 /// turns itself on for another 20ish seconds
 /datum/component/spawner/proc/activate()
 	active = TRUE

code/game/objects/hand_items.dm

@@ -567,7 +567,7 @@ touch + help + facing their rear = pat back
 	. = ..()
 	AddComponent(/datum/component/knockback, 1, FALSE, TRUE)
 
-/obj/item/hand_item/tail/attack(mob/living/M, mob/living/user)
+/obj/item/hand_item/tail/afterattack(mob/living/M, mob/living/user)
 	. = ..()
 	user.spin(4, 1) // SPEEN
 
@@ -885,7 +885,7 @@ touch + help + facing their rear = pat back
 	flags_1 = CONDUCT_1
 	force = 0
 
-/obj/item/hand_item/butt/attack(mob/living/M, mob/living/user)
+/obj/item/hand_item/butt/afterattack(mob/living/M, mob/living/user)
 	. = ..()
 	user.spin(4, 1) // SPEEN
 

code/game/objects/items/cards_ids.dm

@@ -32,11 +32,11 @@
 
 
 /obj/item/card/Initialize(mapload)
+	. = ..()
 	if(this_is_easier_than_actually_removing_them)
 		// if(prob(50))
 		// 	SSartifacts.spawn_random_artifact(loc)
 		return INITIALIZE_HINT_QDEL
-	. = ..()
 
 /obj/item/card/ComponentInitialize()
 	. = ..()

code/modules/mob/living/carbon/emote.dm

@@ -427,7 +427,7 @@
 /datum/emote/living/carbon/tailer/run_emote(mob/living/user)
 	. = ..()
 	if(user.get_active_held_item())
-		to_chat(user, span_warning("Your brains too busy to use your tail right now, maybe empty up your hands a bit?"))
+		to_chat(user, span_warning("Your hands are too busy to use your tail right now, maybe empty up your hands a bit?"))
 		return
 	var/which_tail_to_spawn
 	if(LAZYLEN(user.mob_quirks))//Check if we need to do all these expensive checks

code/modules/mob/living/carbon/human/examine.dm

@@ -943,4 +943,3 @@ GLOBAL_LIST_INIT(personalitytrait2description, list(
  */
 
 
-

modular_roguetown/todo/trees/treestuff.dm

@@ -19,5 +19,4 @@ SUBSYSTEM_DEF(treesetup)
 		T.build_leafs()
 
 	initialize_me = list()
-
-
+