shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

July 5th TG sync (#1883)

Browse Source 
July 5th TG sync
This commit is contained in:
Poojawa
2017-07-05 22:14:19 -05:00
committed by GitHub
parent 454b9c3d68
commit b1b4826c0c
1264 changed files with 149689 additions and 570309 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/vehicles/atv.dm
+1 -1
View File
@@ -10,7 +10,7 @@
riding_datum = new/datum/riding/atv
/obj/vehicle/atv/Initialize()
.=..()
. = ..()
atvcover = atvcover || mutable_appearance(icon, "atvcover", ABOVE_MOB_LAYER)
code/modules/vehicles/scooter.dm
+3 -3
View File
@@ -6,7 +6,7 @@
/obj/vehicle/scooter/attackby(obj/item/I, mob/user, params)
if(istype(I, /obj/item/weapon/wrench))
to_chat(user, "<span class='notice'>You begin to remove the handlebars...</span>")
playsound(get_turf(user), 'sound/items/Ratchet.ogg', 50, 1)
playsound(get_turf(user), 'sound/items/ratchet.ogg', 50, 1)
if(do_after(user, 40*I.toolspeed, target = src))
var/obj/vehicle/scooter/skateboard/S = new /obj/vehicle/scooter/skateboard(get_turf(src))
new /obj/item/stack/rods(get_turf(src),2)
@@ -55,7 +55,7 @@
var/atom/throw_target = get_edge_target_turf(H, pick(GLOB.cardinal))
unbuckle_mob(H)
H.throw_at(throw_target, 4, 3)
H.Weaken(5)
H.Knockdown(100)
H.adjustStaminaLoss(40)
visible_message("<span class='danger'>[src] crashes into [A], sending [H] flying!</span>")
playsound(src, 'sound/effects/bang.ogg', 50, 1)
@@ -84,7 +84,7 @@
if(istype(I, /obj/item/weapon/wrench))
to_chat(user, "<span class='notice'>You deconstruct [src].</span>")
new /obj/item/stack/rods(get_turf(src),10)
playsound(get_turf(user), 'sound/items/Ratchet.ogg', 50, 1)
playsound(get_turf(user), 'sound/items/ratchet.ogg', 50, 1)
qdel(src)
return
code/modules/vehicles/speedbike.dm
+1 -3
View File
@@ -15,8 +15,6 @@
overlay = overlay || mutable_appearance(icon, overlay_state, ABOVE_MOB_LAYER)
add_overlay(overlay)
/obj/vehicle/space/speedbike/Move(newloc,move_dir)
if(has_buckled_mobs())
new /obj/effect/temp_visual/dir_setting/speedbike_trail(loc,move_dir)
@@ -50,7 +48,7 @@
playsound(src, 'sound/effects/bang.ogg', 50, 1)
if(ishuman(A))
var/mob/living/carbon/human/H = A
H.Weaken(5)
H.Knockdown(100)
H.adjustStaminaLoss(30)
H.apply_damage(rand(20,35), BRUTE)
if(!crash_all)