mirror of
https://github.com/CHOMPStation2/CHOMPStation2.git
synced 2025-12-12 19:22:56 +00:00
Merge fixes, and spelling corrections.
This commit is contained in:
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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))
|
||||
|
||||
@@ -514,7 +514,7 @@ client/verb
|
||||
usr.gun_move_icon.name = "Disallow Walking"
|
||||
else
|
||||
// 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
|
||||
del(usr.gun_run_icon)
|
||||
if(usr.gun_move_icon)
|
||||
|
||||
Reference in New Issue
Block a user