mirror of
https://github.com/CHOMPStation2/CHOMPStation2.git
synced 2025-12-11 10:43:20 +00:00
Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac-voreupdate
This commit is contained in:
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
//-------------------------------------------
|
||||
|
||||
Reference in New Issue
Block a user