Merge pull request #5339 from Citadel-Station-13/upstream-merge-35352

[MIRROR] Toy Daggers!
This commit is contained in:
deathride58
2018-02-07 20:51:39 +00:00
committed by GitHub
2 changed files with 18 additions and 0 deletions
+1
View File
@@ -46,6 +46,7 @@
/obj/item/toy/eightball = 2,
/obj/item/toy/windupToolbox = 2,
/obj/item/toy/clockwork_watch = 2,
/obj/item/toy/toy_dagger = 2,
/obj/item/extendohand/acme = 1)
light_color = LIGHT_COLOR_GREEN
+17
View File
@@ -21,6 +21,7 @@
* Kitty toys!
* Snowballs
* Clockwork Watches
* Toy Daggers
*/
@@ -1075,6 +1076,22 @@
..()
to_chat(user, "<span class='info'>Station Time: [worldtime2text()]")
/*
* Toy Dagger
*/
/obj/item/toy/toy_dagger
name = "toy dagger"
desc = "A cheap plastic replica of a dagger. Produced by THE ARM Toys, Inc."
icon = 'icons/obj/wizard.dmi'
icon_state = "render"
item_state = "cultdagger"
lefthand_file = 'icons/mob/inhands/weapons/swords_lefthand.dmi'
righthand_file = 'icons/mob/inhands/weapons/swords_righthand.dmi'
inhand_x_dimension = 32
inhand_y_dimension = 32
w_class = WEIGHT_CLASS_SMALL
/*
* Xenomorph action figure
*/