Finished pepperspray, added mace item, improved security console, and a few other things. Will know when I see the diffs.

This commit is contained in:
SkyMarshal
2011-12-18 00:23:02 -07:00
parent a0298c0477
commit fc3914364f
13 changed files with 160 additions and 38 deletions
+2 -2
View File
@@ -175,7 +175,7 @@
/obj/item/weapon/storage/gl_kit
name = "Prescription Glasses"
desc = "This box contains nerd glasses."
desc = "This box contains vision correcting glasses."
icon_state = "glasses"
item_state = "syringe_kit"
@@ -213,7 +213,7 @@
/obj/item/weapon/storage/trackimp_kit
name = "Tracking Implant Kit"
desc = "Box full of scum-bag tracking utensils."
desc = "Box full of tracking utensils."
icon_state = "implant"
item_state = "syringe_kit"
+20 -3
View File
@@ -443,8 +443,8 @@
data = "Clown Land"
/obj/item/weapon/card/emag
desc = "It's a card with a magnetic strip attached to some circuitry."
name = "cryptographic sequencer"
desc = "An identification card. No shit. Seems to have some funny chip on it, though."
name = "identification card"
icon_state = "emag"
item_state = "card-id"
origin_tech = "magnets=2;syndicate=2"
@@ -525,7 +525,7 @@
throw_range = 10
origin_tech = "combat=3;materials=3;engineering=3"
/obj/item/weapon/pepperspray
/obj/item/weapon/pepperspray //This is riot control
desc = "Manufactred by UhangInc., used to blind and down an opponent quickly."
icon = 'weapons.dmi'
name = "pepperspray"
@@ -537,6 +537,23 @@
throw_speed = 2
throw_range = 10
var/catch = 1
var/BottleSize = 1
var/ReagentAmount = 30
/obj/item/weapon/pepperspray/small //And this is for personal defense.
desc = "This appears to be a small, nonlethal, single use personal defense weapon. Hurts like a bitch, though."
icon = 'weapons.dmi'
name = "mace"
icon_state = "pepperspray"
item_state = "pepperspray"
flags = ONBELT|TABLEPASS|OPENCONTAINER|FPRINT|USEDELAY
throwforce = 3
w_class = 1.0
throw_speed = 2
throw_range = 10
catch = 1
BottleSize = 0
ReagentAmount = 1
/obj/item/weapon/clipboard
name = "clipboard"