Merge remote-tracking branch 'upstream/master' into wounds-part-2

code/_onclick/hud/alert.dm

@@ -447,8 +447,6 @@ or shoot a gun to move around via Newton's 3rd Law of Motion."
 			var/time_name
 			if(G.seconds_until_activation)
 				time_name = "until the Ark activates"
-			else if(G.grace_period)
-				time_name = "of grace period remaining"
 			else if(G.progress_in_seconds)
 				time_name = "until the Ark finishes summoning"
 			if(time_info)

code/_onclick/hud/clockwork_marauder.dm

@@ -0,0 +1,45 @@
+/datum/hud/marauder
+	var/obj/screen/hosthealth
+	var/obj/screen/blockchance
+	var/obj/screen/counterchance
+
+/datum/hud/marauder/New(mob/living/simple_animal/hostile/clockwork/marauder/guardian/owner)
+	..()
+	var/obj/screen/using
+
+	healths = new /obj/screen/healths/clock()
+	infodisplay += healths
+
+	hosthealth = new /obj/screen/healths/clock()
+	hosthealth.screen_loc = ui_internal
+	infodisplay += hosthealth
+
+	using = new /obj/screen/marauder/emerge()
+	using.screen_loc = ui_zonesel
+	static_inventory += using
+
+/datum/hud/marauder/Destroy()
+	blockchance = null
+	counterchance = null
+	hosthealth = null
+	return ..()
+
+/mob/living/simple_animal/hostile/clockwork/marauder/guardian/create_mob_hud()
+	if(client && !hud_used)
+		hud_used = new /datum/hud/marauder(src, ui_style2icon(client.prefs.UI_style))
+
+/obj/screen/marauder
+	icon = 'icons/mob/clockwork_mobs.dmi'
+
+/obj/screen/marauder/emerge
+	icon_state = "clockguard_emerge"
+	name = "Emerge/Return"
+	desc = "Emerge or Return."
+
+/obj/screen/marauder/emerge/Click()
+	if(istype(usr, /mob/living/simple_animal/hostile/clockwork/marauder/guardian))
+		var/mob/living/simple_animal/hostile/clockwork/marauder/guardian/G = usr
+		if(G.is_in_host())
+			G.try_emerge()
+		else
+			G.return_to_host()

code/_onclick/item_attack.dm

@@ -67,9 +67,9 @@
 
 /**
   * Called when someone uses us to attack a mob in melee combat.
-  * 
+  *
   * This proc respects CheckAttackCooldown() default clickdelay handling.
-  * 
+  *
   * @params
   * * mob/living/M - target
   * * mob/living/user - attacker
@@ -201,9 +201,9 @@
 		if(SEND_SIGNAL(user, COMSIG_COMBAT_MODE_CHECK, COMBAT_MODE_INACTIVE))
 			bad_trait = SKILL_COMBAT_MODE //blacklist combat skills.
 			if(SEND_SIGNAL(src, COMSIG_COMBAT_MODE_CHECK, COMBAT_MODE_ACTIVE))
-				. *= 0.5
+				. *= 0.8
 		else if(SEND_SIGNAL(src, COMSIG_COMBAT_MODE_CHECK, COMBAT_MODE_INACTIVE))
-			. *= 1.5
+			. *= 1.2
 
 	if(!user.mind || !I.used_skills)
 		return
@@ -220,7 +220,7 @@
   * Also called when clicking on something with an item without being in melee range
   *
   * WARNING: This does not automatically check clickdelay if not in a melee attack! Be sure to account for this!
-  * 
+  *
   * @params
   * * target - The thing we clicked
   * * user - mob of person clicking