- Added basic heavy-duty cables, they cannot be destroyed with wirecutters, unfortunately they currently cannot be created either. Not present anywhere on the map yet.

- Fixed a bug with masks, which did not follow the equipment rules of the SLOT_MASK flag.
- Fixed a problem where monkeys could not equip a backpack.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@3774 316c924e-a436-60f5-8080-3fe189b3f50e
This commit is contained in:
baloh.matevz
2012-06-09 13:57:10 +00:00
parent d8047dfefa
commit 2781da8d5b
6 changed files with 45 additions and 4 deletions
@@ -438,7 +438,7 @@
if (emptyHand)
wear_mask.DblClick()
return
if (!( istype(W, /obj/item/clothing/mask) ))
if (!( W.slot_flags & SLOT_MASK ))
return
u_equip(W)
wear_mask = W
@@ -721,7 +721,7 @@
W.layer = initial(W.layer)
W.add_fingerprint(source)
else
if ((istype(item, /obj/item) && item.flags & 1))
if ((istype(item, /obj/item) && item.slot_flags & SLOT_BACK ))
source.drop_item()
loc = target
item.layer = 20
+14 -1
View File
@@ -114,11 +114,24 @@
if("mask")
if (wear_mask)
return
if (!( istype(W, /obj/item/clothing/mask) ))
if (!( W.slot_flags & SLOT_MASK ))
return
u_equip(W)
wear_mask = W
W.equipped(src, text)
if("back")
if (back)
return
if (!istype(W, /obj/item))
return
if (!( W.slot_flags & SLOT_BACK ))
return
if(istype(W,/obj/item/weapon/twohanded) && W:wielded)
usr << "<span class='warning'>Unwield the [initial(W.name)] first!</span>"
return
u_equip(W)
back = W
W.equipped(src, text)
if("back")
if ((back || !( istype(W, /obj/item/weapon) )))
return
+27
View File
@@ -0,0 +1,27 @@
/obj/item/weapon/cable_coil/heavyduty
name = "heavy cable coil"
icon = 'power.dmi'
icon_state = "wire"
/obj/structure/cable/heavyduty
icon = 'power_local.dmi'
name = "large power cable"
desc = "This cable is tough. It cannot be cut with simple hand tools."
/obj/structure/cable/heavyduty/attackby(obj/item/W, mob/user)
var/turf/T = src.loc
if(T.intact)
return
if(istype(W, /obj/item/weapon/wirecutters))
usr << "\blue These cables are too tough to be cut with those [W.name]."
return
else if(istype(W, /obj/item/weapon/cable_coil))
usr << "\blue You will need heavier cables to connect to these."
return
else
..()
/obj/structure/cable/heavyduty/cableColor(var/colorC)
return