Merge fixes, and spelling corrections.

This commit is contained in:
Erthilo
2012-05-21 20:47:55 +01:00
parent 03dc270006
commit 4114e246ee
4 changed files with 5 additions and 5 deletions
+2 -2
View File
@@ -151,8 +151,8 @@ obj/structure/closet/wardrobe/hop/New()
/obj/structure/closet/wardrobe/robotics_black/New()
new /obj/item/clothing/under/rank/roboticist(src)
new /obj/item/clothing/under/rank/roboticist(src)
new /obj/item/clothing/suit/labcoat(src)
new /obj/item/clothing/suit/labcoat(src)
new /obj/item/clothing/suit/storage/labcoat(src)
new /obj/item/clothing/suit/storage/labcoat(src)
new /obj/item/clothing/shoes/black(src)
new /obj/item/clothing/shoes/black(src)
return
+1 -1
View File
@@ -131,7 +131,7 @@
return
if (W.w_class > max_w_class)
user << "\red This [W] is too big for this [src]"
user << "\red This [W] is too big for \the [src]"
return
var/sum_w_class = W.w_class
+1 -1
View File
@@ -135,7 +135,7 @@
return
if (W.w_class > max_w_class)
user << "\red This [W] is too big for this [src]"
user << "\red This [W] is too big for \the [src]"
return
if(istype(W, /obj/item/weapon/tray))