Merge pull request #1395 from melonstorm/master

CentCom additions, typo fixes
This commit is contained in:
Erthilo
2012-06-26 10:06:44 -07:00
4 changed files with 3375 additions and 3275 deletions
+2 -2
View File
@@ -361,7 +361,7 @@
/obj/item/weapon/storage/syringes
name = "syringes"
desc = "A box full of syringes."
desc = "A biohazard alert warning is printed on the box"
desc = "A biohazard alert warning is printed on the box."
icon_state = "syringe"
foldable = /obj/item/stack/sheet/cardboard //BubbleWrap
@@ -435,7 +435,7 @@
/obj/item/weapon/storage/injectbox
name = "DNA-Injectors"
desc = "This box contains injectors it seems."
desc = "This box contains injectors."
icon_state = "box"
item_state = "syringe_kit"
foldable = /obj/item/stack/sheet/cardboard //BubbleWrap
+1 -1
View File
@@ -153,7 +153,7 @@ obj/effect/decal/poster/New(var/serial)
desc += " Here to protect and serve... your donuts! A generously proportioned man, he teaches you the value of hiding your snacks."
if(20)
name += " - Tajaran Today, Special #222"
desc += " A controversial front page pinup from NTFashion, banned on numerous stations for it's unreasonably cute depictions."
desc += " A controversial front page pinup from NTFashion, banned on numerous stations for its unreasonably cute depictions."
if(21)
name += " - Respect a Soghun"
desc += " This poster depicts a well dressed looking Soghun receiving a prestigious award. It appears to espouse greater co-operation and harmony between the two races."
+4
View File
@@ -70,6 +70,10 @@ should be listed in the changelog upon commit though. Thanks. -->
<li class="tweak">Blood is now actually lost from the person being dragged.</li>
<li class="bugfix">Fixed CPR being performed at weird health levels.</li>
</ul>
<h3 class="author">Watermelon Storm updated:</h3>
<ul class="changes bgimages16">
<li class="rscadd">Added a medbay (with rolling beds) and a holding cell to the destination of the escape shuttle.</li>
</ul>
</div>
<div class="commit sansserif">
+3368 -3272
View File
File diff suppressed because it is too large Load Diff