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

Merge branch 'master' into upstream-merge-31176

Browse Source
This commit is contained in:
LetterJay
2017-11-09 03:24:38 -06:00
committed by GitHub
parent e86688be57 460f19297f
commit d6e5942baf
1253 changed files with 77070 additions and 91353 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/vehicles/atv.dm
+1 -1
View File
@@ -1,7 +1,7 @@
/obj/vehicle/atv
name = "all-terrain vehicle"
desc = "An all-terrain vehicle built for traversing rough terrain with ease. One of the few old-earth technologies that are still relevant on most planet-bound outposts."
desc = "An all-terrain vehicle built for traversing rough terrain with ease. One of the few old-Earth technologies that are still relevant on most planet-bound outposts."
icon_state = "atv"
var/static/mutable_appearance/atvcover
code/modules/vehicles/vehicle.dm
+3 -3
View File
@@ -1,7 +1,7 @@
/obj/vehicle
name = "vehicle"
desc = "A basic vehicle, vroom"
desc = "A basic vehicle, vroom."
icon = 'icons/obj/vehicles.dmi'
icon_state = "fuckyou"
density = TRUE
@@ -35,8 +35,8 @@
. = ..()
/obj/vehicle/user_buckle_mob(mob/living/M, mob/user)
if(user.incapacitated())
/obj/vehicle/user_buckle_mob(mob/living/M, mob/living/user)
if(!istype(user) || user.incapacitated())
return
for(var/atom/movable/A in get_turf(src))
if(A.density)