cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-12 19:22:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge fixes, and spelling corrections.

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

4
code/game/objects/closets/wardrobe.dm
View File

@@ -151,8 +151,8 @@ obj/structure/closet/wardrobe/hop/New()
/obj/structure/closet/wardrobe/robotics_black/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/under/rank/roboticist(src) new /obj/item/clothing/under/rank/roboticist(src)
new /obj/item/clothing/suit/labcoat(src) new /obj/item/clothing/suit/storage/labcoat(src)
new /obj/item/clothing/suit/labcoat(src) new /obj/item/clothing/suit/storage/labcoat(src)
new /obj/item/clothing/shoes/black(src) new /obj/item/clothing/shoes/black(src)
new /obj/item/clothing/shoes/black(src) new /obj/item/clothing/shoes/black(src)
return return

2
code/game/objects/storage/coat.dm
View File

@@ -131,7 +131,7 @@
return return
if (W.w_class > max_w_class) 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 return
var/sum_w_class = W.w_class var/sum_w_class = W.w_class

2
code/game/objects/storage/storage.dm
View File

@@ -135,7 +135,7 @@
return return
if (W.w_class > max_w_class) 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 return
if(istype(W, /obj/item/weapon/tray)) if(istype(W, /obj/item/weapon/tray))

2
code/modules/projectiles/gun.dm
View File

@@ -514,7 +514,7 @@ client/verb
usr.gun_move_icon.name = "Disallow Walking" usr.gun_move_icon.name = "Disallow Walking"
else else
// winset(usr,"default.target_can_move","is-flat=false;border=none") // winset(usr,"default.target_can_move","is-flat=false;border=none")
usr << "Target may no longegr move." usr << "Target may no longer move."
target_can_run = 0 target_can_run = 0
del(usr.gun_run_icon) del(usr.gun_run_icon)
if(usr.gun_move_icon) if(usr.gun_move_icon)