Merge remote-tracking branch 'upstream/master' into dev

Conflicts:
	code/modules/projectiles/gun.dm
	html/changelogs/RavingManiac-master.yml

code/_onclick/hud/hud.dm

@@ -341,6 +341,7 @@ datum/hud/New(mob/owner)
 		if(src.hud_used.item_action_list)
 			src.client.screen -= src.hud_used.item_action_list
 		src.client.screen -= src.internals
+		src.client.screen += src.hud_used.action_intent		//we want the intent swticher visible
 	else
 		hud_used.hud_shown = 1
 		if(src.hud_used.adding)

code/game/gamemodes/gameticker.dm

@@ -418,7 +418,7 @@ var/global/datum/controller/gameticker/ticker
 				robo.laws.show_laws(world)
 
 	if(dronecount)
-		world << "<b>There [dronecount>1 ? "were" : "was"] [dronecount] industrious maintenance [dronecount>1 ? "drones" : "drone"] at the end of this round."
+		world << "<b>There [dronecount>1 ? "were" : "was"] [dronecount] industrious maintenance [dronecount>1 ? "drones" : "drone"] at the end of this round.</b>"
 
 	mode.declare_completion()//To declare normal completion.
 

code/game/objects/effects/spiders.dm

@@ -22,9 +22,9 @@
 
 /obj/effect/spider/attackby(var/obj/item/weapon/W, var/mob/user)
 	if(W.attack_verb.len)
-		visible_message("\red <B>\The [src] have been [pick(W.attack_verb)] with \the [W][(user ? " by [user]." : ".")]")
+		visible_message("<span class='warning'>\The [src] have been [pick(W.attack_verb)] with \the [W][(user ? " by [user]." : ".")]</span>")
 	else
-		visible_message("\red <B>\The [src] have been attacked with \the [W][(user ? " by [user]." : ".")]")
+		visible_message("<span class='warning'>\The [src] have been attacked with \the [W][(user ? " by [user]." : ".")]</span>")
 
 	var/damage = W.force / 4.0
 

code/modules/admin/verbs/cinematic.dm

@@ -1,12 +1,17 @@
 /client/proc/cinematic(var/cinematic as anything in list("explosion",null))
-	set name = "cinematic"
+	set name = "Cinematic"
 	set category = "Fun"
 	set desc = "Shows a cinematic."	// Intended for testing but I thought it might be nice for events on the rare occasion Feel free to comment it out if it's not wanted.
-	set hidden = 1
+
+	if(!check_rights(R_FUN))
+		return
+
 	if(alert("Are you sure you want to run [cinematic]?","Confirmation","Yes","No")=="No") return
 	if(!ticker)	return
 	switch(cinematic)
 		if("explosion")
+			if(alert("The game will be over. Are you really sure?", "Confirmation" ,"Continue", "Cancel") == "Cancel")
+				return
 			var/parameter = input(src,"station_missed = ?","Enter Parameter",0) as num
 			var/override
 			switch(parameter)
@@ -15,4 +20,8 @@
 				if(0)
 					override = input(src,"mode = ?","Enter Parameter",null) as anything in list("blob","mercenary","AI malfunction","no override")
 			ticker.station_explosion_cinematic(parameter,override)
+
+	log_admin("[key_name(src)] launched cinematic \"[cinematic]\"")
+	message_admins("[key_name_admin(src)] launched cinematic \"[cinematic]\"", 1)
+
 	return

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

@@ -395,14 +395,14 @@
 	else if(is_bleeding["right foot"])
 		display_shoes = 1
 	if(display_chest)
-		msg += "<span class='warning'><b>[src] has blood soaking through from under [t_his] clothing!</b></span>\n"
+		msg += "<span class='danger'>[src] has blood soaking through from under [t_his] clothing!</span>\n"
 	if(display_shoes)
-		msg += "<span class='warning'><b>[src] has blood running from [t_his] shoes!</b></span>\n"
+		msg += "<span class='danger'>[src] has blood running from [t_his] shoes!</span>\n"
 	if(display_gloves)
-		msg += "<span class='warning'><b>[src] has blood running from under [t_his] gloves!</b></span>\n"
+		msg += "<span class='danger'>[src] has blood running from under [t_his] gloves!</span>\n"
 
 	for(var/implant in get_visible_implants(0))
-		msg += "<span class='warning'><b>[src] has \a [implant] sticking out of [t_his] flesh!</span>\n"
+		msg += "<span class='danger'>[src] has \a [implant] sticking out of [t_his] flesh!</span>\n"
 	if(digitalcamo)
 		msg += "[t_He] [t_is] repulsively uncanny!\n"
 

code/modules/projectiles/gun.dm

@@ -157,7 +157,7 @@
 
 	if(world.time < next_fire_time)
 		if (world.time % 3) //to prevent spam
-			user << "<span class='warning'>[src] is not ready to fire again!"
+			user << "<span class='warning'>[src] is not ready to fire again!</span>"
 		return
 
 	//unpack firemode data

html/changelogs/RavingManiac-master.yml

@@ -0,0 +1,6 @@
+author: RavingManiac
+delete-after: True
+
+changes: 
+  - tweak: "Candles now burn for about 30 minutes."
+  - tweak: "Intent menu now appears while zooming with a sniper rifle."