From 7827680f66b2d25ebdc274cc6ff71986a4e0f7bf Mon Sep 17 00:00:00 2001 From: Erthilo Date: Wed, 13 Feb 2013 17:09:54 +0000 Subject: [PATCH 1/5] Fixes virus crate having no model and cost. --- code/datums/supplypacks.dm | 2 ++ 1 file changed, 2 insertions(+) diff --git a/code/datums/supplypacks.dm b/code/datums/supplypacks.dm index 42b5f0ba7bd..33caf8f1164 100755 --- a/code/datums/supplypacks.dm +++ b/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" From ed7640914124100cde1953bcd5337aa8966c9e23 Mon Sep 17 00:00:00 2001 From: Erthilo Date: Wed, 13 Feb 2013 17:10:19 +0000 Subject: [PATCH 2/5] Fixes mice emotes and Set-Pose verb periods. --- code/modules/mob/living/carbon/human/emote.dm | 4 ++-- code/modules/mob/living/carbon/human/examine.dm | 4 +++- code/modules/mob/living/simple_animal/simple_animal.dm | 4 +++- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/code/modules/mob/living/carbon/human/emote.dm b/code/modules/mob/living/carbon/human/emote.dm index d49e36b3f3a..7af5577e576 100644 --- a/code/modules/mob/living/carbon/human/emote.dm +++ 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) diff --git a/code/modules/mob/living/carbon/human/examine.dm b/code/modules/mob/living/carbon/human/examine.dm index d80f27c729d..7df9fa4325f 100644 --- a/code/modules/mob/living/carbon/human/examine.dm +++ b/code/modules/mob/living/carbon/human/examine.dm @@ -419,6 +419,8 @@ msg += "*---------*" 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 diff --git a/code/modules/mob/living/simple_animal/simple_animal.dm b/code/modules/mob/living/simple_animal/simple_animal.dm index 3091517fbce..f838fa3d2fe 100644 --- a/code/modules/mob/living/simple_animal/simple_animal.dm +++ b/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("[src] [act].") + O.show_message("[src] [act]") /mob/living/simple_animal/attack_animal(mob/living/simple_animal/M as mob) From bda06da3c462398722f842c70751aa8971536c29 Mon Sep 17 00:00:00 2001 From: Erthilo Date: Wed, 13 Feb 2013 17:13:25 +0000 Subject: [PATCH 3/5] Changelog update. --- html/changelog.html | 1 + 1 file changed, 1 insertion(+) diff --git a/html/changelog.html b/html/changelog.html index aab4e2abf94..7cfa3e9e248 100644 --- a/html/changelog.html +++ b/html/changelog.html @@ -64,6 +64,7 @@ should be listed in the changelog upon commit though. Thanks. -->

Erthilo updated:

  • Fixed SSD (logged-out) players not staying asleep.
    • +
  • Fixed set-pose verb and mice emotes having extra periods.
From 6d6787b89b5946ede65a2d5e8b018bb04906dcc9 Mon Sep 17 00:00:00 2001 From: Erthilo Date: Wed, 13 Feb 2013 18:01:14 +0000 Subject: [PATCH 4/5] Fixes newcaster censoring not censoring photos. --- code/game/machinery/newscaster.dm | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/code/game/machinery/newscaster.dm b/code/game/machinery/newscaster.dm index c57e5cbb8d6..b199c79c202 100644 --- a/code/game/machinery/newscaster.dm +++ b/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 != "\[REDACTED\]") MSG.backup_body = MSG.body MSG.body = "\[REDACTED\]" From 792b1f5af7f02476402a43972845e1d25bf9ae4c Mon Sep 17 00:00:00 2001 From: Erthilo Date: Wed, 13 Feb 2013 18:01:49 +0000 Subject: [PATCH 5/5] Another changelog update. --- html/changelog.html | 2 ++ 1 file changed, 2 insertions(+) diff --git a/html/changelog.html b/html/changelog.html index 7cfa3e9e248..e907a104ba4 100644 --- a/html/changelog.html +++ b/html/changelog.html @@ -65,6 +65,8 @@ should be listed in the changelog upon commit though. Thanks. -->
  • Fixed SSD (logged-out) players not staying asleep.
  • Fixed set-pose verb and mice emotes having extra periods.
    • +
  • Fixed virus crate not appearing and breaking supply shuttle.
    • +
  • Fixed newcaster photos not being censored.