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
+6 -3
View File
@@ -35,6 +35,9 @@
return ..()
/obj/structure/statue/attack_hand(mob/living/user)
. = ..()
if(.)
return
user.changeNext_move(CLICK_CD_MELEE)
add_fingerprint(user)
user.visible_message("[user] rubs some dust off from the [name]'s surface.", \
@@ -80,11 +83,11 @@
/obj/structure/statue/uranium/attack_hand(mob/user)
radiate()
..()
. = ..()
/obj/structure/statue/uranium/attack_paw(mob/user)
radiate()
..()
. = ..()
/obj/structure/statue/uranium/proc/radiate()
if(!active)
@@ -239,7 +242,7 @@
/obj/structure/statue/bananium/attack_hand(mob/user)
honk()
..()
. = ..()
/obj/structure/statue/bananium/attack_paw(mob/user)
honk()