Merge pull request #2331 from Erthilo/master

Virus crate and emote fixes.

code/datums/supplypacks.dm

@@ -353,6 +353,8 @@ var/list/all_supply_groups = list("Operations","Security","Hospitality","Enginee
 					/obj/item/weapon/storage/box/syringes,
 					/obj/item/weapon/storage/box/beakers,
 					/obj/item/weapon/reagent_containers/glass/bottle/mutagen)
+	cost = 25
+	containertype = "/obj/structure/closet/crate/secure"
 	containername = "Virus crate"
 	access = access_cmo
 	group = "Medical / Science"

code/game/machinery/newscaster.dm

@@ -10,6 +10,7 @@
 	var/backup_author =""
 	var/is_admin_message = 0
 	var/icon/img = null
+	var/icon/backup_img
 
 /datum/feed_channel
 	var/channel_name=""
@@ -28,6 +29,7 @@
 	src.backup_body = ""
 	src.backup_author = ""
 	src.img = null
+	src.backup_img = null
 
 /datum/feed_channel/proc/clear()
 	src.channel_name = ""
@@ -640,6 +642,11 @@ var/list/obj/machinery/newscaster/allCasters = list() //Global list that will co
 			if(MSG.is_admin_message)
 				alert("This channel was created by a Nanotrasen Officer. You cannot censor it.","Ok")
 				return
+			if(MSG.img != null)
+				MSG.backup_img = MSG.img
+				MSG.img = null
+			else
+				MSG.img = MSG.backup_img
 			if(MSG.body != "<B>\[REDACTED\]</B>")
 				MSG.backup_body = MSG.body
 				MSG.body = "<B>\[REDACTED\]</B>"

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

@@ -591,8 +591,8 @@
 
 
 /mob/living/carbon/human/verb/pose()
-	set name = "Set pose"
-	set desc = "Sets description which will be shown when someone examines you"
+	set name = "Set Pose"
+	set desc = "Sets a description which will be shown when someone examines you."
 	set category = "IC"
 
 	pose =  copytext(sanitize(input(usr, "This is [src]. \He is...", "Pose", null)  as text), 1, MAX_MESSAGE_LEN)

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

@@ -419,6 +419,8 @@
 
 	msg += "*---------*</span>"
 	if (pose)
-		msg += "\n[t_He] is [pose]."
+		if( findtext(pose,".",lentext(pose)) == 0 && findtext(pose,"!",lentext(pose)) == 0 && findtext(pose,"?",lentext(pose)) == 0 )
+			pose = addtext(pose,".") //Makes sure all emotes end with a period.
+		msg += "\n[t_He] is [pose]"
 
 	usr << msg

code/modules/mob/living/simple_animal/simple_animal.dm

@@ -227,8 +227,10 @@
 /mob/living/simple_animal/emote(var/act)
 	if(act)
 		if(act == "scream")	act = "makes a loud and pained whimper" //ugly hack to stop animals screaming when crushed :P
+		if( findtext(act,".",lentext(act)) == 0 && findtext(act,"!",lentext(act)) == 0 && findtext(act,"?",lentext(act)) == 0 )
+			act = addtext(act,".") //Makes sure all emotes end with a period.
 		for (var/mob/O in viewers(src, null))
-			O.show_message("<B>[src]</B> [act].")
+			O.show_message("<B>[src]</B> [act]")
 
 
 /mob/living/simple_animal/attack_animal(mob/living/simple_animal/M as mob)

html/changelog.html

@@ -64,6 +64,9 @@ should be listed in the changelog upon commit though. Thanks. -->
 	<h3 class="author">Erthilo updated:</h3>
 	<ul class="changes bgimages16">
 		<li class="bugfix">Fixed SSD (logged-out) players not staying asleep.</li>
+		<li class="bugfix">Fixed set-pose verb and mice emotes having extra periods.</li>
+		<li class="bugfix">Fixed virus crate not appearing and breaking supply shuttle.</li>
+		<li class="bugfix">Fixed newcaster photos not being censored.</li>
 	</ul>
 </div>