Merges Birdboat recycler into mainline

- Birdboat now has an /obj/machinery/recycler/deathtrap which functions
the same as the previous birdboat specific one. Various vars have been
added to the normal recycler to allow it to mimic the Birdboat one.

- Recyclers now recycle the contents of any items that they eat, in
addition to the items themselves. Throwing a full toolbelt in will eat
the tools as well.
This commit is contained in:
Jack Edge
2016-05-12 13:58:08 +01:00
parent 7dbecfaabd
commit 8fd21c79dc
4 changed files with 54 additions and 72 deletions
@@ -73,16 +73,16 @@
/obj/machinery/recycler/lumbermill
name = "lumbermill saw"
desc = "Faster then the cartoons!"
emagged = 2 //Always grinds people
emagged = 2 //Always gibs people
item_recycle_sound = 'sound/weapons/chainsawhit.ogg'
/obj/machinery/recycler/lumbermill/recycle(obj/item/weapon/grown/log/L, sound = 1)
L.loc = src.loc
/obj/machinery/recycler/lumbermill/recycle_item(obj/item/weapon/grown/log/L)
if(!istype(L))
return
if(sound)
playsound(src.loc, 'sound/weapons/chainsawhit.ogg', 100, 1)
new L.plank_type(src.loc, 1 + round(L.seed.potency / 25))
qdel(L)
else
var/potency = L.seed.potency
..()
new L.plank_type(src.loc, 1 + round(potency / 25))
/mob/living/simple_animal/chicken/rabbit/normal
icon_state = "b_rabbit"
@@ -130,4 +130,4 @@
spawnableAtoms = list(/obj/structure/flora/rock/icy = 5, /obj/structure/flora/rock/pile/icy = 5)
/obj/effect/landmark/mapGenerator/snowy
mapGeneratorType = /datum/mapGenerator/snowy
mapGeneratorType = /datum/mapGenerator/snowy