Merge pull request #43 from 800maximum123/Bugfix

[FD-Assets][FD-Resomi] Major Bugfix | Corecode
RepoStash · Jul 18, 2024 · 56fbc23 · 56fbc23
2 parents d0fe5df + 65e48ef
commit 56fbc23
Show file tree

Hide file tree

Showing 70 changed files with 343 additions and 421 deletions.
diff --git a/.github/workflows/labeler.yml b/.github/workflows/labeler.yml
@@ -7,6 +7,7 @@ on:
   pull_request_target:
     branches:
       - dev-sierra
+      - corecode-rewrite
 
 jobs:
   triage:

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -5,7 +5,7 @@ permissions:
 
 on:
   pull_request:
-    branches: [ "dev-sierra" ]
+    branches: [ "dev-sierra", "corecode-rewrite" ]
   workflow_dispatch: # allows this workflow to be manually triggered
 env:
   BYOND_MAJOR: "514"

diff --git a/code/modules/merchant/merchant_programs.dm b/code/modules/merchant/merchant_programs.dm
@@ -263,6 +263,7 @@
 				bribe(T, text2num(href_list["PRG_bribe"]))
 
 /datum/computer_file/program/merchant/no_id
+	available_on_ntnet = FALSE
 	required_access = null
 
 /datum/computer_file/program/merchant/ignore_distance

diff --git a/maps/torch_fd/fd_torch.dm b/maps/torch_fd/fd_torch.dm
@@ -234,6 +234,7 @@
 	#include "../../mods/guns/_guns.dme"
 	#include "../../mods/jukebox_tapes/_jukebox_tapes.dme"
 	#include "../../mods/legalese_language/_legalese.dme"
+	#include "../../mods/music_player/_music_player.dme"
 	#include "../../mods/petting_zoo/_petting_zoo.dme"
 	#include "../../mods/screentips/_screentips.dme"
 	#include "../../mods/tajara/_tajara.dme"
@@ -246,8 +247,6 @@
 
 		// ~NON-UPSTREAM MODS~ //
 
-	#include "../../mods/resomi_fd/_resomi.dme"
-
 	#include "../../mods/_fd/runechat/_runechat.dme"
 	#include "../../mods/_fd/fd_assets/_fd_assets.dme"
 	#include "../../mods/_fd/fd_guns/_fd_guns.dme"
@@ -257,6 +256,7 @@
 	#include "../../mods/_fd/ascent/_ascent.dme"
 	#include "../../mods/_fd/backgrounds/_fd_backgrounds.dme"
 	#include "../../mods/_fd/bruno_items/_bruno_items.dme"
+	#include "../../mods/_fd/chem_furniture/_furniture.dme"
 	#include "../../mods/_fd/combat_stances/_combat_stances.dme"
 	#include "../../mods/_fd/complementary_xeno_ablities/_complementary_xeno_ablities.dme"
 	#include "../../mods/_fd/conference_holopads/_conference_holopads.dme"
@@ -271,9 +271,9 @@
 	#include "../../mods/_fd/multitile_vehicles/_multitile_vehicles.dme"
 	#include "../../mods/_fd/polaris_portals/_polaris_portals.dme"
 	#include "../../mods/_fd/old_space_cannons/_old_space_cannons.dme"
-	#include "../../mods/_fd/random_rooms/_random_rooms.dme"
 	#include "../../mods/_fd/structure_storage/_structure_storage.dme"
-	#include "../../mods/_fd/chem_furniture/_furniture.dme"
+	#include "../../mods/_fd/random_rooms/_random_rooms.dme"
+	#include "../../mods/_fd/resomi_fd/_resomi.dme"
 
 	#include "../../mods/_fd/_maps/airfield/_airfield.dme"
 	#include "../../mods/_fd/_maps/ares/_ares.dme"

diff --git a/maps/torch_fd/job/medical_jobs.dm b/maps/torch_fd/job/medical_jobs.dm
@@ -98,6 +98,7 @@
 	minimal_player_age = 0
 	alt_titles = list(
 		"Paramedic",
+		"Trauma Stabilizer",
 		"Corpsman")
 	outfit_type = /singleton/hierarchy/outfit/job/torch/crew/medical/doctor
 	allowed_branches = list(

diff --git a/maps/torch_fd/job/supply_jobs.dm b/maps/torch_fd/job/supply_jobs.dm
@@ -37,7 +37,7 @@
 		access_radio_sup, access_radio_exp, access_radio_comm
 	)
 
-	software_on_spawn = list(/datum/computer_file/program/supply,
+	software_on_spawn = list(// /datum/computer_file/program/supply,
 							 /datum/computer_file/program/deck_management,
 							 /datum/computer_file/program/reports)
 
@@ -76,7 +76,7 @@
 		access_guppy, access_hangar, access_commissary, access_radio_sup
 	)
 
-	software_on_spawn = list(/datum/computer_file/program/supply,
+	software_on_spawn = list( // /datum/computer_file/program/supply,
 							 /datum/computer_file/program/deck_management,
 							 /datum/computer_file/program/reports)
 

diff --git a/maps/torch_fd/torch1_deck5.dmm b/maps/torch_fd/torch1_deck5.dmm
@@ -926,7 +926,7 @@
 "tz" = (/obj/machinery/atmospherics/pipe/simple/hidden{dir = 5},/obj/random/trash,/turf/simulated/floor/plating,/area/maintenance/fifthdeck/aftport)
 "tA" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/structure/catwalk,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/turf/simulated/floor/plating,/area/maintenance/fifthdeck/aftport)
 "tD" = (/obj/structure/catwalk,/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/random/junk,/turf/simulated/floor/plating,/area/maintenance/fifthdeck/aftport)
-"tE" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 5},/turf/simulated/floor/tiled/techfloor,/area/quartermaster/garage)
+"tE" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 5},/obj/item/paper/sticky{pixel_y = -24; info = "Короче, Браун и Бакстер - крузак [b]проебали[/b], а ни я, ни инженеры, чинить его [b][u]не собираемся[/u][/b]. [br][br]Так что, до ближайшего порта, провизию и прочее барахло будете на верблюдах возить[br][br][small]- Суров[/small]"},/turf/simulated/floor/tiled/techfloor,/area/quartermaster/garage)
 "tF" = (/obj/floor_decal/corner/brown{dir = 10},/obj/structure/cable/cyan{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/alarm{dir = 1; pixel_y = -22},/turf/simulated/floor/tiled,/area/hallway/primary/fifthdeck/aft)
 "tG" = (/obj/structure/disposalpipe/segment{dir = 4},/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/tele_beacon,/obj/structure/cable/green{d1 = 2; d2 = 8; icon_state = "2-8"},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/turf/simulated/floor/tiled/monotile,/area/hallway/primary/fifthdeck/aft)
 "tH" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/structure/cable/cyan{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/tiled,/area/hallway/primary/fifthdeck/aft)
@@ -1255,7 +1255,6 @@
 "Em" = (/turf/simulated/wall/prepainted,/area/quartermaster/storage)
 "En" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/structure/cable/cyan{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/floor_decal/corner/research{dir = 6},/turf/simulated/floor/tiled/white,/area/shuttle/petrov/analysis)
 "Es" = (/obj/machinery/suit_storage_unit/science,/obj/machinery/light{dir = 4},/obj/machinery/newscaster{pixel_y = 32},/turf/simulated/floor/tiled/white/monotile,/area/shuttle/petrov/eva)
-"Eu" = (/obj/vehicles/large/exploration{dir = 1},/turf/simulated/floor/tiled/techfloor,/area/quartermaster/garage)
 "Ew" = (/obj/floor_decal/industrial/outline/grey,/obj/structure/bed/chair/office/dark{dir = 8},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/turf/simulated/floor/tiled/techfloor,/area/maintenance/fifthdeck/aftport)
 "Ey" = (/obj/structure/closet/crate/secure/biohazard,/obj/machinery/atmospherics/unary/vent_scrubber/on,/obj/machinery/alarm{alarm_id = "petrov2"; pixel_y = 23; req_access = list(list("ACCESS_ENGINE_EQUIP","ACCESS_ATMOS"))},/turf/simulated/floor/tiled/dark/monotile,/area/shuttle/petrov/custodial)
 "Ez" = (/obj/machinery/atmospherics/pipe/simple/visible{dir = 9},/obj/machinery/airlock_sensor{frequency = 1431; id_tag = "bubble_shuttle_interior_sensor"; pixel_x = 24},/obj/floor_decal/industrial/warning,/obj/machinery/button/blast_door{id_tag = "bubble_cargo"; name = "Cargo Hatch Control"; pixel_x = 24; pixel_y = 9; req_access = list("ACCESS_TORCH_GUP")},/turf/simulated/floor/tiled/techfloor,/area/bubble_hangar/start)
@@ -1444,6 +1443,7 @@
 "Kt" = (/obj/machinery/suit_storage_unit/science,/turf/simulated/floor/tiled/white,/area/shuttle/petrov/eva)
 "Ku" = (/obj/structure/disposalpipe/segment,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/floor_decal/borderfloor{dir = 1},/obj/floor_decal/corner/purple_dark/border{dir = 1},/turf/simulated/floor/tiled,/area/quartermaster/exploration)
 "Kw" = (/obj/structure/table/rack{dir = 8},/obj/item/clothing/mask/gas,/obj/item/clothing/mask/gas,/turf/simulated/floor/tiled/white,/area/shuttle/petrov/equipment)
+"Kx" = (/obj/structure/showcase{name = "SATV-154 'Triceratops'"; desc = "A large transport vehicle, made specifically for the harsh environment."; icon = 'mods/_fd/multitile_vehicles/icons/glider.dmi'; icon_state = "glider_destroyed"; bound_height = 96; bound_width = 64; layer = 4; dir = 2; pixel_y = -7; pixel_x = 0},/turf/simulated/floor/tiled/techfloor,/area/quartermaster/garage)
 "Ky" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 10},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/machinery/atmospherics/pipe/simple/visible,/obj/machinery/button/blast_door{id_tag = "petrovcell3"; name = "Test Chamber Vent"; pixel_x = -26; pixel_y = -26},/obj/floor_decal/corner/research{dir = 8},/turf/simulated/floor/tiled/white,/area/shuttle/petrov/isolation)
 "KA" = (/obj/machinery/atmospherics/pipe/simple/hidden/cyan,/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/catwalk_plated,/turf/simulated/floor/plating,/area/quartermaster/hangar)
 "KB" = (/obj/structure/catwalk,/obj/structure/railing/mapped{dir = 4; icon_state = "railing0-1"},/turf/space,/area/space)
@@ -2045,7 +2045,7 @@ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaananananananananrurgrtXreueueueueukJeueueueuUHpFLzkDTWLzlNlNlNlNlNLzaJaJaJaJaJoFaJaJaJaJaJaJaJaJaJaJaJaJaJaJaJaJaJxsILxWfjRJxCxERMvIxsONoHgItzZKvKvZvKRKvKJdQDgIvKsMwswswswswsaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaQPanananananananrHrIxFTlMkrKrKDsrKmnnfmxmJaJUHpFLzBzAHlTlFjSjSjSCULzmRmSmKmLsjmPCXslYomUmUCXmUpxnqYmYmYmYmYmYmYmvOxsVnjvfDLBuRuYAAESxsONwagIvWLOvWvWvWgILyvKvZRKBALywswswswswsaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaObFNFNUIanananananananIPpynknkrEnnnrsinBnCaJUHpFLzlLlHEblKHLHLHLlaLzndmXTCgIskskskgInLwjvOwjwjwjnDwjqwloRFToToXtwjxsxsxsgyxsxsxsxsxsxsONvJgIKfqkYmwjwpgIOkxHvKgIvKvKwswswswsaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaObFNWZUIanananananananananannstonbnFaJxepFLzVgtEocSwEuHLHLGlLzQQmYTCgIgIgIgIgIgInmnhnonoPOnGzZzZzZzZzZzZzZXTzZuiLmgNuXuXuXxvSvSvIlvLvMvNsHYmOsTfgIVsKFhQgIwswswswswsaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaObFNWZUIanananananananananannstonbnFaJxepFLzVgtEocSwKxHLHLGlLzQQmYTCgIgIgIgIgIgInmnhnonoPOnGzZzZzZzZzZzZzZXTzZuiLmgNuXuXuXxvSvSvIlvLvMvNsHYmOsTfgIVsKFhQgIwswswswswsaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaObFNFNUIananananananBpntnunvnwuZuZnzKSKSKSKSKSKSKSgsKSKSnYrzrDMjpzpAVZFnvKrYrZsasaIUscrjgPgQgSgVgPrjgWrjAOMhrzJElJlJmogIwswswswswswswswswswswswswswswswswswsaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaObFNFNFNUIanananananannZJGXxCtXxXxXxXxXxXxXxXxXxoaohoiojyAolyiomonLXooofofofNFoqNpNptDNpNpNpNpNpYvGtllQwibPTImVuwswswswswswswswswswswswswswswswswswsaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaObUIananananananananananananananananananwswswswswswswswswswswswswswswswswswswswswswswswswswswswswswswswswswswsKBaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa

diff --git a/maps/torch_fd/torch3_deck3.dmm b/maps/torch_fd/torch3_deck3.dmm
@@ -511,7 +511,7 @@
 "jS" = (/obj/structure/cable/green{d1 = 1; d2 = 8; icon_state = "1-8"},/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/turf/simulated/floor/tiled/techfloor/grid,/area/crew_quarters/safe_room/thirddeck)
 "jT" = (/obj/machinery/vending/wallmed1{dir = 8; name = "Emergency NanoMed"; pixel_x = 28},/obj/machinery/portable_atmospherics/hydroponics,/obj/floor_decal/corner/green/mono,/obj/floor_decal/industrial/hatch/yellow,/turf/simulated/floor/tiled/monotile,/area/hydroponics)
 "jU" = (/obj/machinery/computer/modular/preset/security,/obj/floor_decal/corner/red{dir = 5},/obj/item/flora/pottedplantsmall{pixel_x = 8; pixel_y = 25},/obj/machinery/atmospherics/unary/vent_pump/on,/obj/item/device/binoculars{pixel_x = 3; pixel_y = -2},/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/structure/cable/green{d1 = 2; d2 = 4; icon_state = "2-4"},/turf/simulated/floor/tiled/dark/monotile,/area/security/habcheck)
-"jV" = (/obj/structure/disposalpipe/segment{dir = 4},/obj/floor_decal/borderfloor{dir = 1},/obj/floor_decal/industrial/outline/blue,/obj/machinery/jukebox,/turf/simulated/floor/tiled/dark,/area/crew_quarters/mess)
+"jV" = (/obj/structure/disposalpipe/segment{dir = 4},/obj/floor_decal/borderfloor{dir = 1},/obj/floor_decal/industrial/outline/blue,/obj/machinery/jukebox/custom_tape,/turf/simulated/floor/tiled/dark,/area/crew_quarters/mess)
 "jW" = (/obj/machinery/alarm{dir = 8; pixel_x = 24},/turf/simulated/floor/grass,/area/crew_quarters/observation)
 "jX" = (/obj/structure/disposalpipe/segment{dir = 4},/obj/floor_decal/corner/blue/border{dir = 9},/obj/floor_decal/corner/blue/bordercorner,/obj/landmark{name = "lightsout"},/obj/machinery/light_switch{pixel_x = 6; pixel_y = 24},/obj/structure/bed/sofa/m/black{dir = 6},/turf/simulated/floor/tiled/dark/monotile,/area/crew_quarters/mess)
 "jY" = (/obj/structure/bed/sofa/m/black,/obj/floor_decal/corner/blue/border{dir = 1},/obj/floor_decal/corner/blue/border,/turf/simulated/floor/tiled/dark/monotile,/area/crew_quarters/mess)