Merge pull request #1419 from OrbisAnima/orb-cargo-love

Added 3 new crates to cargo:
This commit is contained in:
Arokha Sieyes
2017-04-23 23:53:59 -04:00
committed by GitHub
5 changed files with 79 additions and 6 deletions
@@ -283,7 +283,6 @@ obj/item/weapon/material/hatchet/tacknife/combatknife/fluff/katarina/handle_shie
item_state = "holochain_mob"
flags = CONDUCT | NOBLOODY
no_attack_log = 1 //if you want to turn on the attack log for this, comment/delete this line. Orbis.
slot_flags = SLOT_BELT
force = 10
throwforce = 3
@@ -291,6 +290,13 @@ obj/item/weapon/material/hatchet/tacknife/combatknife/fluff/katarina/handle_shie
damtype = HALLOSS
attack_verb = list("flogged", "whipped", "lashed", "disciplined", "chastised", "flayed")
//General use
/obj/item/weapon/melee/fluff/holochain/mass
desc = "A mass produced version of the original. It has faux leather and an aluminium base, but still stings like the original."
force = 8
attack_verb = list("flogged", "whipped", "lashed", "flayed")
// joey4298:Emoticon
/obj/item/device/fluff/id_kit_mime
name = "Mime ID reprinter"