Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac-voreupdate

This commit is contained in:
izac112
2020-05-16 23:26:52 +02:00
73 changed files with 902 additions and 361 deletions

View File

@@ -1,6 +1,7 @@
/obj/vehicle/bike
name = "space-bike"
desc = "Space wheelies! Woo!"
description_info = "Use ctrl-click to quickly toggle the engine if you're adjacent (only when vehicle is stationary). Alt-click will similarly toggle the kickstand."
icon = 'icons/obj/bike.dmi'
icon_state = "bike_off"
dir = SOUTH

View File

@@ -2,6 +2,7 @@
name = "cargo train tug"
desc = "A ridable electric car designed for pulling cargo trolleys."
icon = 'icons/obj/vehicles_vr.dmi' //VOREStation Edit
description_info = "Use ctrl-click to quickly toggle the engine if you're adjacent (only when vehicle is stationary). Alt-click will grab the keys, if present."
icon_state = "cargo_engine"
on = 0
powered = 1

View File

@@ -42,8 +42,6 @@
var/load_offset_y = 0 //pixel_y offset for item overlay
var/mob_offset_y = 0 //pixel_y offset for mob overlay
//var/datum/riding/riding_datum = null //VOREStation Edit - Moved to movables.
//-------------------------------------------
// Standard procs
//-------------------------------------------