add: basic ridable element and components & fireman carry (#5705) [te…

…smerge][1c08795] commit 1c08795 Author: NightDawnFox <[email protected]> Date: Sun Oct 6 09:16:35 2024 +0500 Обновление пожарного граба commit 1f32b4e Author: NightDawnFox <[email protected]> Date: Sat Oct 5 23:24:05 2024 +0500 Первый багфикс commit a04320f Merge: fe991ee 2a35223 Author: NightDawnFox <[email protected]> Date: Sat Oct 5 18:25:26 2024 +0500 Merge remote-tracking branch 'upstream/master220' into riding commit fe991ee Merge: 6a6a552 b95f436 Author: NightDawnFox <[email protected]> Date: Sat Oct 5 17:56:48 2024 +0500 Merge remote-tracking branch 'upstream/master220' into riding commit 6a6a552 Merge: 20651c5 683d5f4 Author: NightDawnFox <[email protected]> Date: Sun Sep 29 21:00:53 2024 +0500 Merge remote-tracking branch 'upstream/master220' into riding commit 20651c5 Merge: f8cc55b a93879c Author: NightDawnFox <[email protected]> Date: Sat Sep 28 20:09:08 2024 +0500 Merge remote-tracking branch 'upstream/master220' into riding commit f8cc55b Author: NightDawnFox <[email protected]> Date: Fri Sep 27 10:52:52 2024 +0500 совместимость с новой commit d0a5b1b Merge: 2302c03 01b7b5d Author: NightDawnFox <[email protected]> Date: Fri Sep 27 10:49:42 2024 +0500 Merge remote-tracking branch 'upstream/master220' into riding commit 2302c03 Author: NightDawnFox <[email protected]> Date: Thu Sep 19 12:12:28 2024 +0500 готово commit dcdaf4c Author: NightDawnFox <[email protected]> Date: Tue Sep 10 12:12:26 2024 +0500 еще 4 строчки кода, юхуу! commit 649cfb5 Merge: ad22d24 0d07c48 Author: NightDawnFox <[email protected]> Date: Tue Sep 10 11:23:23 2024 +0500 Merge remote-tracking branch 'upstream/master220' into riding commit ad22d24 Author: NightDawnFox <[email protected]> Date: Mon Sep 2 12:11:40 2024 +0500 janicart commit 6d47f1a Author: NightDawnFox <[email protected]> Date: Mon Sep 2 10:29:15 2024 +0500 ambulance done commit d42c79d Merge: 4c9ed16 7898f0b Author: NightDawnFox <[email protected]> Date: Mon Sep 2 08:52:32 2024 +0500 Merge remote-tracking branch 'upstream/master220' into riding commit 4c9ed16 Merge: bda591c ef8e620 Author: NightDawnFox <[email protected]> Date: Fri Aug 30 12:01:53 2024 +0500 Merge remote-tracking branch 'upstream/master220' into riding commit bda591c Author: NightDawnFox <[email protected]> Date: Sun Aug 25 14:39:15 2024 +0500 v0.6 TODO: Перевести остальной транспорт под компонент, а именно: -ambulance -janicart -motorcycle -secway -snowmobile -speedbike -sportscar - lava & dragonboats commit 62b8444 Author: NightDawnFox <[email protected]> Date: Sun Aug 25 13:16:36 2024 +0500 багфиксы пожарного хвата commit af34dbd Merge: 8f49443 59b2a65 Author: NightDawnFox <[email protected]> Date: Sun Aug 25 12:30:30 2024 +0500 Merge remote-tracking branch 'upstream/master220' into riding commit 8f49443 Author: NightDawnFox <[email protected]> Date: Mon Aug 12 16:52:24 2024 +0500 v0.5
ss220-space · Oct 6, 2024 · aa9dc12 · aa9dc12
1 parent 41a4d93
commit aa9dc12
Show file tree

Hide file tree

Showing 66 changed files with 2,294 additions and 738 deletions.
diff --git a/_maps/map_files/Delta/delta.dmm b/_maps/map_files/Delta/delta.dmm
@@ -16486,7 +16486,7 @@
 /turf/simulated/floor/plasteel,
 /area/atmos)
 "bWf" = (
-/obj/vehicle/janicart{
+/obj/vehicle/ridden/janicart{
 	dir = 4
 	},
 /turf/simulated/floor/plasteel{
@@ -30963,7 +30963,7 @@
 /area/medical/paramedic)
 "djT" = (
 /obj/effect/decal/warning_stripes/northeastsouth,
-/obj/vehicle/ambulance{
+/obj/vehicle/ridden/ambulance{
 	dir = 4
 	},
 /obj/machinery/light{
@@ -122046,7 +122046,7 @@
 /turf/simulated/floor/plating/airless,
 /area/engine/engineering)
 "xqE" = (
-/obj/vehicle/secway,
+/obj/vehicle/ridden/secway,
 /turf/simulated/floor/plasteel{
 	dir = 8;
 	icon_state = "vault"

diff --git a/_maps/map_files/RandomRuins/LavaRuins/lavaland_biodome_winter.dmm b/_maps/map_files/RandomRuins/LavaRuins/lavaland_biodome_winter.dmm
@@ -160,7 +160,7 @@
 /turf/simulated/floor/plating/asteroid/snow/atmosphere,
 /area/ruin/powered/snow_biodome)
 "aJ" = (
-/obj/vehicle/atv,
+/obj/vehicle/ridden/atv,
 /turf/simulated/floor/plating/asteroid/snow/atmosphere,
 /area/ruin/powered/snow_biodome)
 "aK" = (

diff --git a/_maps/map_files/RandomRuins/SpaceRuins/spacehotelv1.dmm b/_maps/map_files/RandomRuins/SpaceRuins/spacehotelv1.dmm
@@ -4392,7 +4392,7 @@
 	d2 = 8;
 	icon_state = "0-8"
 	},
-/obj/vehicle/janicart{
+/obj/vehicle/ridden/janicart{
 	dir = 4
 	},
 /turf/simulated/floor/plasteel{

diff --git a/_maps/map_files/RandomZLevels/evil_santa.dmm b/_maps/map_files/RandomZLevels/evil_santa.dmm
@@ -32,7 +32,7 @@
 	},
 /area/vision_change_area/awaymission/evil_santa/hut_e)
 "ae" = (
-/obj/vehicle/snowmobile/blue/key{
+/obj/vehicle/ridden/snowmobile/blue/key{
 	dir = 4
 	},
 /turf/simulated/floor/wood,
@@ -2326,7 +2326,7 @@
 /turf/simulated/floor/carpet,
 /area/vision_change_area/awaymission/evil_santa/hut_n)
 "sE" = (
-/obj/vehicle/snowmobile/blue/key,
+/obj/vehicle/ridden/snowmobile/blue/key,
 /turf/simulated/floor/plating/asteroid/snow/atmosphere{
 	slowdown = 0
 	},

diff --git a/_maps/map_files/celestation/celestation.dmm b/_maps/map_files/celestation/celestation.dmm
@@ -19835,7 +19835,7 @@
 /obj/effect/turf_decal/stripes/end{
 	dir = 4
 	},
-/obj/vehicle/ambulance{
+/obj/vehicle/ridden/ambulance{
 	dir = 4
 	},
 /obj/machinery/light,
@@ -25169,7 +25169,7 @@
 	dir = 8;
 	pixel_x = -28
 	},
-/obj/vehicle/janicart,
+/obj/vehicle/ridden/janicart,
 /turf/simulated/floor/plasteel,
 /area/janitor)
 "duG" = (
@@ -78220,7 +78220,7 @@
 	},
 /area/medical/research)
 "nHI" = (
-/obj/vehicle/janicart,
+/obj/vehicle/ridden/janicart,
 /turf/simulated/floor/plasteel,
 /area/janitor)
 "nHL" = (
@@ -79485,7 +79485,7 @@
 /area/maintenance/fsmaint2)
 "nVx" = (
 /obj/effect/turf_decal/delivery/red,
-/obj/vehicle/secway,
+/obj/vehicle/ridden/secway,
 /obj/structure/sign/poster/official/help_others{
 	pixel_y = 32
 	},
@@ -85874,7 +85874,7 @@
 /area/crew_quarters/captain)
 "pgx" = (
 /obj/effect/turf_decal/delivery/red,
-/obj/vehicle/secway,
+/obj/vehicle/ridden/secway,
 /turf/simulated/floor/plasteel{
 	dir = 1;
 	icon_state = "darkred"
@@ -102947,7 +102947,7 @@
 /turf/simulated/floor/grass,
 /area/hallway/spacebridge/scidock)
 "syE" = (
-/obj/vehicle/ambulance{
+/obj/vehicle/ridden/ambulance{
 	dir = 4
 	},
 /obj/effect/turf_decal/stripes/end{

diff --git a/_maps/map_files/cerestation/cerestation.dmm b/_maps/map_files/cerestation/cerestation.dmm
@@ -5725,7 +5725,7 @@
 /area/security/main)
 "aWi" = (
 /obj/effect/decal/warning_stripes/northeastsouth,
-/obj/vehicle/ambulance{
+/obj/vehicle/ridden/ambulance{
 	dir = 4
 	},
 /obj/machinery/light{
@@ -36566,7 +36566,7 @@
 /obj/machinery/atmospherics/unary/vent_scrubber/on{
 	dir = 4
 	},
-/obj/vehicle/janicart,
+/obj/vehicle/ridden/janicart,
 /obj/machinery/alarm{
 	pixel_y = 24
 	},
@@ -36601,7 +36601,7 @@
 /turf/simulated/floor/plating,
 /area/storage/tech)
 "gJx" = (
-/obj/vehicle/janicart,
+/obj/vehicle/ridden/janicart,
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
 	dir = 4
 	},
@@ -39540,7 +39540,7 @@
 /turf/simulated/floor/plating,
 /area/hallway/primary/fore/west)
 "hzm" = (
-/obj/vehicle/ambulance{
+/obj/vehicle/ridden/ambulance{
 	dir = 4
 	},
 /obj/effect/decal/warning_stripes/northeastsouth,
@@ -40245,7 +40245,7 @@
 /area/janitor)
 "hKL" = (
 /obj/effect/turf_decal/delivery/red,
-/obj/vehicle/secway,
+/obj/vehicle/ridden/secway,
 /turf/simulated/floor/plasteel{
 	dir = 8;
 	icon_state = "darkred"
@@ -74900,7 +74900,7 @@
 /turf/simulated/floor/plating,
 /area/medical/medbreak)
 "rzH" = (
-/obj/vehicle/secway,
+/obj/vehicle/ridden/secway,
 /obj/effect/turf_decal/delivery/red,
 /turf/simulated/floor/plasteel{
 	dir = 10;

diff --git a/_maps/map_files/cyberiad/cyberiad.dmm b/_maps/map_files/cyberiad/cyberiad.dmm
@@ -8724,7 +8724,7 @@
 	},
 /area/security/permabrig)
 "aBT" = (
-/obj/vehicle/secway,
+/obj/vehicle/ridden/secway,
 /obj/item/key/security,
 /turf/simulated/floor/plasteel{
 	dir = 1;
@@ -30504,7 +30504,7 @@
 /turf/simulated/floor/plasteel,
 /area/hallway/primary/central/se)
 "bTG" = (
-/obj/vehicle/ambulance,
+/obj/vehicle/ridden/ambulance,
 /obj/effect/decal/warning_stripes/west,
 /obj/effect/decal/warning_stripes/south,
 /obj/effect/decal/warning_stripes/east,
@@ -68651,7 +68651,7 @@
 	name = "north newscaster";
 	pixel_y = 34
 	},
-/obj/vehicle/janicart,
+/obj/vehicle/ridden/janicart,
 /turf/simulated/floor/plasteel,
 /area/janitor)
 "lPa" = (

diff --git a/_maps/map_files/event/Station/delta_old.dmm b/_maps/map_files/event/Station/delta_old.dmm
@@ -15588,7 +15588,7 @@
 	pixel_x = -28;
 	pixel_y = 2
 	},
-/obj/vehicle/janicart{
+/obj/vehicle/ridden/janicart{
 	dir = 4
 	},
 /turf/simulated/floor/plasteel{
@@ -30829,7 +30829,7 @@
 /area/medical/paramedic)
 "djT" = (
 /obj/effect/decal/warning_stripes/northeastsouth,
-/obj/vehicle/ambulance{
+/obj/vehicle/ridden/ambulance{
 	dir = 4
 	},
 /obj/machinery/light{

diff --git a/_maps/map_files/event/Station/towerstation.dmm b/_maps/map_files/event/Station/towerstation.dmm
@@ -15172,7 +15172,7 @@
 /turf/simulated/floor/plating,
 /area/medical/sleeper)
 "jMJ" = (
-/obj/vehicle/janicart{
+/obj/vehicle/ridden/janicart{
 	dir = 4
 	},
 /obj/item/key/janitor,
@@ -37026,7 +37026,7 @@
 /turf/simulated/floor/plasteel,
 /area/atmos)
 "xDI" = (
-/obj/vehicle/secway,
+/obj/vehicle/ridden/secway,
 /obj/effect/turf_decal/delivery,
 /obj/machinery/camera/autoname,
 /obj/machinery/requests_console{

diff --git a/_maps/map_files/generic/CentComm.dmm b/_maps/map_files/generic/CentComm.dmm
@@ -1990,7 +1990,7 @@
 /turf/simulated/floor/wood,
 /area/centcom/jail)
 "aQh" = (
-/obj/vehicle/motorcycle{
+/obj/vehicle/ridden/motorcycle{
 	dir = 8
 	},
 /obj/structure/sign/poster/contraband/random{
@@ -7604,7 +7604,7 @@
 /turf/simulated/floor/grass,
 /area/centcom/evac)
 "dxs" = (
-/obj/vehicle/motorcycle{
+/obj/vehicle/ridden/motorcycle{
 	dir = 1
 	},
 /turf/simulated/floor/plasteel{
@@ -20407,7 +20407,7 @@
 /turf/simulated/floor/carpet/black,
 /area/syndicate_mothership/control)
 "jGg" = (
-/obj/vehicle/secway{
+/obj/vehicle/ridden/secway{
 	layer = 3.5
 	},
 /obj/item/key/security,
@@ -21925,7 +21925,7 @@
 /turf/simulated/floor/carpet,
 /area/centcom/zone1)
 "kqc" = (
-/obj/vehicle/janicart{
+/obj/vehicle/ridden/janicart{
 	dir = 4
 	},
 /obj/item/key/janitor,
@@ -24980,7 +24980,7 @@
 /turf/simulated/floor/indestructible/abductor,
 /area/abductor_ship)
 "lLd" = (
-/obj/vehicle/janicart{
+/obj/vehicle/ridden/janicart{
 	dir = 4
 	},
 /obj/item/key/janitor,
@@ -46732,7 +46732,7 @@
 /area/syndicate_mothership)
 "vwk" = (
 /obj/effect/decal/cleanable/dirt,
-/obj/vehicle/motorcycle{
+/obj/vehicle/ridden/motorcycle{
 	dir = 1
 	},
 /turf/simulated/floor/plasteel{
@@ -47220,7 +47220,7 @@
 /turf/simulated/floor/plasteel,
 /area/shuttle/escape)
 "vLc" = (
-/obj/vehicle/motorcycle{
+/obj/vehicle/ridden/motorcycle{
 	dir = 8
 	},
 /obj/effect/decal/cleanable/dirt,
@@ -49334,7 +49334,7 @@
 	},
 /area/syndicate_mothership/elite_squad)
 "wGg" = (
-/obj/vehicle/motorcycle{
+/obj/vehicle/ridden/motorcycle{
 	dir = 8
 	},
 /turf/simulated/floor/wood{

diff --git a/_maps/map_files/generic/syndicatebase.dmm b/_maps/map_files/generic/syndicatebase.dmm
@@ -22755,15 +22755,15 @@
 	dir = 1;
 	on = 1
 	},
-/obj/vehicle/motorcycle,
+/obj/vehicle/ridden/motorcycle,
 /turf/simulated/floor/plasteel{
 	dir = 8;
 	icon_state = "vault";
 	tag = "icon-vault (WEST)"
 	},
 /area/syndicate/unpowered/syndicate_space_base/main/central_w)
 "tAt" = (
-/obj/vehicle/motorcycle,
+/obj/vehicle/ridden/motorcycle,
 /turf/simulated/floor/plasteel{
 	dir = 8;
 	icon_state = "vault";
@@ -23238,7 +23238,7 @@
 /turf/simulated/floor/plating,
 /area/syndicate/unpowered/syndicate_space_base/maintenance/east)
 "tOd" = (
-/obj/vehicle/snowmobile/blue,
+/obj/vehicle/ridden/snowmobile/blue,
 /turf/simulated/floor/plating/ice,
 /area/ruin/unpowered)
 "tOv" = (

diff --git a/_maps/map_files/generic/z2_old.dmm b/_maps/map_files/generic/z2_old.dmm
@@ -1562,7 +1562,7 @@
 	},
 /area/centcom/specops)
 "bpL" = (
-/obj/vehicle/snowmobile/blue/key,
+/obj/vehicle/ridden/snowmobile/blue/key,
 /turf/simulated/floor/indestructible/snow,
 /area/syndicate_mothership)
 "bpU" = (
@@ -22780,7 +22780,7 @@
 	},
 /area/holodeck/source_meetinghall)
 "qwX" = (
-/obj/vehicle/snowmobile/key,
+/obj/vehicle/ridden/snowmobile/key,
 /turf/simulated/floor/indestructible/snow,
 /area/syndicate_mothership)
 "qxr" = (

diff --git a/_maps/map_files/nova/nova.dmm b/_maps/map_files/nova/nova.dmm
@@ -15965,7 +15965,7 @@
 /turf/simulated/floor/plating,
 /area/maintenance/tourist)
 "con" = (
-/obj/vehicle/janicart{
+/obj/vehicle/ridden/janicart{
 	dir = 4
 	},
 /turf/simulated/floor/plasteel{
@@ -49491,7 +49491,7 @@
 	color = "red";
 	dir = 1
 	},
-/obj/vehicle/secway,
+/obj/vehicle/ridden/secway,
 /turf/simulated/floor/mech_bay_recharge_floor,
 /area/security/securearmory)
 "hlN" = (
@@ -49583,7 +49583,7 @@
 /area/security/securearmory)
 "hmk" = (
 /obj/effect/decal/warning_stripes/northeastsouth,
-/obj/vehicle/ambulance{
+/obj/vehicle/ridden/ambulance{
 	dir = 4
 	},
 /obj/machinery/light{
@@ -158333,7 +158333,7 @@
 /area/hallway/secondary/entry/commercial)
 "xEE" = (
 /obj/effect/decal/warning_stripes/south,
-/obj/vehicle/secway,
+/obj/vehicle/ridden/secway,
 /turf/simulated/floor/mech_bay_recharge_floor,
 /area/security/securearmory)
 "xEN" = (