Lavaland code review fixes - also integrates flyswatter and cat toy

This commit is contained in:
Mark van Alphen
2019-04-20 00:24:58 +02:00
parent 5452d4e8df
commit c878f8e36e
18 changed files with 91 additions and 181 deletions
@@ -179,6 +179,7 @@
lefthand_file = 'icons/mob/inhands/items_lefthand.dmi'
righthand_file = 'icons/mob/inhands/items_righthand.dmi'
desc = "A sharpened bone. The bare minimum in survival."
materials = list()
/obj/item/kitchen/knife/combat/cyborg
name = "cyborg knife"
@@ -263,7 +263,7 @@
attack_verb_on = list("cleaved", "swiped", "slashed", "chopped")
hitsound = 'sound/weapons/bladeslice.ogg'
w_class = WEIGHT_CLASS_BULKY
sharp = 1
sharp = TRUE
faction_bonus_force = 30
nemesis_factions = list("mining", "boss")
var/transform_cooldown
@@ -337,6 +337,8 @@
/obj/item/melee/energy/cleaving_saw/suicide_act(mob/user)
user.visible_message("<span class='suicide'>[user] is [active ? "closing [src] on [user.p_their()] neck" : "opening [src] into [user.p_their()] chest"]! It looks like [user.p_theyre()] trying to commit suicide!</span>")
transform_cooldown = 0
transform_weapon(user, TRUE)
return BRUTELOSS
/obj/item/melee/energy/cleaving_saw/melee_attack_chain(mob/user, atom/target, params)
@@ -388,7 +388,8 @@
/obj/item/flashlight,
/obj/item/reagent_containers/spray,
/obj/item/soap,
/obj/item/holosign_creator
/obj/item/holosign_creator,
/obj/item/melee/flyswatter,
)
/obj/item/storage/belt/janitor/full/New()
@@ -399,6 +400,7 @@
new /obj/item/soap(src)
new /obj/item/grenade/chem_grenade/cleaner(src)
new /obj/item/grenade/chem_grenade/cleaner(src)
new /obj/item/melee/flyswatter(src)
update_icon()
/obj/item/storage/belt/lazarus