Merge pull request #14893 from WanderingFox95/WanderingFox95-TheDailyWhiplash
[Ready] The Daily Whiplash (Newspaper Baton)
This commit is contained in:
@@ -72,6 +72,16 @@
|
||||
category = CAT_WEAPONRY
|
||||
subcategory = CAT_MELEE
|
||||
|
||||
/datum/crafting_recipe/newsbaton
|
||||
name = "Newspaper Baton"
|
||||
result = /obj/item/melee/classic_baton/telescopic/newspaper
|
||||
reqs = list(/obj/item/melee/classic_baton/telescopic = 1,
|
||||
/obj/item/newspaper = 1,
|
||||
/obj/item/stack/sticky_tape = 2)
|
||||
time = 40
|
||||
category = CAT_WEAPONRY
|
||||
subcategory = CAT_MELEE
|
||||
|
||||
/datum/crafting_recipe/bokken
|
||||
name = "Training Bokken"
|
||||
result = /obj/item/melee/bokken
|
||||
|
||||
@@ -453,6 +453,18 @@
|
||||
playsound(src.loc, on_sound, 50, 1)
|
||||
add_fingerprint(user)
|
||||
|
||||
/obj/item/melee/classic_baton/telescopic/newspaper
|
||||
name = "The Daily Whiplash"
|
||||
desc = "A newspaper wrapped around a telescopic baton in such a way that it looks like you're beating people with a rolled up newspaper."
|
||||
icon = 'icons/obj/bureaucracy.dmi'
|
||||
icon_state = "newspaper"
|
||||
lefthand_file = 'icons/mob/inhands/misc/books_lefthand.dmi'
|
||||
righthand_file = 'icons/mob/inhands/misc/books_righthand.dmi'
|
||||
on_sound = 'sound/weapons/batonextend.ogg'
|
||||
on_icon_state = "newspaper2"
|
||||
off_icon_state = "newspaper"
|
||||
on_item_state = "newspaper"
|
||||
|
||||
/obj/item/melee/classic_baton/telescopic/contractor_baton
|
||||
name = "contractor baton"
|
||||
desc = "A compact, specialised baton assigned to Syndicate contractors. Applies light electrical shocks to targets."
|
||||
|
||||
Binary file not shown.
|
Before Width: | Height: | Size: 21 KiB After Width: | Height: | Size: 21 KiB |
Reference in New Issue
Block a user