Merge pull request #4044 from DJSnapshot/dev

Grammar fix and fix to c45 being declared twice in boxes.dm
This commit is contained in:
Mloc
2013-12-09 10:21:43 -08:00
3 changed files with 3 additions and 3 deletions
+1 -1
View File
@@ -57,7 +57,7 @@ var/global/list/autolathe_recipes_hidden = list( \
new /obj/item/weapon/weldingtool/largetank(), \
new /obj/item/weapon/handcuffs(), \
new /obj/item/ammo_magazine/a357(), \
new /obj/item/ammo_magazine/c45(), \
new /obj/item/ammo_magazine/c45m(), \
new /obj/item/ammo_casing/shotgun(), \
new /obj/item/ammo_casing/shotgun/dart(), \
/* new /obj/item/weapon/shield/riot(), */ \
+1 -1
View File
@@ -80,7 +80,7 @@
item_color = "polsuit"
/obj/item/clothing/under/det/slob/verb/rollup()
set name = "Roll suit sleevels"
set name = "Roll suit sleeves"
set category = "Object"
set src in usr
item_color = item_color == "polsuit" ? "polsuit_rolled" : "polsuit"
+1 -1
View File
@@ -14,7 +14,7 @@
multiple_sprites = 1
/obj/item/ammo_magazine/c45
/obj/item/ammo_magazine/c45m
name = "magazine (.45)"
icon_state = "45"
ammo_type = "/obj/item/ammo_casing/c45"