Skip to content

Commit

Permalink
add: basic ridable element and components & fireman carry (#5705) [te…
Browse files Browse the repository at this point in the history
…stmerge][1c08795]
  • Loading branch information
actions-user committed Oct 6, 2024
1 parent d2e986d commit e82d35b
Show file tree
Hide file tree
Showing 66 changed files with 2,294 additions and 738 deletions.
6 changes: 3 additions & 3 deletions _maps/map_files/Delta/delta.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -16486,7 +16486,7 @@
/turf/simulated/floor/plasteel,
/area/atmos)
"bWf" = (
/obj/vehicle/janicart{
/obj/vehicle/ridden/janicart{
dir = 4
},
/turf/simulated/floor/plasteel{
Expand Down Expand Up @@ -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{
Expand Down Expand Up @@ -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"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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" = (
Expand Down
2 changes: 1 addition & 1 deletion _maps/map_files/RandomRuins/SpaceRuins/spacehotelv1.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -4392,7 +4392,7 @@
d2 = 8;
icon_state = "0-8"
},
/obj/vehicle/janicart{
/obj/vehicle/ridden/janicart{
dir = 4
},
/turf/simulated/floor/plasteel{
Expand Down
4 changes: 2 additions & 2 deletions _maps/map_files/RandomZLevels/evil_santa.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down Expand Up @@ -2327,7 +2327,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
},
Expand Down
12 changes: 6 additions & 6 deletions _maps/map_files/celestation/celestation.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -19835,7 +19835,7 @@
/obj/effect/turf_decal/stripes/end{
dir = 4
},
/obj/vehicle/ambulance{
/obj/vehicle/ridden/ambulance{
dir = 4
},
/obj/machinery/light,
Expand Down Expand Up @@ -25169,7 +25169,7 @@
dir = 8;
pixel_x = -28
},
/obj/vehicle/janicart,
/obj/vehicle/ridden/janicart,
/turf/simulated/floor/plasteel,
/area/janitor)
"duG" = (
Expand Down Expand Up @@ -78220,7 +78220,7 @@
},
/area/medical/research)
"nHI" = (
/obj/vehicle/janicart,
/obj/vehicle/ridden/janicart,
/turf/simulated/floor/plasteel,
/area/janitor)
"nHL" = (
Expand Down Expand Up @@ -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
},
Expand Down Expand Up @@ -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"
Expand Down Expand Up @@ -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{
Expand Down
12 changes: 6 additions & 6 deletions _maps/map_files/cerestation/cerestation.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -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{
Expand Down Expand Up @@ -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
},
Expand Down Expand Up @@ -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
},
Expand Down Expand Up @@ -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,
Expand Down Expand Up @@ -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"
Expand Down Expand Up @@ -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;
Expand Down
6 changes: 3 additions & 3 deletions _maps/map_files/cyberiad/cyberiad.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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,
Expand Down Expand Up @@ -68651,7 +68651,7 @@
name = "north newscaster";
pixel_y = 34
},
/obj/vehicle/janicart,
/obj/vehicle/ridden/janicart,
/turf/simulated/floor/plasteel,
/area/janitor)
"lPa" = (
Expand Down
4 changes: 2 additions & 2 deletions _maps/map_files/event/Station/delta_old.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -15588,7 +15588,7 @@
pixel_x = -28;
pixel_y = 2
},
/obj/vehicle/janicart{
/obj/vehicle/ridden/janicart{
dir = 4
},
/turf/simulated/floor/plasteel{
Expand Down Expand Up @@ -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{
Expand Down
4 changes: 2 additions & 2 deletions _maps/map_files/event/Station/towerstation.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down Expand Up @@ -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{
Expand Down
16 changes: 8 additions & 8 deletions _maps/map_files/generic/CentComm.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -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{
Expand Down Expand Up @@ -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{
Expand Down Expand Up @@ -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,
Expand Down Expand Up @@ -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,
Expand Down Expand Up @@ -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,
Expand Down Expand Up @@ -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{
Expand Down Expand Up @@ -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,
Expand Down Expand Up @@ -49334,7 +49334,7 @@
},
/area/syndicate_mothership/elite_squad)
"wGg" = (
/obj/vehicle/motorcycle{
/obj/vehicle/ridden/motorcycle{
dir = 8
},
/turf/simulated/floor/wood{
Expand Down
6 changes: 3 additions & 3 deletions _maps/map_files/generic/syndicatebase.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -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";
Expand Down Expand Up @@ -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" = (
Expand Down
4 changes: 2 additions & 2 deletions _maps/map_files/generic/z2_old.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -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" = (
Expand Down Expand Up @@ -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" = (
Expand Down
8 changes: 4 additions & 4 deletions _maps/map_files/nova/nova.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -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{
Expand Down Expand Up @@ -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" = (
Expand Down Expand Up @@ -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{
Expand Down Expand Up @@ -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" = (
Expand Down
Loading

0 comments on commit e82d35b

Please sign in to comment.