From e7411b2936ad06a79065bc9dac011ce57c16a472 Mon Sep 17 00:00:00 2001 From: DeltaDav <121488347+DeltaDav@users.noreply.github.com> Date: Tue, 26 Nov 2024 11:49:59 +0100 Subject: [PATCH] CCRS Fix (Car Crarfting Rudimentary System Fix) (#282) --- .../map_files/Pahrump-AB/Pahrump-AB-Upper.dmm | 524 +++++++++--------- .../crafting/recipes/vehicle_crafts.dm | 119 +++- .../crafting/recipes/vehicle_parts.dm | 24 +- 3 files changed, 364 insertions(+), 303 deletions(-) diff --git a/_maps/map_files/Pahrump-AB/Pahrump-AB-Upper.dmm b/_maps/map_files/Pahrump-AB/Pahrump-AB-Upper.dmm index e71ff85e62..2996eee378 100644 --- a/_maps/map_files/Pahrump-AB/Pahrump-AB-Upper.dmm +++ b/_maps/map_files/Pahrump-AB/Pahrump-AB-Upper.dmm @@ -244,20 +244,6 @@ /obj/item/bedsheet, /turf/open/floor/plasteel/f13/vault_floor/white, /area/f13/city) -"amg" = ( -/obj/structure/table/wood, -/obj/item/paper/natural, -/obj/item/paper/natural, -/obj/item/paper/natural, -/obj/item/paper/natural, -/obj/item/folder/red, -/obj/item/pen/charcoal, -/obj/item/card/id/dogtag/legrecruit, -/obj/item/card/id/dogtag/legrecruit, -/obj/item/card/id/dogtag/legrecruit, -/obj/item/card/id/dogtag/legveteran, -/turf/open/floor/wood_fancy, -/area/f13/legion) "amm" = ( /obj/effect/decal/cleanable/dirt{ color = "000000" @@ -1083,17 +1069,6 @@ }, /turf/open/floor/wood_common, /area/f13/city) -"bAf" = ( -/obj/structure/closet/locker/oldstyle{ - anchored = 1 - }, -/obj/item/radio/headset/headset_bos, -/obj/item/radio/headset/headset_bos, -/obj/item/radio/headset/headset_bos, -/obj/item/radio/headset/headset_bos, -/obj/item/radio/headset/headset_bos, -/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust, -/area/f13/brotherhood/offices2nd) "bAr" = ( /turf/open/floor/wood_common/wood_common_light, /area/f13/city) @@ -1469,10 +1444,6 @@ /obj/structure/railing, /turf/open/floor/f13/wood, /area/f13/ncr) -"bZf" = ( -/obj/mecha/working/normalvehicle/vertibird/loaded, -/turf/open/floor/plasteel/airless/white, -/area/f13/wasteland) "bZG" = ( /obj/structure/chair/f13chair1{ dir = 8 @@ -1519,6 +1490,12 @@ }, /turf/open/transparent/openspace, /area/f13/ncr) +"cbU" = ( +/obj/machinery/door/poddoor/gate{ + id = "legiongate1" + }, +/turf/open/indestructible/ground/inside/mountain, +/area/f13/wasteland) "ccz" = ( /turf/open/floor/f13/wood{ icon_state = "housewood2" @@ -1538,6 +1515,15 @@ /obj/item/healthanalyzer, /turf/open/floor/plasteel/f13/vault_floor/misc/cmo, /area/f13/ncr) +"ccT" = ( +/obj/structure/closet/crate/wooden, +/obj/item/gun/ballistic/automatic/service, +/obj/item/gun/ballistic/automatic/service, +/obj/item/stack/f13Cash/random/ncr/med, +/turf/open/floor/f13{ + icon_state = "floorrusty" + }, +/area/f13/city) "ccV" = ( /obj/structure/closet/crate/bin/trashbin, /turf/open/floor/wood_common, @@ -1599,10 +1585,6 @@ icon_state = "housewood3-broken" }, /area/f13/brotherhood/leisure) -"cjS" = ( -/obj/structure/simple_door/room, -/turf/open/floor/wood_fancy, -/area/f13/ncr) "ckJ" = ( /obj/machinery/gear_painter{ pixel_y = 10; @@ -1798,13 +1780,6 @@ }, /turf/closed/mineral/random/low_chance, /area/f13/caves) -"cxf" = ( -/obj/machinery/door/poddoor/gate/bunker{ - id = "bosfrontgate"; - name = "brotherhood blue-steel gate" - }, -/turf/open/transparent/openspace, -/area/f13/wasteland) "cxI" = ( /mob/living/simple_animal/chicken, /turf/open/floor/wood_common, @@ -2032,12 +2007,6 @@ }, /turf/open/transparent/openspace, /area/f13/wasteland/ncr) -"cRA" = ( -/obj/machinery/computer/card/bos{ - dir = 4 - }, -/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust, -/area/f13/brotherhood/offices2nd) "cSz" = ( /obj/structure/rack/shelf_metal, /turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust, @@ -2076,6 +2045,12 @@ /obj/structure/railing/corner, /turf/open/transparent/openspace, /area/f13/wasteland/ncr) +"cVg" = ( +/obj/machinery/msgterminal/brotherhood{ + dir = 4 + }, +/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust, +/area/f13/brotherhood/offices2nd) "cVo" = ( /obj/structure/window/reinforced{ dir = 1 @@ -2220,17 +2195,6 @@ icon_state = "housewood3-broken" }, /area/f13/building) -"dcK" = ( -/obj/machinery/light{ - dir = 1; - light_color = "#e8eaff" - }, -/obj/structure/table, -/obj/machinery/computer/terminal{ - termtag = "Business" - }, -/turf/open/floor/plasteel/f13/vault_floor/misc/cmo, -/area/f13/ncr) "dcO" = ( /obj/structure/table/wood, /obj/structure/bedsheetbin, @@ -2360,10 +2324,6 @@ }, /turf/open/floor/wood_common, /area/f13/city) -"dkS" = ( -/obj/mecha/working/normalvehicle/vertibird/ncr/loaded, -/turf/open/floor/f13, -/area/f13/ncr) "dmb" = ( /obj/structure/table/wood, /obj/item/radio/tribal{ @@ -2489,15 +2449,6 @@ "dtb" = ( /turf/open/floor/f13/wood, /area/f13/wasteland) -"dux" = ( -/obj/structure/destructible/tribal_torch/lit, -/obj/structure/decoration/legion/chains2{ - pixel_y = 26 - }, -/obj/effect/turf_decal/shadow/floor, -/obj/effect/turf_decal/shadow/floor, -/turf/open/floor/wood_fancy, -/area/f13/legion) "dwf" = ( /obj/structure/filingcabinet{ density = 0; @@ -2513,12 +2464,6 @@ icon_state = "neutralrustyfull" }, /area/f13/wasteland) -"dwh" = ( -/obj/machinery/radioterminal/bos{ - dir = 8 - }, -/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust, -/area/f13/brotherhood/offices2nd) "dwj" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/f13{ @@ -2556,6 +2501,20 @@ "dBX" = ( /turf/open/transparent/openspace, /area/f13/brotherhood) +"dDn" = ( +/obj/structure/table/wood, +/obj/item/paper/natural, +/obj/item/paper/natural, +/obj/item/paper/natural, +/obj/item/paper/natural, +/obj/item/folder/red, +/obj/item/pen/charcoal, +/obj/item/card/id/dogtag/legrecruit, +/obj/item/card/id/dogtag/legrecruit, +/obj/item/card/id/dogtag/legrecruit, +/obj/item/card/id/dogtag/legveteran, +/turf/open/floor/wood_fancy, +/area/f13/legion) "dDp" = ( /obj/structure/flora/grass/jungle/b, /turf/open/indestructible/ground/outside/dirt, @@ -2605,18 +2564,6 @@ }, /turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust, /area/f13/brotherhood/operations) -"dHu" = ( -/obj/machinery/button/door{ - pixel_x = 23; - id = "legiongate2" - }, -/obj/machinery/button/door{ - pixel_x = 23; - id = "legiongate1"; - pixel_y = -10 - }, -/turf/open/indestructible/ground/inside/mountain, -/area/f13/wasteland) "dHP" = ( /obj/structure/bodycontainer/morgue, /turf/open/floor/plasteel/f13/vault_floor/white, @@ -2691,9 +2638,6 @@ /obj/structure/junk/locker, /turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust, /area/f13/brotherhood) -"dPl" = ( -/turf/open/floor/plating/f13/outside/roof/wood/old, -/area/f13/caves) "dPm" = ( /obj/structure/barricade/wooden, /turf/open/floor/f13/wood{ @@ -3498,6 +3442,18 @@ icon_state = "housewood4-broken" }, /area/f13/wasteland) +"eYc" = ( +/obj/machinery/button/door{ + pixel_x = 23; + id = "legiongate2" + }, +/obj/machinery/button/door{ + pixel_x = 23; + id = "legiongate1"; + pixel_y = -10 + }, +/turf/open/indestructible/ground/inside/mountain, +/area/f13/wasteland) "eYp" = ( /obj/effect/decal/cleanable/dirt{ color = "#363636" @@ -3868,6 +3824,12 @@ icon_state = "greenrustychess" }, /area/f13/building/massfusion) +"fAi" = ( +/obj/machinery/computer/card/bos{ + dir = 4 + }, +/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust, +/area/f13/brotherhood/offices2nd) "fAA" = ( /obj/structure/simple_door/bunker, /turf/open/floor/plasteel/f13/vault_floor/misc/vault1, @@ -3956,12 +3918,6 @@ /obj/effect/turf_decal/shadow/floor, /turf/open/floor/wood_fancy, /area/f13/legion) -"fOA" = ( -/obj/structure/chair/folding{ - dir = 4 - }, -/turf/open/floor/plasteel/f13/vault_floor/misc/cmo, -/area/f13/ncr) "fPa" = ( /obj/effect/turf_decal/stripes/red/corner, /turf/open/floor/plasteel/f13/vault_floor/misc/vault1, @@ -4156,6 +4112,13 @@ /obj/machinery/light, /turf/open/floor/plasteel/f13/vault_floor/white, /area/f13/building/hospital) +"gdT" = ( +/obj/machinery/door/poddoor/gate/bunker{ + id = "bosfrontgate"; + name = "brotherhood blue-steel gate" + }, +/turf/open/transparent/openspace, +/area/f13/wasteland) "geI" = ( /obj/structure/railing{ dir = 4 @@ -4493,11 +4456,6 @@ /mob/living/simple_animal/hostile/handy/protectron, /turf/open/floor/plasteel/f13/vault_floor/white, /area/f13/building/hospital) -"gGQ" = ( -/obj/structure/table, -/obj/item/megaphone, -/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust, -/area/f13/ncr) "gHi" = ( /obj/structure/table/wood, /obj/effect/decal/cleanable/dirt{ @@ -4697,6 +4655,10 @@ /obj/item/paper/bitterdrink, /turf/open/floor/wood_fancy, /area/f13/legion) +"gYj" = ( +/obj/structure/barricade/wooden, +/turf/open/floor/plating/f13/outside/roof/wood/old, +/area/f13/wasteland) "gYZ" = ( /obj/structure/chair/sofa/right{ dir = 4 @@ -5325,14 +5287,6 @@ }, /turf/open/transparent/openspace, /area/f13/wasteland/ncr) -"ibt" = ( -/obj/structure/closet/crate/wooden, -/obj/item/gun/ballistic/automatic/service, -/obj/item/gun/ballistic/automatic/service, -/obj/item/stack/f13Cash/random/ncr/med, -/obj/structure/lattice/catwalk, -/turf/open/transparent/openspace, -/area/f13/wasteland) "ibG" = ( /obj/machinery/camera, /turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust, @@ -5501,12 +5455,6 @@ }, /turf/open/floor/plasteel/f13/vault_floor/floor, /area/f13/building/hospital) -"iob" = ( -/obj/machinery/door/poddoor/gate{ - id = "legiongate1" - }, -/turf/open/indestructible/ground/inside/mountain, -/area/f13/wasteland) "ioy" = ( /obj/machinery/light{ dir = 4 @@ -5619,6 +5567,11 @@ }, /turf/open/floor/plasteel/f13/vault_floor/floor, /area/f13/city) +"iuT" = ( +/obj/structure/table, +/obj/item/pda/heads/cmo, +/turf/open/floor/plasteel/f13/vault_floor/misc/cmo, +/area/f13/ncr) "ivq" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, @@ -5658,6 +5611,12 @@ icon_state = "floorrusty" }, /area/f13/wasteland) +"ixi" = ( +/obj/structure/chair/folding{ + dir = 4 + }, +/turf/open/floor/plasteel/f13/vault_floor/misc/cmo, +/area/f13/ncr) "ixn" = ( /turf/closed/wall/f13/wood/house, /area/f13/brotherhood) @@ -5747,6 +5706,13 @@ /obj/item/book/manual/wiki/grenades, /turf/open/indestructible/ground/outside/desert, /area/f13/wasteland) +"iDv" = ( +/obj/structure/window/fulltile/house{ + icon_state = "storewindowbottom" + }, +/obj/structure/curtain, +/turf/open/floor/plasteel/f13/vault_floor/misc/cmo, +/area/f13/ncr) "iDO" = ( /obj/structure/bed/old, /turf/open/floor/plasteel/f13/vault_floor/white, @@ -5875,6 +5841,9 @@ }, /turf/open/floor/f13/wood, /area/f13/wasteland) +"iQg" = ( +/turf/open/floor/plating/f13/outside/roof/wood/old, +/area/f13/caves) "iQr" = ( /obj/machinery/door/unpowered/secure_steeldoor{ req_access_txt = "281"; @@ -6201,22 +6170,11 @@ }, /turf/open/transparent/openspace, /area/f13/wasteland) -"jpW" = ( -/obj/effect/turf_decal/shadow/floor, -/obj/effect/turf_decal/shadow/floor, -/turf/open/floor/wood_fancy, -/area/f13/legion) "jqW" = ( /obj/structure/lattice/catwalk, /obj/item/kirbyplants/random, /turf/open/transparent/openspace, /area/f13/wasteland) -"jrH" = ( -/obj/machinery/door/airlock/grunge{ - name = "Knight Captain's Room" - }, -/turf/open/floor/carpet/black, -/area/f13/brotherhood/dorms) "jrI" = ( /obj/structure/destructible/tribal_torch/wall/lit{ dir = 8 @@ -6256,12 +6214,6 @@ /obj/structure/table/optable, /turf/open/floor/plasteel/f13/vault_floor/white, /area/f13/building/hospital) -"jvp" = ( -/obj/effect/decal/cleanable/dirt, -/obj/structure/table, -/obj/item/storage/box/handcuffs, -/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust, -/area/f13/ncr) "jvt" = ( /obj/structure/window/fulltile/store{ icon_state = "storewindowtop" @@ -6379,6 +6331,12 @@ /obj/item/toy/cards/deck, /turf/open/floor/plasteel/f13/vault_floor/dark, /area/f13/ncr) +"jDq" = ( +/obj/machinery/smartfridge/bottlerack/legion_offering, +/obj/effect/turf_decal/shadow/floor, +/obj/effect/turf_decal/shadow/floor, +/turf/open/floor/wood_fancy, +/area/f13/legion) "jDW" = ( /obj/structure/decoration/rag, /obj/structure/decoration/rag{ @@ -6437,6 +6395,10 @@ /obj/effect/decal/cleanable/blood, /turf/open/floor/f13/wood, /area/f13/radiation) +"jJY" = ( +/obj/mecha/working/normalvehicle/vertibird/ncr/loaded, +/turf/open/floor/f13, +/area/f13/ncr) "jLE" = ( /obj/machinery/autolathe/ammo/unlocked_basic, /turf/open/floor/f13{ @@ -6869,11 +6831,6 @@ icon_state = "hydrofloor" }, /area/f13/building) -"kpx" = ( -/obj/structure/table/wood, -/obj/machinery/computer/card/town/sheriff, -/turf/open/floor/carpet/red, -/area/f13/city) "kpG" = ( /obj/effect/decal/cleanable/dirt{ color = "000000" @@ -6887,6 +6844,12 @@ icon_state = "floorrusty" }, /area/f13/wasteland) +"kpM" = ( +/obj/machinery/door/airlock/grunge{ + name = "Knight Captain's Room" + }, +/turf/open/floor/carpet/black, +/area/f13/brotherhood/dorms) "kpP" = ( /obj/structure/reagent_dispensers/fueltank/vehicle_gas_station{ icon_state = "vat"; @@ -7343,10 +7306,6 @@ }, /turf/open/floor/plasteel/f13/vault_floor/white, /area/f13/building/hospital) -"kXC" = ( -/obj/mecha/working/normalvehicle/vertibird/balloon/loaded, -/turf/open/floor/wood_common, -/area/f13/wasteland) "kXI" = ( /obj/structure/table/wood, /obj/item/reagent_containers/food/snacks/meat/steak/plain/human{ @@ -7811,13 +7770,6 @@ }, /turf/open/floor/plasteel/f13/vault_floor/floor, /area/f13/city) -"lIL" = ( -/obj/structure/window/fulltile/house{ - icon_state = "storewindowbottom" - }, -/obj/structure/curtain, -/turf/open/floor/plasteel/f13/vault_floor/misc/cmo, -/area/f13/ncr) "lKV" = ( /obj/machinery/workbench/advanced, /turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust, @@ -8821,11 +8773,6 @@ /obj/item/gun/ballistic/shotgun/hunting, /turf/open/floor/plasteel/f13/vault_floor/floor/floorsolid, /area/f13/wasteland) -"nfX" = ( -/obj/structure/table, -/obj/item/pda/heads/cmo, -/turf/open/floor/plasteel/f13/vault_floor/misc/cmo, -/area/f13/ncr) "ngm" = ( /obj/structure/table, /obj/item/storage/box/handcuffs{ @@ -8868,6 +8815,17 @@ /obj/effect/decal/cleanable/dirt, /turf/closed/wall, /area/f13/city) +"nkH" = ( +/obj/structure/sign/poster/ncr/irradiated_food{ + pixel_y = 32 + }, +/obj/machinery/light{ + dir = 1; + light_color = "#e8eaff" + }, +/obj/structure/rack/shelf_metal, +/turf/open/floor/plasteel/f13/vault_floor/misc/cmo, +/area/f13/ncr) "nkX" = ( /obj/structure/barricade/wooden, /turf/open/floor/wood_common, @@ -8924,15 +8882,6 @@ }, /turf/open/transparent/openspace, /area/f13/wasteland) -"noD" = ( -/obj/structure/destructible/tribal_torch/wall/lit{ - dir = 8; - light_power = 0.7 - }, -/obj/effect/turf_decal/shadow/floor, -/obj/machinery/msgterminal/legion, -/turf/open/floor/wood_fancy, -/area/f13/legion) "noP" = ( /turf/closed/wall/r_wall/rust, /area/f13/ncr) @@ -9184,12 +9133,6 @@ sunlight_state = 1 }, /area/f13/wasteland) -"nCD" = ( -/obj/structure/chair/office{ - dir = 8 - }, -/turf/open/floor/plasteel/f13/vault_floor/misc/cmo, -/area/f13/ncr) "nCS" = ( /turf/open/indestructible/ground/outside/dirt, /area/f13/building) @@ -9342,6 +9285,12 @@ /obj/structure/sign/departments/medbay/alt, /turf/closed/wall/f13/store, /area/f13/building/hospital) +"nNy" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/table, +/obj/item/storage/box/handcuffs, +/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust, +/area/f13/ncr) "nPQ" = ( /obj/structure/decoration/rag{ desc = "A string of bones and skulls.
A common warning from tribals and raiders to outsiders."; @@ -9804,6 +9753,10 @@ }, /turf/open/floor/plating/f13/outside/roof/metal, /area/f13/wasteland) +"otf" = ( +/obj/mecha/working/normalvehicle/vertibird/loaded, +/turf/open/floor/plasteel/airless/white, +/area/f13/wasteland) "otL" = ( /obj/machinery/light/small, /turf/open/floor/f13/wood{ @@ -10050,15 +10003,6 @@ /obj/item/reagent_containers/hypospray/medipen/medx, /turf/open/floor/plasteel/f13/vault_floor/white, /area/f13/building/hospital) -"oSw" = ( -/obj/structure/closet/crate/wooden, -/obj/item/gun/ballistic/automatic/service, -/obj/item/gun/ballistic/automatic/service, -/obj/item/stack/f13Cash/random/ncr/med, -/turf/open/floor/f13{ - icon_state = "floorrusty" - }, -/area/f13/city) "oSI" = ( /obj/structure/curtain{ color = "#845f58" @@ -10198,6 +10142,16 @@ /obj/structure/flora/chomp/potplant2, /turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust, /area/f13/brotherhood) +"paU" = ( +/obj/structure/table/wood, +/obj/item/radio/intercom/retro/kebob/mayor{ + pixel_x = 31 + }, +/obj/machinery/computer/card/town{ + dir = 8 + }, +/turf/open/floor/carpet/royalblack, +/area/f13/city) "pcx" = ( /obj/effect/turf_decal/stripes/white/line{ dir = 8 @@ -10335,6 +10289,15 @@ }, /turf/open/floor/carpet/royalblack, /area/f13/city) +"plM" = ( +/obj/structure/destructible/tribal_torch/lit, +/obj/structure/decoration/legion/chains2{ + pixel_y = 26 + }, +/obj/effect/turf_decal/shadow/floor, +/obj/effect/turf_decal/shadow/floor, +/turf/open/floor/wood_fancy, +/area/f13/legion) "pmg" = ( /obj/structure/closet/crate/coffin/blackcoffin, /obj/item/stake, @@ -10537,6 +10500,12 @@ icon_state = "whitegreenrustychess" }, /area/f13/wasteland) +"pEr" = ( +/obj/machinery/light/small{ + dir = 8 + }, +/turf/open/indestructible/ground/outside/roof, +/area/f13/wasteland/ncr) "pEx" = ( /turf/open/floor/plasteel/f13/vault_floor/floor/floorsolid, /area/f13/wasteland) @@ -10628,6 +10597,14 @@ }, /turf/open/floor/carpet/red, /area/f13/city) +"pJt" = ( +/obj/structure/closet/crate/wooden, +/obj/item/gun/ballistic/automatic/service, +/obj/item/gun/ballistic/automatic/service, +/obj/item/stack/f13Cash/random/ncr/med, +/obj/structure/lattice/catwalk, +/turf/open/transparent/openspace, +/area/f13/wasteland) "pKw" = ( /obj/structure/reagent_dispensers/fueltank, /obj/machinery/light/small{ @@ -10709,6 +10686,10 @@ }, /turf/open/floor/f13/wood, /area/f13/caves) +"pPP" = ( +/obj/structure/simple_door/room, +/turf/open/floor/wood_fancy, +/area/f13/ncr) "pQg" = ( /obj/structure/table, /obj/machinery/computer/terminal{ @@ -11414,6 +11395,17 @@ }, /turf/open/floor/plasteel/f13/vault_floor/red/side, /area/f13/brotherhood) +"rey" = ( +/obj/machinery/light{ + dir = 1; + light_color = "#e8eaff" + }, +/obj/structure/table, +/obj/machinery/computer/terminal{ + termtag = "Business" + }, +/turf/open/floor/plasteel/f13/vault_floor/misc/cmo, +/area/f13/ncr) "rgD" = ( /turf/open/floor/carpet, /area/f13/brotherhood/leisure) @@ -11948,16 +11940,6 @@ }, /turf/open/floor/plasteel/f13/vault_floor/misc/cmo, /area/f13/ncr) -"rYk" = ( -/obj/structure/table/wood, -/obj/item/radio/intercom/retro/kebob/mayor{ - pixel_x = 31 - }, -/obj/machinery/computer/card/town{ - dir = 8 - }, -/turf/open/floor/carpet/royalblack, -/area/f13/city) "rYQ" = ( /obj/structure/closet/cabinet, /turf/open/floor/carpet/red, @@ -12309,12 +12291,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/f13/wood, /area/f13/wasteland) -"svo" = ( -/obj/machinery/msgterminal/brotherhood{ - dir = 4 - }, -/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust, -/area/f13/brotherhood/offices2nd) "svq" = ( /obj/structure/fluff/railing/corner{ dir = 8 @@ -12379,6 +12355,12 @@ icon_state = "rubbleplate" }, /area/f13/wasteland) +"sye" = ( +/obj/structure/chair/office{ + dir = 8 + }, +/turf/open/floor/plasteel/f13/vault_floor/misc/cmo, +/area/f13/ncr) "szV" = ( /obj/structure/table, /obj/item/healthanalyzer, @@ -12555,6 +12537,11 @@ }, /turf/open/transparent/openspace, /area/f13/wasteland) +"sLY" = ( +/obj/structure/table/wood, +/obj/machinery/computer/card/town/sheriff, +/turf/open/floor/carpet/red, +/area/f13/city) "sNs" = ( /obj/structure/decoration/rag, /obj/structure/decoration/rag{ @@ -12823,6 +12810,10 @@ icon_state = "housewood2-broken" }, /area/f13/caves) +"tcF" = ( +/obj/mecha/working/normalvehicle/vertibird/brotherhood/loaded, +/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust, +/area/f13/brotherhood/rnd) "tcW" = ( /obj/machinery/light/small, /turf/open/floor/wood_fancy/wood_fancy_light, @@ -12906,10 +12897,6 @@ icon_state = "whitedirtysolid" }, /area/f13/building/hospital) -"tfP" = ( -/obj/structure/barricade/wooden, -/turf/open/floor/plating/f13/outside/roof/wood/old, -/area/f13/wasteland) "tge" = ( /obj/structure/barricade/wooden{ layer = 3.5 @@ -13584,10 +13571,6 @@ }, /turf/open/indestructible/ground/inside/mountain, /area/f13/wasteland) -"uhi" = ( -/obj/mecha/working/normalvehicle/vertibird/brotherhood/loaded, -/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust, -/area/f13/brotherhood/rnd) "uhq" = ( /obj/effect/decal/cleanable/dirt{ color = "#363636" @@ -13886,12 +13869,6 @@ }, /turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust, /area/f13/ncr) -"uFS" = ( -/obj/machinery/light/small{ - dir = 8 - }, -/turf/open/indestructible/ground/outside/roof, -/area/f13/wasteland/ncr) "uFT" = ( /obj/structure/decoration/rag, /obj/structure/fence/wooden{ @@ -14603,17 +14580,6 @@ }, /turf/open/transparent/openspace, /area/f13/wasteland) -"vOt" = ( -/obj/structure/sign/poster/ncr/irradiated_food{ - pixel_y = 32 - }, -/obj/machinery/light{ - dir = 1; - light_color = "#e8eaff" - }, -/obj/structure/rack/shelf_metal, -/turf/open/floor/plasteel/f13/vault_floor/misc/cmo, -/area/f13/ncr) "vPb" = ( /obj/structure/chair/f13chair1{ dir = 4 @@ -14713,6 +14679,15 @@ /obj/structure/closet/crate/footlocker, /turf/open/floor/f13/wood, /area/f13/radiation) +"wbt" = ( +/obj/structure/destructible/tribal_torch/wall/lit{ + dir = 8; + light_power = 0.7 + }, +/obj/effect/turf_decal/shadow/floor, +/obj/machinery/msgterminal/legion, +/turf/open/floor/wood_fancy, +/area/f13/legion) "wbR" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/light{ @@ -14953,6 +14928,12 @@ "wvW" = ( /turf/open/floor/carpet/red, /area/f13/city) +"wwb" = ( +/obj/machinery/radioterminal/bos{ + dir = 8 + }, +/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust, +/area/f13/brotherhood/offices2nd) "wwW" = ( /obj/structure/table, /obj/item/gun/ballistic/automatic/combat, @@ -15250,6 +15231,11 @@ /obj/structure/barricade/wooden, /turf/open/floor/f13/wood, /area/f13/wasteland) +"wUj" = ( +/obj/effect/turf_decal/shadow/floor, +/obj/effect/turf_decal/shadow/floor, +/turf/open/floor/wood_fancy, +/area/f13/legion) "wUx" = ( /obj/structure/window/fulltile/house, /turf/open/floor/f13{ @@ -15338,6 +15324,10 @@ /obj/structure/railing, /turf/open/floor/plasteel/f13/vault_floor/misc/vault1, /area/f13/brotherhood/dorms) +"xcf" = ( +/obj/mecha/working/normalvehicle/vertibird/balloon/loaded, +/turf/open/floor/wood_common, +/area/f13/wasteland) "xcA" = ( /obj/structure/railing/corner{ dir = 1 @@ -15626,6 +15616,17 @@ }, /turf/open/floor/plasteel/f13/vault_floor/purple, /area/f13/building/hospital) +"xBy" = ( +/obj/structure/closet/locker/oldstyle{ + anchored = 1 + }, +/obj/item/radio/headset/headset_bos, +/obj/item/radio/headset/headset_bos, +/obj/item/radio/headset/headset_bos, +/obj/item/radio/headset/headset_bos, +/obj/item/radio/headset/headset_bos, +/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust, +/area/f13/brotherhood/offices2nd) "xCN" = ( /obj/structure/table, /obj/item/paper_bin, @@ -15654,12 +15655,6 @@ /obj/effect/decal/cleanable/blood/bubblegum, /turf/open/floor/f13/wood, /area/f13/city) -"xFh" = ( -/obj/machinery/smartfridge/bottlerack/legion_offering, -/obj/effect/turf_decal/shadow/floor, -/obj/effect/turf_decal/shadow/floor, -/turf/open/floor/wood_fancy, -/area/f13/legion) "xFD" = ( /obj/structure/railing{ dir = 4 @@ -15749,6 +15744,11 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/f13/wood, /area/f13/city) +"xKB" = ( +/obj/structure/table, +/obj/item/megaphone, +/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust, +/area/f13/ncr) "xLX" = ( /obj/structure/fluff/railing/corner, /turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust, @@ -18395,10 +18395,10 @@ noP cqK mYO hqA -gGQ +xKB mYO uFd -jvp +nNy cqK cqK oiW @@ -18908,10 +18908,10 @@ pfO noP cqK dTc -uFS +pEr hHO hHO -uFS +pEr hHO hHO hHO @@ -23778,7 +23778,7 @@ ssV ssV cBM cBM -dkS +jJY cBM cBM ssV @@ -24268,11 +24268,11 @@ gkT gkT gkT kUW -lIL +iDv tSo kur kur -cjS +pPP kur kur eNH @@ -24523,8 +24523,8 @@ hHO hHO hHO kst -vOt -fOA +nkH +ixi dDq dDq kur @@ -24780,7 +24780,7 @@ rLB rLB rLB kst -nfX +iuT dcQ dcQ dDq @@ -25037,8 +25037,8 @@ rLB rLB rLB kst -dcK -nCD +rey +sye dDq dDq kur @@ -37773,7 +37773,7 @@ vLw qOr nIv cqH -rYk +paU qMI dYT oez @@ -38278,7 +38278,7 @@ oez oez tAz uKh -ibt +pJt kvJ mck hYA @@ -39314,7 +39314,7 @@ miU bgI nnw vLw -kpx +sLY pIy wvW dYT @@ -43396,7 +43396,7 @@ ioD rOF rOF rOF -bZf +otf rOF rOF ymf @@ -43861,7 +43861,7 @@ oez oez oez oez -cxf +gdT oez oez oez @@ -46620,8 +46620,8 @@ vLb vLb vLb gjI -cRA -svo +fAi +cVg rmX uiB rkY @@ -47904,10 +47904,10 @@ vtr lxd rkY rkY -jrH +kpM rmX rmX -bAf +xBy gjI oJA hCz @@ -48163,7 +48163,7 @@ rkY qkU vtr rAC -dwh +wwb gjI gjI uno @@ -52429,7 +52429,7 @@ anv xnG dhi vmV -oSw +ccT xVl nSB wxo @@ -57413,7 +57413,7 @@ igk ciQ ciQ ciQ -uhi +tcF ciQ ciQ ciQ @@ -58955,7 +58955,7 @@ igk ciQ ciQ ciQ -uhi +tcF ciQ igk igk @@ -70972,7 +70972,7 @@ vqz vqz vqz vqz -iob +cbU xJg xJg vXJ @@ -70997,7 +70997,7 @@ xJg xJg xJg spS -kXC +xcf spS oez oez @@ -71506,7 +71506,7 @@ xJg xJg xJg xJg -dHu +eYc xJg fNW xJg @@ -75092,7 +75092,7 @@ svW svW svW svW -tfP +gYj oez oez oez @@ -75121,7 +75121,7 @@ bPf wtb eeW xZD -noD +wbt kEi xZD fOl @@ -78188,7 +78188,7 @@ oez oez ahs fxn -dux +plM dkh dkh dhN @@ -78445,7 +78445,7 @@ oez oez ioD lXs -jpW +wUj gIm gIm gIm @@ -78702,7 +78702,7 @@ oez oez ioD rCg -jpW +wUj gIm eJq xqz @@ -78959,7 +78959,7 @@ oez oez ioD bkC -xFh +jDq gIm eJq oQP @@ -79216,14 +79216,14 @@ oez oez aQK bkC -jpW +wUj gIm eJq hAa fxn hUq fgi -amg +dDn lXs hzU oez @@ -79972,7 +79972,7 @@ vLb vLb vLb laB -dPl +iQg svW svW svW diff --git a/code/datums/components/crafting/recipes/vehicle_crafts.dm b/code/datums/components/crafting/recipes/vehicle_crafts.dm index 9e183b7d1a..b5e1f5913e 100644 --- a/code/datums/components/crafting/recipes/vehicle_crafts.dm +++ b/code/datums/components/crafting/recipes/vehicle_crafts.dm @@ -1,5 +1,5 @@ /datum/crafting_recipe/carbase/step1 - name = "Repair car carcass (Step 1)" + name = "Repair car wreck" result = /obj/structure/mecha_wreckage/ncrtruck reqs = list(/obj/structure/car/rubbish3, /obj/item/stack/crafting/goodparts = 8, @@ -8,9 +8,11 @@ /obj/item/stack/sheet/mineral/silver = 2) tools = list(TOOL_WELDER, TOOL_WRENCH) time = 100 + category = CAT_VEHICLES + subcategory = CAT_VEHICLECOREPARTS /datum/crafting_recipe/carbase/step2 - name = "Add a car battery and engine (Step 2)" + name = "Add battery and engine" result = /obj/structure/mecha_wreckage/ncrtruck/engine reqs = list(/obj/structure/mecha_wreckage/ncrtruck, /obj/item/vehiclecorepart/tires = 1, @@ -19,29 +21,35 @@ /obj/item/stack/cable_coil = 5) tools = list(TOOL_SCREWDRIVER, TOOL_WRENCH) time = 40 + category = CAT_VEHICLES + subcategory = CAT_VEHICLECOREPARTS /datum/crafting_recipe/carbase/step3 - name = "Add a car seat and electronics (Step 3)" + name = "Add seat and electronics" result = /obj/structure/mecha_wreckage/ncrtruck/seat reqs = list(/obj/item/mecha_parts/mecha_equipment/seat = 1, /obj/item/stack/cable_coil = 10, /obj/item/stack/crafting/electronicparts = 15) tools = list(TOOL_SCREWDRIVER, TOOL_WRENCH) time = 20 + category = CAT_VEHICLES + subcategory = CAT_VEHICLECOREPARTS // Caravan /datum/crafting_recipe/carbase/truckcaravan - name = "Carvan Pickup (Skipped Step 2 and 3)" + name = "Carvan engineless Pickup" result = /obj/mecha/working/normalvehicle/truckcaravan reqs = list(/obj/structure/mecha_wreckage/ncrtruck, /obj/item/stack/sheet/metal = 20, /obj/item/stack/cable_coil = 8) tools = list(TOOL_WELDER, TOOL_WRENCH) time = 100 + category = CAT_VEHICLES + subcategory = CAT_VEHICLECOREPARTS //Red Truck /datum/crafting_recipe/carbase/truck - name = "Red Pickup Truck (Final Step)" + name = "Red Pickup Truck" result = /obj/mecha/working/normalvehicle/pickuptruck/loaded reqs = list(/obj/structure/mecha_wreckage/ncrtruck/seat, /obj/item/stack/sheet/glass = 10, @@ -50,10 +58,12 @@ /obj/item/stack/sheet/prewar = 4) tools = list(TOOL_WELDER, TOOL_WRENCH) time = 100 + category = CAT_VEHICLES + subcategory = CAT_CARS //Blue Truck /datum/crafting_recipe/carbase/truck/blue - name = "Blue Pickup Truck (Final Step)" + name = "Blue Pickup Truck" result = /obj/mecha/working/normalvehicle/pickuptruck/blue/loaded reqs = list(/obj/structure/mecha_wreckage/ncrtruck/seat, /obj/item/stack/sheet/glass = 10, @@ -62,10 +72,12 @@ /obj/item/stack/sheet/prewar = 4) tools = list(TOOL_WELDER, TOOL_WRENCH) time = 100 + category = CAT_VEHICLES + subcategory = CAT_CARS //BOS Truck /datum/crafting_recipe/carbase/truck/bos - name = "BOS Pickup Truck (Final Step)" + name = "BOS Pickup Truck" result = /obj/mecha/working/normalvehicle/pickuptruck/bos/loaded reqs = list(/obj/structure/mecha_wreckage/ncrtruck/seat, /obj/item/stack/sheet/glass = 10, @@ -74,10 +86,12 @@ /obj/item/stack/sheet/prewar = 4) tools = list(TOOL_WELDER, TOOL_WRENCH) time = 100 + category = CAT_VEHICLES + subcategory = CAT_CARS //Buggy /datum/crafting_recipe/carbase/buggy - name = "Buggy (Final Step)" + name = "Buggy" result = /obj/mecha/working/normalvehicle/buggy/loaded reqs = list(/obj/structure/mecha_wreckage/ncrtruck/seat, /obj/item/stack/sheet/glass = 5, @@ -86,10 +100,12 @@ /obj/item/stack/sheet/prewar = 10) tools = list(TOOL_WELDER, TOOL_WRENCH) time = 100 + category = CAT_VEHICLES + subcategory = CAT_CARS //Buggy Dune /datum/crafting_recipe/carbase/buggy/dune - name = "Dune Buggy (Final Step)" + name = "Dune Buggy" result = /obj/mecha/working/normalvehicle/buggy/dune/loaded reqs = list(/obj/structure/mecha_wreckage/ncrtruck/seat, /obj/item/stack/sheet/glass = 5, @@ -98,10 +114,12 @@ /obj/item/stack/sheet/prewar = 10) tools = list(TOOL_WELDER, TOOL_WRENCH) time = 100 + category = CAT_VEHICLES + subcategory = CAT_CARS //Buggy Blue /datum/crafting_recipe/carbase/buggy/blue - name = "Blue Buggy (Final Step)" + name = "Blue Buggy" result = /obj/mecha/working/normalvehicle/buggy/blue/loaded reqs = list(/obj/structure/mecha_wreckage/ncrtruck/seat, /obj/item/stack/sheet/glass = 5, @@ -110,10 +128,12 @@ /obj/item/stack/sheet/prewar = 10) tools = list(TOOL_WELDER, TOOL_WRENCH) time = 100 + category = CAT_VEHICLES + subcategory = CAT_CARS //buggy flamme /datum/crafting_recipe/carbase/buggy/flamme - name = "Flamme Buggy (Final Step)" + name = "Flamme Buggy" result = /obj/mecha/working/normalvehicle/buggy/flamme/loaded reqs = list(/obj/structure/mecha_wreckage/ncrtruck/seat, /obj/item/stack/sheet/glass = 5, @@ -122,10 +142,12 @@ /obj/item/stack/sheet/prewar = 10) tools = list(TOOL_WELDER, TOOL_WRENCH) time = 100 + category = CAT_VEHICLES + subcategory = CAT_CARS //Corvega /datum/crafting_recipe/carbase/corvega - name = "Corvega (Final Step)" + name = "Corvega" result = /obj/mecha/working/normalvehicle/corvega/loaded reqs = list(/obj/structure/mecha_wreckage/ncrtruck/seat, /obj/item/stack/sheet/glass = 15, @@ -134,10 +156,12 @@ /obj/item/stack/sheet/prewar = 15) tools = list(TOOL_WELDER, TOOL_WRENCH) time = 100 + category = CAT_VEHICLES + subcategory = CAT_CARS //Buggy Ranger /datum/crafting_recipe/carbase/buggy/ranger - name = "NCR Ranger Buggy (Final Step)" + name = "NCR Ranger Buggy" result = /obj/mecha/working/normalvehicle/buggy/ranger/loaded reqs = list(/obj/structure/mecha_wreckage/ncrtruck/seat, /obj/item/stack/sheet/glass = 5, @@ -147,10 +171,12 @@ tools = list(TOOL_WELDER, TOOL_WRENCH) time = 100 always_available = FALSE + category = CAT_VEHICLES + subcategory = CAT_CARS //Buggy legion /datum/crafting_recipe/carbase/buggy/legion - name = "Legion Chariot Buggy (Final Step)" + name = "Legion Chariot Buggy" result = /obj/mecha/working/normalvehicle/buggy/legion/loaded reqs = list(/obj/structure/mecha_wreckage/ncrtruck/seat, /obj/item/stack/sheet/glass = 5, @@ -163,7 +189,7 @@ //Highwayman /datum/crafting_recipe/carbase/highwayman - name = "Highwayman (Final Step)" + name = "Highwayman" result = /obj/mecha/working/normalvehicle/highwayman/loaded reqs = list(/obj/structure/mecha_wreckage/ncrtruck/seat, /obj/item/stack/sheet/glass = 15, @@ -172,11 +198,13 @@ /obj/item/stack/sheet/prewar = 15) tools = list(TOOL_WELDER, TOOL_WRENCH) time = 100 + category = CAT_VEHICLES + subcategory = CAT_CARS //Highwayman /datum/crafting_recipe/carbase/highwayman - name = "Highwayman (Final Step)" + name = "Highwayman" result = /obj/mecha/working/normalvehicle/highwayman/loaded reqs = list(/obj/structure/mecha_wreckage/ncrtruck/seat, /obj/item/stack/sheet/glass = 15, @@ -185,11 +213,13 @@ /obj/item/stack/sheet/prewar = 15) tools = list(TOOL_WELDER, TOOL_WRENCH) time = 100 + category = CAT_VEHICLES + subcategory = CAT_CARS //jeep /datum/crafting_recipe/carbase/jeep - name = "Jeep (Final Step)" + name = "Jeep" result = /obj/mecha/working/normalvehicle/jeep/loaded reqs = list(/obj/structure/mecha_wreckage/ncrtruck/seat, /obj/item/stack/sheet/glass = 10, @@ -198,11 +228,13 @@ /obj/item/stack/sheet/prewar = 25) tools = list(TOOL_WELDER, TOOL_WRENCH) time = 100 + category = CAT_VEHICLES + subcategory = CAT_CARS //Jeep enclave /datum/crafting_recipe/carbase/jeep/enclave - name = "Enclave Jeep (Final Step)" + name = "Enclave Jeep" result = /obj/mecha/working/normalvehicle/jeep/enclave/loaded reqs = list(/obj/structure/mecha_wreckage/ncrtruck/seat, /obj/item/stack/sheet/glass = 10, @@ -211,11 +243,13 @@ /obj/item/stack/sheet/prewar = 25) tools = list(TOOL_WELDER, TOOL_WRENCH) time = 100 + category = CAT_VEHICLES + subcategory = CAT_CARS //Jeep BOS /datum/crafting_recipe/carbase/jeep/enclave - name = "Enclave Jeep (Final Step)" + name = "Enclave Jeep" result = /obj/mecha/working/normalvehicle/jeep/bos/loaded reqs = list(/obj/structure/mecha_wreckage/ncrtruck/seat, /obj/item/stack/sheet/glass = 10, @@ -225,11 +259,13 @@ tools = list(TOOL_WELDER, TOOL_WRENCH) time = 100 always_available = FALSE + category = CAT_VEHICLES + subcategory = CAT_CARS //NCR Truck /datum/crafting_recipe/carbase/ncrtruck - name = "NCR MP Truck (Final Step)" + name = "NCR MP Truck" result = /obj/mecha/working/normalvehicle/ncrtruck/mp/loaded reqs = list(/obj/structure/mecha_wreckage/ncrtruck/seat, /obj/item/stack/sheet/glass = 20, @@ -238,9 +274,11 @@ /obj/item/stack/sheet/prewar = 30) tools = list(TOOL_WELDER, TOOL_WRENCH) time = 100 + category = CAT_VEHICLES + subcategory = CAT_CARS /datum/crafting_recipe/carbase/ncrtruck/mp - name = "NCR Truck (Final Step)" + name = "NCR Truck" result = /obj/mecha/working/normalvehicle/ncrtruck/loaded reqs = list(/obj/structure/mecha_wreckage/ncrtruck/seat, /obj/item/stack/sheet/glass = 20, @@ -250,11 +288,13 @@ tools = list(TOOL_WELDER, TOOL_WRENCH) time = 100 always_available = FALSE + category = CAT_VEHICLES + subcategory = CAT_CARS //BOS Truck ARMED /datum/crafting_recipe/carbase/truck/bos/armed - name = "BOS Truck Gunner station (Arming Step - REMOVE ALL MODULES FROM TRUCK BEFORE MODIFYING)" + name = "BOS Truck Gunner" result = /obj/mecha/combat/combatvehicle/pickuptruck/bos/armed reqs = list(/obj/mecha/working/normalvehicle/pickuptruck/bos, /obj/item/stack/sheet/metal = 20, @@ -262,10 +302,12 @@ /obj/item/stack/sheet/prewar = 4) tools = list(TOOL_WELDER, TOOL_WRENCH) time = 100 + category = CAT_VEHICLES + subcategory = CAT_CARS //Ranger buggy ARMED /datum/crafting_recipe/carbase/buggy/ranger/armed - name = "Ranger Buggy Gunner station (Arming Step - REMOVE ALL MODULES FROM BUGGY BEFORE MODIFYING)" + name = "Ranger Buggy Gunner" result = /obj/mecha/combat/combatvehicle/buggy/rangerarmed reqs = list(/obj/mecha/working/normalvehicle/buggy/ranger, /obj/item/stack/sheet/metal = 20, @@ -273,10 +315,12 @@ /obj/item/stack/sheet/prewar = 4) tools = list(TOOL_WELDER, TOOL_WRENCH) time = 100 + category = CAT_VEHICLES + subcategory = CAT_CARS //legion buggy ARMED /datum/crafting_recipe/carbase/buggy/legion/armed - name = "Legion Buggy Gunner station (Arming Step - REMOVE ALL MODULES FROM BUGGY BEFORE MODIFYING)" + name = "Legion Buggy Gunner" result = /obj/mecha/combat/combatvehicle/buggy/legionarmed reqs = list(/obj/mecha/working/normalvehicle/buggy/legion, /obj/item/stack/sheet/metal = 20, @@ -284,10 +328,12 @@ /obj/item/stack/sheet/prewar = 4) tools = list(TOOL_WELDER, TOOL_WRENCH) time = 100 + category = CAT_VEHICLES + subcategory = CAT_CARS //Vertibird combat conversion /datum/crafting_recipe/carbase/vertibird/armed - name = "Combat Vertibird (Arming Step - REMOVE ALL MODULES FROM VERTIBIRD BEFORE MODIFYING)" + name = "Combat Vertibird" result = /obj/mecha/combat/combatvehicle/vertibird reqs = list(/obj/mecha/working/normalvehicle/vertibird, /obj/item/stack/sheet/metal = 100, @@ -295,10 +341,13 @@ /obj/item/stack/sheet/prewar = 50) tools = list(TOOL_WELDER, TOOL_WRENCH) time = 100 + category = CAT_VEHICLES + subcategory = CAT_CARS + always_available = FALSE //Vertibird NCR combat conversion /datum/crafting_recipe/carbase/vertibird/armed - name = "NCR Combat Vertibird (Arming Step - REMOVE ALL MODULES FROM VERTIBIRD BEFORE MODIFYING)" + name = "NCR Combat Vertibird" result = /obj/mecha/combat/combatvehicle/vertibird/ncr reqs = list(/obj/mecha/working/normalvehicle/vertibird/ncr, /obj/item/stack/sheet/metal = 100, @@ -306,10 +355,13 @@ /obj/item/stack/sheet/prewar = 50) tools = list(TOOL_WELDER, TOOL_WRENCH) time = 100 + category = CAT_VEHICLES + subcategory = CAT_VERTIBIRD + always_available = FALSE //Vertibird BOS combat conversion /datum/crafting_recipe/carbase/vertibird/armed - name = "Brotherhood Combat Vertibird (Arming Step - REMOVE ALL MODULES FROM VERTIBIRD BEFORE MODIFYING)" + name = "Brotherhood Combat Vertibird" result = /obj/mecha/combat/combatvehicle/vertibird/brotherhood reqs = list(/obj/mecha/working/normalvehicle/vertibird/brotherhood, /obj/item/stack/sheet/metal = 100, @@ -317,10 +369,13 @@ /obj/item/stack/sheet/prewar = 50) tools = list(TOOL_WELDER, TOOL_WRENCH) time = 100 + category = CAT_VEHICLES + subcategory = CAT_VERTIBIRD + always_available = FALSE //Vertibird Enclave combat conversion /datum/crafting_recipe/carbase/vertibird/armed - name = "Enclave Combat Vertibird (Arming Step - REMOVE ALL MODULES FROM VERTIBIRD BEFORE MODIFYING)" + name = "Enclave Combat Vertibird" result = /obj/mecha/combat/combatvehicle/vertibird/enclave reqs = list(/obj/mecha/working/normalvehicle/vertibird/enclave, /obj/item/stack/sheet/metal = 100, @@ -328,10 +383,13 @@ /obj/item/stack/sheet/prewar = 50) tools = list(TOOL_WELDER, TOOL_WRENCH) time = 100 + category = CAT_VEHICLES + subcategory = CAT_VERTIBIRD + always_available = FALSE //Lebgion balloon combat conversion /datum/crafting_recipe/carbase/vertibird/armed - name = "Legion Balloon (Arming Step - REMOVE ALL MODULE FROM CAR BEFORE MODIFYING)" + name = "Legion Balloon" result = /obj/mecha/combat/combatvehicle/vertibird/balloon reqs = list(/obj/mecha/working/normalvehicle/vertibird/balloon, /obj/item/stack/sheet/metal = 50, @@ -340,3 +398,6 @@ /obj/item/stack/sheet/prewar = 25) tools = list(TOOL_WELDER, TOOL_WRENCH) time = 100 + category = CAT_VEHICLES + subcategory = CAT_VERTIBIRD + always_available = FALSE diff --git a/code/datums/components/crafting/recipes/vehicle_parts.dm b/code/datums/components/crafting/recipes/vehicle_parts.dm index 5d820450cd..c1db4ef296 100644 --- a/code/datums/components/crafting/recipes/vehicle_parts.dm +++ b/code/datums/components/crafting/recipes/vehicle_parts.dm @@ -265,8 +265,8 @@ /obj/item/stack/crafting/goodparts = 4) tools = list(TOOL_WORKBENCH, TOOL_WELDER, TOOL_SCREWDRIVER) time = 180 - subcategory = CAT_VEHICLES - category = CAT_VEHICLEPARTS + category = CAT_VEHICLES + subcategory = CAT_VEHICLEPARTS /datum/crafting_recipe/vehiculearmor name = "Armor booster module (Close Combat Weaponry)" @@ -277,8 +277,8 @@ /obj/item/stack/crafting/goodparts = 4) tools = list(TOOL_WORKBENCH, TOOL_WELDER, TOOL_SCREWDRIVER) time = 180 - subcategory = CAT_VEHICLES - category = CAT_VEHICLEPARTS + category = CAT_VEHICLES + subcategory = CAT_VEHICLEPARTS /datum/crafting_recipe/vehiculearmor/distance name = "Armor booster module (Ranged Weaponry)" @@ -289,8 +289,8 @@ /obj/item/stack/crafting/goodparts = 4) tools = list(TOOL_WORKBENCH, TOOL_WELDER, TOOL_SCREWDRIVER) time = 180 - subcategory = CAT_VEHICLES - category = CAT_VEHICLEPARTS + category = CAT_VEHICLES + subcategory = CAT_VEHICLEPARTS /datum/crafting_recipe/carpart/trunk name = "Modular Trunk" @@ -301,8 +301,8 @@ /obj/item/stack/rods = 2) tools = list(TOOL_WORKBENCH) time = 90 - subcategory = CAT_VEHICLES - category = CAT_VEHICLEPARTS + category = CAT_VEHICLES + subcategory = CAT_VEHICLEPARTS //Core parts @@ -314,8 +314,8 @@ /obj/item/stack/crafting/goodparts = 4) tools = list(TOOL_WORKBENCH, TOOL_WELDER, TOOL_SCREWDRIVER) time = 100 - subcategory = CAT_VEHICLES - category = CAT_VEHICLECOREPARTS + category = CAT_VEHICLES + subcategory = CAT_VEHICLECOREPARTS /datum/crafting_recipe/tires name = "Repaired tires" @@ -324,5 +324,5 @@ /obj/item/stack/sheet/plastic = 4) tools = list(TOOL_WELDER) time = 20 - subcategory = CAT_VEHICLES - category = CAT_VEHICLECOREPARTS + category = CAT_VEHICLES + subcategory = CAT_VEHICLECOREPARTS