Merge pull request #11377 from Kraseo/contractor-fixes

Some contractor adjustments & fixes
This commit is contained in:
Ghom
2020-03-09 00:26:54 +01:00
committed by GitHub
8 changed files with 13 additions and 15 deletions
+1 -1
View File
@@ -378,7 +378,7 @@
item_flags = NONE
force = 5
cooldown = 20
stam_dmg = 45 //3 hit stamcrit
stam_dmg = 45 //4 hit stamcrit
affect_silicon = TRUE
on_sound = 'sound/weapons/contractorbatonextend.ogg'
on_stun_sound = 'sound/effects/contractorbatonhit.ogg'
@@ -481,8 +481,7 @@
/obj/item/clothing/gloves/krav_maga/combatglovesplus,
/obj/item/gun/ballistic/automatic/c20r/toy/unrestricted/riot,
/obj/item/reagent_containers/syringe/stimulants,
/obj/item/storage/box/syndie_kit/imp_freedom,
/obj/item/toy/eightball/haunted
/obj/item/storage/box/syndie_kit/imp_freedom
)
var/obj/item1 = pick_n_take(item_list)
var/obj/item2 = pick_n_take(item_list)