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-02 03:53:25 -05:00
committed by deathride58
parent 832939d3ac
commit 5fa001c10f
838 changed files with 25446 additions and 23273 deletions
+2 -2
View File
@@ -28,14 +28,14 @@
resistance_flags = LAVA_PROOF | FIRE_PROOF
/datum/crafting_recipe/oar
name = "goliath bone oar"
name = "Goliath Bone Oar"
result = /obj/item/oar
reqs = list(/obj/item/stack/sheet/bone = 2)
time = 15
category = CAT_PRIMAL
/datum/crafting_recipe/boat
name = "goliath hide boat"
name = "Goliath Hide Boat"
result = /obj/vehicle/ridden/lavaboat
reqs = list(/obj/item/stack/sheet/animalhide/goliath_hide = 3)
time = 50
+3 -2
View File
@@ -63,8 +63,9 @@
add_overlay("cart_buffer")
/obj/vehicle/ridden/janicart/attack_hand(mob/user)
if(..())
return 1
. = ..()
if(.)
return
else if(mybag)
mybag.forceMove(get_turf(user))
user.put_in_hands(mybag)
+1
View File
@@ -80,6 +80,7 @@
playsound(src, 'sound/effects/bang.ogg', 50, 1)
/obj/vehicle/ridden/scooter/skateboard/MouseDrop(atom/over_object)
. = ..()
var/mob/living/carbon/M = usr
if(!istype(M) || M.incapacitated() || !Adjacent(M))
return