From e3be7c88e2235d1befe7064d4f2d6867448a82c0 Mon Sep 17 00:00:00 2001 From: alberyk Date: Sun, 2 Jan 2022 13:15:50 -0300 Subject: [PATCH] renames --- aurorastation.dme | 9 ------ code/game/jobs/faction/scc.dm | 11 -------- .../sccv_horizon.dmi} | Bin maps/sccv_aurora/code/sccv_aurora_outfits.dm | 26 ------------------ .../backup/placeholder-4_centcomm.dmm | 0 .../code/sccv_horizon.dm} | 18 ++++++------ .../code/sccv_horizon_areas.dm} | 0 .../code/sccv_horizon_holodeck.dm} | 2 +- .../code/sccv_horizon_lifts.dm} | 0 .../code/sccv_horizon_overmap.dm} | 4 +-- .../code/sccv_horizon_shuttles.dm} | 0 .../code/sccv_horizon_structures.dm} | 0 .../code/sccv_horizon_unittest.dm} | 2 +- .../placeholder-1_deck_1.dmm | 0 .../placeholder-2_deck_2.dmm | 0 .../placeholder-3_deck_3.dmm | 0 .../placeholder-4_centcomm.dmm | 0 17 files changed, 13 insertions(+), 59 deletions(-) rename icons/misc/titlescreens/{sccv_aurora/sccv_aurora.dmi => sccv_horizon/sccv_horizon.dmi} (100%) delete mode 100644 maps/sccv_aurora/code/sccv_aurora_outfits.dm rename maps/{sccv_aurora => sccv_horizon}/backup/placeholder-4_centcomm.dmm (100%) rename maps/{sccv_aurora/code/sccv_aurora.dm => sccv_horizon/code/sccv_horizon.dm} (89%) rename maps/{sccv_aurora/code/sccv_aurora_areas.dm => sccv_horizon/code/sccv_horizon_areas.dm} (100%) rename maps/{sccv_aurora/code/sccv_aurora_holodeck.dm => sccv_horizon/code/sccv_horizon_holodeck.dm} (99%) rename maps/{sccv_aurora/code/sccv_aurora_lifts.dm => sccv_horizon/code/sccv_horizon_lifts.dm} (100%) rename maps/{sccv_aurora/code/sccv_aurora_overmap.dm => sccv_horizon/code/sccv_horizon_overmap.dm} (94%) rename maps/{sccv_aurora/code/sccv_aurora_shuttles.dm => sccv_horizon/code/sccv_horizon_shuttles.dm} (100%) rename maps/{sccv_aurora/code/sccv_aurora_structures.dm => sccv_horizon/code/sccv_horizon_structures.dm} (100%) rename maps/{sccv_aurora/code/sccv_aurora_unittest.dm => sccv_horizon/code/sccv_horizon_unittest.dm} (97%) rename maps/{sccv_aurora => sccv_horizon}/placeholder-1_deck_1.dmm (100%) rename maps/{sccv_aurora => sccv_horizon}/placeholder-2_deck_2.dmm (100%) rename maps/{sccv_aurora => sccv_horizon}/placeholder-3_deck_3.dmm (100%) rename maps/{sccv_aurora => sccv_horizon}/placeholder-4_centcomm.dmm (100%) diff --git a/aurorastation.dme b/aurorastation.dme index 13ad6190ea9..9f3019a5bca 100644 --- a/aurorastation.dme +++ b/aurorastation.dme @@ -3056,15 +3056,6 @@ #include "maps\runtime\code\runtime.dm" #include "maps\runtime\code\runtime_lifts.dm" #include "maps\runtime\code\runtime_unittest.dm" -#include "maps\sccv_aurora\code\sccv_aurora.dm" -#include "maps\sccv_aurora\code\sccv_aurora_areas.dm" -#include "maps\sccv_aurora\code\sccv_aurora_holodeck.dm" -#include "maps\sccv_aurora\code\sccv_aurora_lifts.dm" -#include "maps\sccv_aurora\code\sccv_aurora_outfits.dm" -#include "maps\sccv_aurora\code\sccv_aurora_overmap.dm" -#include "maps\sccv_aurora\code\sccv_aurora_shuttles.dm" -#include "maps\sccv_aurora\code\sccv_aurora_structures.dm" -#include "maps\sccv_aurora\code\sccv_aurora_unittest.dm" #include "maps\templates\distress\distress_equipment.dm" #include "maps\templates\orbital\orbital_templates.dm" // END_INCLUDE diff --git a/code/game/jobs/faction/scc.dm b/code/game/jobs/faction/scc.dm index ee7f198f214..c308bed9544 100644 --- a/code/game/jobs/faction/scc.dm +++ b/code/game/jobs/faction/scc.dm @@ -46,14 +46,3 @@ SPECIES_IPC_SHELL, ) ) - - titles_to_loadout = list( - "Captain" = /datum/outfit/job/captain, - "Executive Officer" = /datum/outfit/job/xo, - "Chief Engineer" = /datum/outfit/job/chief_engineer, - "Head of Security" = /datum/outfit/job/hos, - "Research Director" = /datum/outfit/job/rd, - "Chief Medical Officer" = /datum/outfit/job/cmo, - "Operations Manager" = /datum/outfit/job/operations_manager, - "Bridge Crew" = /datum/outfit/job/bridge_crew - ) \ No newline at end of file diff --git a/icons/misc/titlescreens/sccv_aurora/sccv_aurora.dmi b/icons/misc/titlescreens/sccv_horizon/sccv_horizon.dmi similarity index 100% rename from icons/misc/titlescreens/sccv_aurora/sccv_aurora.dmi rename to icons/misc/titlescreens/sccv_horizon/sccv_horizon.dmi diff --git a/maps/sccv_aurora/code/sccv_aurora_outfits.dm b/maps/sccv_aurora/code/sccv_aurora_outfits.dm deleted file mode 100644 index 77ba6c1fd78..00000000000 --- a/maps/sccv_aurora/code/sccv_aurora_outfits.dm +++ /dev/null @@ -1,26 +0,0 @@ -/datum/outfit/admin/megacorp/shipwright - name = "Chief Shipwright" - - uniform = /obj/item/clothing/under/rank/hephaestus - back = /obj/item/storage/backpack/satchel - gloves = /obj/item/clothing/gloves/yellow - shoes = /obj/item/clothing/shoes/workboots - belt = /obj/item/storage/belt/utility/very_full - l_ear = /obj/item/device/radio/headset/heads/captain - suit = /obj/item/clothing/suit/storage/toggle/labcoat/heph - head = /obj/item/clothing/head/hardhat/white - id = /obj/item/card/id/syndicate - - backpack_contents = list( - /obj/item/handcuffs/ziptie = 1, - /obj/item/tank/oxygen = 1, - /obj/item/device/multitool = 1, - /obj/item/weldingtool/hugetank = 1, - /obj/item/clothing/glasses/welding/superior = 1, - /obj/item/clipboard = 1 - ) - - var/id_access = "NanoTrasen Representative" - -/datum/outfit/admin/megacorp/shipwright/get_id_access() - return get_all_accesses() | get_centcom_access(id_access) \ No newline at end of file diff --git a/maps/sccv_aurora/backup/placeholder-4_centcomm.dmm b/maps/sccv_horizon/backup/placeholder-4_centcomm.dmm similarity index 100% rename from maps/sccv_aurora/backup/placeholder-4_centcomm.dmm rename to maps/sccv_horizon/backup/placeholder-4_centcomm.dmm diff --git a/maps/sccv_aurora/code/sccv_aurora.dm b/maps/sccv_horizon/code/sccv_horizon.dm similarity index 89% rename from maps/sccv_aurora/code/sccv_aurora.dm rename to maps/sccv_horizon/code/sccv_horizon.dm index 16ee1ccf40b..13764cbeb19 100644 --- a/maps/sccv_aurora/code/sccv_aurora.dm +++ b/maps/sccv_horizon/code/sccv_horizon.dm @@ -1,8 +1,8 @@ -/datum/map/sccv_aurora - name = "SCCV Aurora" - full_name = "SCCV Aurora" - path = "sccv_aurora" - lobby_icons = list('icons/misc/titlescreens/sccv_aurora/sccv_aurora.dmi') +/datum/map/sccv_horizon + name = "SCCV Horizon" + full_name = "SCCV Horizon" + path = "sccv_horizon" + lobby_icons = list('icons/misc/titlescreens/sccv_horizon/sccv_horizon.dmi') lobby_transitions = 25 SECONDS station_levels = list(1, 2, 3) @@ -20,8 +20,8 @@ "6" = /turf/space ) - station_name = "SCCV Aurora" - station_short = "Aurora" + station_name = "SCCV Horizon" + station_short = "Horizon" dock_name = "The Shipyard" dock_short = "Shipyard" boss_name = "Stellar Corporate Conglomerate" @@ -30,7 +30,7 @@ company_short = "SCC" command_spawn_enabled = TRUE - command_spawn_message = "Welcome to the SCCV Aurora!" + command_spawn_message = "Welcome to the SCCV Horizon!" use_overmap = TRUE @@ -84,6 +84,6 @@ spawn_types = list(/datum/spawnpoint/living_quarters_lift, /datum/spawnpoint/cryo) -/datum/map/sccv_aurora/finalize_load() +/datum/map/sccv_horizon/finalize_load() // generate an empty space Z world.maxz++ diff --git a/maps/sccv_aurora/code/sccv_aurora_areas.dm b/maps/sccv_horizon/code/sccv_horizon_areas.dm similarity index 100% rename from maps/sccv_aurora/code/sccv_aurora_areas.dm rename to maps/sccv_horizon/code/sccv_horizon_areas.dm diff --git a/maps/sccv_aurora/code/sccv_aurora_holodeck.dm b/maps/sccv_horizon/code/sccv_horizon_holodeck.dm similarity index 99% rename from maps/sccv_aurora/code/sccv_aurora_holodeck.dm rename to maps/sccv_horizon/code/sccv_horizon_holodeck.dm index aecb75edddc..539da9b32c0 100644 --- a/maps/sccv_aurora/code/sccv_aurora_holodeck.dm +++ b/maps/sccv_horizon/code/sccv_horizon_holodeck.dm @@ -1,4 +1,4 @@ -/datum/map/placeholder +/datum/map/horizon holodeck_programs = list( "emptycourt" = new /datum/holodeck_program(/area/holodeck/source_emptycourt, list('sound/music/THUNDERDOME.ogg') diff --git a/maps/sccv_aurora/code/sccv_aurora_lifts.dm b/maps/sccv_horizon/code/sccv_horizon_lifts.dm similarity index 100% rename from maps/sccv_aurora/code/sccv_aurora_lifts.dm rename to maps/sccv_horizon/code/sccv_horizon_lifts.dm diff --git a/maps/sccv_aurora/code/sccv_aurora_overmap.dm b/maps/sccv_horizon/code/sccv_horizon_overmap.dm similarity index 94% rename from maps/sccv_aurora/code/sccv_aurora_overmap.dm rename to maps/sccv_horizon/code/sccv_horizon_overmap.dm index 40506599f8e..5d18476ab0f 100644 --- a/maps/sccv_aurora/code/sccv_aurora_overmap.dm +++ b/maps/sccv_horizon/code/sccv_horizon_overmap.dm @@ -1,5 +1,5 @@ -/obj/effect/overmap/visitable/ship/sccv_aurora - name = "SCCV Aurora" +/obj/effect/overmap/visitable/ship/sccv_horizon + name = "SCCV Horizon" desc = "A Stellar Conglomerate Vessel general purpose ship." fore_dir = SOUTH vessel_mass = 100000 diff --git a/maps/sccv_aurora/code/sccv_aurora_shuttles.dm b/maps/sccv_horizon/code/sccv_horizon_shuttles.dm similarity index 100% rename from maps/sccv_aurora/code/sccv_aurora_shuttles.dm rename to maps/sccv_horizon/code/sccv_horizon_shuttles.dm diff --git a/maps/sccv_aurora/code/sccv_aurora_structures.dm b/maps/sccv_horizon/code/sccv_horizon_structures.dm similarity index 100% rename from maps/sccv_aurora/code/sccv_aurora_structures.dm rename to maps/sccv_horizon/code/sccv_horizon_structures.dm diff --git a/maps/sccv_aurora/code/sccv_aurora_unittest.dm b/maps/sccv_horizon/code/sccv_horizon_unittest.dm similarity index 97% rename from maps/sccv_aurora/code/sccv_aurora_unittest.dm rename to maps/sccv_horizon/code/sccv_horizon_unittest.dm index 4eb3abbf0eb..5ebe557362f 100644 --- a/maps/sccv_aurora/code/sccv_aurora_unittest.dm +++ b/maps/sccv_horizon/code/sccv_horizon_unittest.dm @@ -1,4 +1,4 @@ -/datum/map/placeholder +/datum/map/horizon // This is formatted strangely because it fails the indentation test if it's formatted properly. // ¯\_(ツ)_/¯ diff --git a/maps/sccv_aurora/placeholder-1_deck_1.dmm b/maps/sccv_horizon/placeholder-1_deck_1.dmm similarity index 100% rename from maps/sccv_aurora/placeholder-1_deck_1.dmm rename to maps/sccv_horizon/placeholder-1_deck_1.dmm diff --git a/maps/sccv_aurora/placeholder-2_deck_2.dmm b/maps/sccv_horizon/placeholder-2_deck_2.dmm similarity index 100% rename from maps/sccv_aurora/placeholder-2_deck_2.dmm rename to maps/sccv_horizon/placeholder-2_deck_2.dmm diff --git a/maps/sccv_aurora/placeholder-3_deck_3.dmm b/maps/sccv_horizon/placeholder-3_deck_3.dmm similarity index 100% rename from maps/sccv_aurora/placeholder-3_deck_3.dmm rename to maps/sccv_horizon/placeholder-3_deck_3.dmm diff --git a/maps/sccv_aurora/placeholder-4_centcomm.dmm b/maps/sccv_horizon/placeholder-4_centcomm.dmm similarity index 100% rename from maps/sccv_aurora/placeholder-4_centcomm.dmm rename to maps/sccv_horizon/placeholder-4_centcomm.dmm