things with stuff (#6233)

* buncha things from upstream

* datums globals, onclick

* datums

* game folder, holy shit mirror bot why

* modules

* icons

* dme

* compiles cleanly

* tools purge

* updates maps

* double check just because. and wew lad

* incidentally, this needs more work first

* some things

* weh

* sound cleanup and icons

* reeeee

* compile issues

* oh look, fresh code sync

* cleans up some unused icons

* dirty vars

* reeeeeeeeeeeeeeee

* wew lad. fuck off with this already
This commit is contained in:
Poojawa
2018-04-07 23:07:09 -04:00
committed by deathride58
parent 832939d3ac
commit 5fa001c10f
838 changed files with 25446 additions and 23273 deletions
+3 -1
View File
@@ -78,7 +78,9 @@
foodtype = FRUIT
/obj/item/reagent_containers/food/snacks/grown/ghost_chili/attack_hand(mob/user)
..()
. = ..()
if(.)
return
if( ismob(loc) )
held_mob = loc
START_PROCESSING(SSobj, src)
+3 -2
View File
@@ -161,6 +161,9 @@
/obj/structure/bonfire/attack_hand(mob/user)
. = ..()
if(.)
return
if(burning)
to_chat(user, "<span class='warning'>You need to extinguish [src] before removing the logs!</span>")
return
@@ -173,8 +176,6 @@
new /obj/item/stack/rods(loc, 1)
qdel(src)
return
..()
/obj/structure/bonfire/proc/CheckOxygen()
if(isopenturf(loc))