Merge branch 'master' into upstream-merge-11110

This commit is contained in:
Nadyr
2021-07-16 19:09:43 -04:00
committed by GitHub
529 changed files with 1341 additions and 1359 deletions

View File

@@ -39,7 +39,7 @@
desc = "A trolly designed to transport security personnel or prisoners."
icon = 'icons/obj/vehicles_vr.dmi'
icon_state = "paddy_trailer"
anchored = 0
anchored = FALSE
passenger_allowed = 1
locked = 0
@@ -384,6 +384,6 @@
src.active_engines = active_engines
if(!lead && !tow)
anchored = 0
anchored = FALSE
else
anchored = 1
anchored = TRUE

View File

@@ -157,7 +157,7 @@
/obj/vehicle/bike/turn_on()
ion.start()
anchored = 1
anchored = TRUE
update_icon()

View File

@@ -30,7 +30,7 @@
desc = "A large, flat platform made for putting things on. Or people."
icon = 'icons/obj/vehicles_vr.dmi' //VOREStation Edit
icon_state = "cargo_trailer"
anchored = 0
anchored = FALSE
passenger_allowed = 0
locked = 0
@@ -385,9 +385,9 @@
src.active_engines = active_engines
if(!lead && !tow)
anchored = 0
anchored = FALSE
else
anchored = 1
anchored = TRUE
// VOREStation Edit Start - Overlay stuff for the chair-like effect
/obj/vehicle/train/engine/update_icon()

View File

@@ -160,7 +160,7 @@
name = "all terrain trailer"
icon = 'icons/obj/vehicles_64x64.dmi'
icon_state = "quadtrailer"
anchored = 0
anchored = FALSE
passenger_allowed = 1
buckle_lying = 1
locked = 0

View File

@@ -47,7 +47,7 @@
desc = "A trolley designed to transport security equipment to a scene."
icon = 'icons/obj/vehicles_vr.dmi'
icon_state = "secitemcarrierbot"
anchored = 0
anchored = FALSE
passenger_allowed = 0
locked = 0
@@ -397,6 +397,6 @@
src.active_engines = active_engines
if(!lead && !tow)
anchored = 0
anchored = FALSE
else
anchored = 1
anchored = TRUE

View File

@@ -8,12 +8,12 @@
name = "vehicle"
icon = 'icons/obj/vehicles.dmi'
layer = MOB_LAYER + 0.1 //so it sits above objects including mobs
density = 1
anchored = 1
density = TRUE
anchored = TRUE
animate_movement=1
light_range = 3
can_buckle = 1
can_buckle = TRUE
buckle_movable = 1
buckle_lying = 0