Merge branch 'master' of https://github.com/PolarisSS13/Polaris into is_tool

This commit is contained in:
Anewbe
2018-08-02 22:35:14 -05:00
262 changed files with 7022 additions and 3130 deletions

View File

@@ -16,6 +16,10 @@
starts_with = list(/obj/item/weapon/material/twohanded/fireaxe)
/obj/structure/closet/fireaxecabinet/initialize()
..()
fireaxe = locate() in contents
/obj/structure/closet/fireaxecabinet/attackby(var/obj/item/O as obj, var/mob/user as mob) //Marker -Agouri
//..() //That's very useful, Erro
@@ -115,6 +119,7 @@
if(src.locked)
to_chat(user, "<span class='warning'>The cabinet won't budge!</span>")
return
if(localopened)
if(fireaxe)
user.put_in_hands(fireaxe)