From f371f0038c1beab09b89b0db8fa29bcf94e8ddf0 Mon Sep 17 00:00:00 2001 From: Changelogs Date: Thu, 11 Apr 2024 22:21:50 +0000 Subject: [PATCH 1/7] Automatic changelog compile [ci skip] --- .../changelogs/SimpleMaroon-goldendeepfix.yml | 41 ------------- html/changelogs/archive/2024-04.yml | 10 ++++ .../fluffyghost-bumppygit2version.yml | 58 ------------------- .../fluffyghost-pyyamlversionbump.yml | 58 ------------------- .../fluffyghost-updatechangelog.yml | 58 ------------------- html/changelogs/furrycactus -scichem apc.yml | 41 ------------- 6 files changed, 10 insertions(+), 256 deletions(-) delete mode 100644 html/changelogs/SimpleMaroon-goldendeepfix.yml delete mode 100644 html/changelogs/fluffyghost-bumppygit2version.yml delete mode 100644 html/changelogs/fluffyghost-pyyamlversionbump.yml delete mode 100644 html/changelogs/fluffyghost-updatechangelog.yml delete mode 100644 html/changelogs/furrycactus -scichem apc.yml diff --git a/html/changelogs/SimpleMaroon-goldendeepfix.yml b/html/changelogs/SimpleMaroon-goldendeepfix.yml deleted file mode 100644 index 6bc2ede4355..00000000000 --- a/html/changelogs/SimpleMaroon-goldendeepfix.yml +++ /dev/null @@ -1,41 +0,0 @@ -################################ -# Example Changelog File -# -# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb. -# -# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.) -# When it is, any changes listed below will disappear. -# -# Valid Prefixes: -# bugfix -# wip (For works in progress) -# tweak -# soundadd -# sounddel -# rscadd (general adding of nice things) -# rscdel (general deleting of nice things) -# imageadd -# imagedel -# maptweak -# spellcheck (typo fixes) -# experiment -# balance -# admin -# backend -# security -# refactor -################################# - -# Your name. -author: SimpleMaroon - -# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again. -delete-after: True - -# Any changes you've made. See valid prefix list above. -# INDENT WITH TWO SPACES. NOT TABS. SPACES. -# SCREW THIS UP AND IT WON'T WORK. -# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries. -# Please surround your changes in double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog. -changes: - - bugfix: "Golden Deep cowls and cube hoods are no longer invisible when worn on the ears." diff --git a/html/changelogs/archive/2024-04.yml b/html/changelogs/archive/2024-04.yml index 5ca836ab7a8..48a0c6455cd 100644 --- a/html/changelogs/archive/2024-04.yml +++ b/html/changelogs/archive/2024-04.yml @@ -191,3 +191,13 @@ - code_imp: Replaces the Dermaline pill bottles in Medbay with Kelotane pill bottles. This brings it into line with the existing Bicaridine pill bottles. - code_imp: Adds two pill bottles of basic Dexalin to the Medbay Stabilization Kits. +2024-04-11: + FluffyGhost: + - code_imp: Updated pygit version to 1.14.1. + - code_imp: Updated the changelog system. + - code_imp: Updated pyyaml dependency to version 6.0.1 + Furrycactus: + - rscadd: Fixes the missing cable on the Science Chem Lab APC. + SimpleMaroon: + - bugfix: Golden Deep cowls and cube hoods are no longer invisible when worn on + the ears. diff --git a/html/changelogs/fluffyghost-bumppygit2version.yml b/html/changelogs/fluffyghost-bumppygit2version.yml deleted file mode 100644 index 7afd4206436..00000000000 --- a/html/changelogs/fluffyghost-bumppygit2version.yml +++ /dev/null @@ -1,58 +0,0 @@ -################################ -# Example Changelog File -# -# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb. -# -# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.) -# When it is, any changes listed below will disappear. -# -# Valid Prefixes: -# bugfix -# - (fixes bugs) -# wip -# - (work in progress) -# qol -# - (quality of life) -# soundadd -# - (adds a sound) -# sounddel -# - (removes a sound) -# rscadd -# - (adds a feature) -# rscdel -# - (removes a feature) -# imageadd -# - (adds an image or sprite) -# imagedel -# - (removes an image or sprite) -# spellcheck -# - (fixes spelling or grammar) -# experiment -# - (experimental change) -# balance -# - (balance changes) -# code_imp -# - (misc internal code change) -# refactor -# - (refactors code) -# config -# - (makes a change to the config files) -# admin -# - (makes changes to administrator tools) -# server -# - (miscellaneous changes to server) -################################# - -# Your name. -author: FluffyGhost - -# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again. -delete-after: True - -# Any changes you've made. See valid prefix list above. -# INDENT WITH TWO SPACES. NOT TABS. SPACES. -# SCREW THIS UP AND IT WON'T WORK. -# Also, this gets changed to [] after reading. Just remove the brackets when you add new shit. -# Please surround your changes in double quotes ("). It works without them, but if you use certain characters it screws up compiling. The quotes will not show up in the changelog. -changes: - - code_imp: "Updated pygit version to 1.14.1." diff --git a/html/changelogs/fluffyghost-pyyamlversionbump.yml b/html/changelogs/fluffyghost-pyyamlversionbump.yml deleted file mode 100644 index 4962e012994..00000000000 --- a/html/changelogs/fluffyghost-pyyamlversionbump.yml +++ /dev/null @@ -1,58 +0,0 @@ -################################ -# Example Changelog File -# -# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb. -# -# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.) -# When it is, any changes listed below will disappear. -# -# Valid Prefixes: -# bugfix -# - (fixes bugs) -# wip -# - (work in progress) -# qol -# - (quality of life) -# soundadd -# - (adds a sound) -# sounddel -# - (removes a sound) -# rscadd -# - (adds a feature) -# rscdel -# - (removes a feature) -# imageadd -# - (adds an image or sprite) -# imagedel -# - (removes an image or sprite) -# spellcheck -# - (fixes spelling or grammar) -# experiment -# - (experimental change) -# balance -# - (balance changes) -# code_imp -# - (misc internal code change) -# refactor -# - (refactors code) -# config -# - (makes a change to the config files) -# admin -# - (makes changes to administrator tools) -# server -# - (miscellaneous changes to server) -################################# - -# Your name. -author: FluffyGhost - -# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again. -delete-after: True - -# Any changes you've made. See valid prefix list above. -# INDENT WITH TWO SPACES. NOT TABS. SPACES. -# SCREW THIS UP AND IT WON'T WORK. -# Also, this gets changed to [] after reading. Just remove the brackets when you add new shit. -# Please surround your changes in double quotes ("). It works without them, but if you use certain characters it screws up compiling. The quotes will not show up in the changelog. -changes: - - code_imp: "Updated pyyaml dependency to version 6.0.1" diff --git a/html/changelogs/fluffyghost-updatechangelog.yml b/html/changelogs/fluffyghost-updatechangelog.yml deleted file mode 100644 index 63719164dcc..00000000000 --- a/html/changelogs/fluffyghost-updatechangelog.yml +++ /dev/null @@ -1,58 +0,0 @@ -################################ -# Example Changelog File -# -# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb. -# -# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.) -# When it is, any changes listed below will disappear. -# -# Valid Prefixes: -# bugfix -# - (fixes bugs) -# wip -# - (work in progress) -# qol -# - (quality of life) -# soundadd -# - (adds a sound) -# sounddel -# - (removes a sound) -# rscadd -# - (adds a feature) -# rscdel -# - (removes a feature) -# imageadd -# - (adds an image or sprite) -# imagedel -# - (removes an image or sprite) -# spellcheck -# - (fixes spelling or grammar) -# experiment -# - (experimental change) -# balance -# - (balance changes) -# code_imp -# - (misc internal code change) -# refactor -# - (refactors code) -# config -# - (makes a change to the config files) -# admin -# - (makes changes to administrator tools) -# server -# - (miscellaneous changes to server) -################################# - -# Your name. -author: FluffyGhost - -# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again. -delete-after: True - -# Any changes you've made. See valid prefix list above. -# INDENT WITH TWO SPACES. NOT TABS. SPACES. -# SCREW THIS UP AND IT WON'T WORK. -# Also, this gets changed to [] after reading. Just remove the brackets when you add new shit. -# Please surround your changes in double quotes ("). It works without them, but if you use certain characters it screws up compiling. The quotes will not show up in the changelog. -changes: - - code_imp: "Updated the changelog system." diff --git a/html/changelogs/furrycactus -scichem apc.yml b/html/changelogs/furrycactus -scichem apc.yml deleted file mode 100644 index 61aaab330c5..00000000000 --- a/html/changelogs/furrycactus -scichem apc.yml +++ /dev/null @@ -1,41 +0,0 @@ -################################ -# Example Changelog File -# -# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb. -# -# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.) -# When it is, any changes listed below will disappear. -# -# Valid Prefixes: -# bugfix -# wip (For works in progress) -# tweak -# soundadd -# sounddel -# rscadd (general adding of nice things) -# rscdel (general deleting of nice things) -# imageadd -# imagedel -# maptweak -# spellcheck (typo fixes) -# experiment -# balance -# admin -# backend -# security -# refactor -################################# - -# Your name. -author: Furrycactus - -# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again. -delete-after: True - -# Any changes you've made. See valid prefix list above. -# INDENT WITH TWO SPACES. NOT TABS. SPACES. -# SCREW THIS UP AND IT WON'T WORK. -# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries. -# Please surround your changes in double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog. -changes: - - rscadd: "Fixes the missing cable on the Science Chem Lab APC." From 9bf73f93f28bd9a84c1fa0fe7a75e23ef3f2e9ff Mon Sep 17 00:00:00 2001 From: Alberyk Date: Fri, 12 Apr 2024 19:21:21 -0300 Subject: [PATCH 2/7] Fixes the hailstorm gun having the wrong loaders (#18929) They had grauwolfs instead of franciscas. --- html/changelogs/alberyk-hailstorm.yml | 6 ++++++ maps/away/ships/dpra/hailstorm/hailstorm_ship.dmm | 8 ++++---- 2 files changed, 10 insertions(+), 4 deletions(-) create mode 100644 html/changelogs/alberyk-hailstorm.yml diff --git a/html/changelogs/alberyk-hailstorm.yml b/html/changelogs/alberyk-hailstorm.yml new file mode 100644 index 00000000000..7cfce5223e2 --- /dev/null +++ b/html/changelogs/alberyk-hailstorm.yml @@ -0,0 +1,6 @@ +author: Alberyk + +delete-after: True + +changes: + - bugfix: "Fixed the hailstorm having the wrong gun loaders." diff --git a/maps/away/ships/dpra/hailstorm/hailstorm_ship.dmm b/maps/away/ships/dpra/hailstorm/hailstorm_ship.dmm index 9a8705cc8a6..c4c0e19fc63 100644 --- a/maps/away/ships/dpra/hailstorm/hailstorm_ship.dmm +++ b/maps/away/ships/dpra/hailstorm/hailstorm_ship.dmm @@ -3857,13 +3857,13 @@ }, /area/hailstorm_ship) "Up" = ( -/obj/machinery/ammunition_loader/grauwolf{ - weapon_id = "Hailstorm Port Gun" - }, /obj/structure/window/reinforced{ dir = 1; icon_state = "rwindow" }, +/obj/machinery/ammunition_loader/francisca{ + weapon_id = "Hailstorm Port Gun" + }, /turf/simulated/floor/tiled{ temperature = 278.15 }, @@ -3879,7 +3879,7 @@ }, /area/shuttle/hailstorm_shuttle) "UD" = ( -/obj/machinery/ammunition_loader/grauwolf{ +/obj/machinery/ammunition_loader/francisca{ weapon_id = "Hailstorm Starboard Gun" }, /turf/simulated/floor/tiled{ From 4e76fc5133b663cff135212a547385d979ea756d Mon Sep 17 00:00:00 2001 From: Fluffy <65877598+FluffyGhoster@users.noreply.github.com> Date: Sat, 13 Apr 2024 00:21:34 +0200 Subject: [PATCH 3/7] Ruins sanitization and unit test (#18923) Properly split and use prefixes and suffixes, unit test to verify the file exists and is not empty, and that the format convention is respected --- code/datums/ruins.dm | 33 ++++- code/modules/maps/map_template.dm | 2 + code/unit_tests/ruins_tests.dm | 47 ++++++ .../fluffyghost-makeruinpathsmoresane.yml | 41 ++++++ .../abandoned_diner/abandoned_diner.dm | 3 +- .../abandoned_industrial_station.dm | 3 +- .../away/away_site/abandoned_mining/cursed.dm | 5 +- .../abandoned_propellant_depot_.dm | 5 +- .../away_site/big_derelict/bigderelict.dm | 5 +- maps/away/away_site/blueriver/blueriver.dm | 5 +- .../crashed_elyran_tanker.dm | 5 +- .../crystal_planet_outpost_.dm | 5 +- .../away_site/first_aurora/first_aurora.dm | 5 +- .../away/away_site/hivebot_hub/hivebot_hub.dm | 5 +- .../away/away_site/idris_wreck/idris_wreck.dm | 5 +- .../konyang/point_verdant/point_verdant.dm | 5 +- maps/away/away_site/magshield/magshield.dm | 5 +- .../orion/orion_automated_station.dm | 4 +- .../overgrown_mining_station.dm | 5 +- .../away/away_site/pirate_base/pirate_base.dm | 5 +- maps/away/away_site/racers/racers.dm | 5 +- .../away_site/romanovich/grand_romanovich.dm | 5 +- .../away_site/sensor_relay/sensor_relay.dm | 5 +- maps/away/away_site/shady/shady.dm | 5 +- maps/away/away_site/sol_bunker/bunker.dm | 5 +- .../tajara/mining_jack/mining_jack.dm | 5 +- .../tajara/peoples_station/peoples_station.dm | 5 +- .../tajara/pra_satellite/pra_satellite.dm | 5 +- .../saniorios_smuggler/saniorios_smuggler.dm | 5 +- .../away_site/tajara/scrapper/scrapper.dm | 5 +- .../tajara/taj_safehouse/tajara_safehouse.dm | 5 +- .../wrecked_nt_ship/wrecked_nt_ship.dm | 5 +- maps/away/away_sites.dm | 7 + .../biesel/tcaf_corvette/tcaf_corvette.dm | 5 +- .../tcfl_patrol/tcfl_peacekeeper_ship.dm | 5 +- maps/away/ships/casino/casino.dm | 5 +- maps/away/ships/coc/coc_ranger/coc_ship.dm | 5 +- maps/away/ships/coc/coc_scarab/coc_scarab.dm | 5 +- .../ships/coc/coc_surveyor/coc_surveyor.dm | 5 +- .../coc/gadpathur_patrol/gadpathur_patrol.dm | 5 +- .../dionae/diona_rokz_ship/diona_rokz_ship.dm | 5 +- .../dionae/diona_serz_ship/diona_serz_ship.dm | 5 +- .../dominian_corvette/dominian_corvette.dm | 5 +- .../dominian_science_vessel.dm | 5 +- .../dominian_unathi_privateer.dm | 5 +- .../ships/dpra/hailstorm/hailstorm_ship.dm | 5 +- maps/away/ships/einstein/ee_spy_ship.dm | 5 +- .../elyra/elyra_corvette/elyra_corvette.dm | 5 +- maps/away/ships/freebooter/freebooter_ship.dm | 5 +- maps/away/ships/golden_deep/golden_deep.dm | 5 +- .../hegemony_corvette/hegemony_corvette.dm | 5 +- .../merchants_guild/merchant_freighter.dm | 5 +- .../miners_guild/miners_guild_station.dm | 5 +- .../ships/heph/cyclops/cyclops_mining_ship.dm | 5 +- .../ships/heph/heph_security/heph_security.dm | 5 +- maps/away/ships/iac/iac_rescue_ship.dm | 5 +- maps/away/ships/idris/idris_cruiser.dm | 5 +- .../away/ships/kataphracts/kataphract_ship.dm | 5 +- .../ships/konyang/air_konyang/air_konyang.dm | 5 +- .../einstein_shuttle/einstein_shuttle.dm | 5 +- .../konyang/ipc_refugee/ipc_refugee_ship.dm | 5 +- .../away/ships/konyang/kasf_ship/kasf_ship.dm | 5 +- .../konyang/konyang_wreck/konyang_wreck.dm | 5 +- .../ships/konyang/water_barge/water_barge.dm | 5 +- .../ships/nka/nka_merchant/nka_merchant.dm | 5 +- maps/away/ships/orion/orion_express_ship.dm | 5 +- .../database_freighter/database_freighter.dm | 5 +- .../ships/pra/headmaster/headmaster_ship.dm | 5 +- maps/away/ships/sadar_scout/sadar_scout.dm | 5 +- maps/away/ships/scc/scc_scout_ship.dm | 5 +- maps/away/ships/sol_merc/fsf_patrol_ship.dm | 5 +- maps/away/ships/sol_pirate/sfa_patrol_ship.dm | 5 +- maps/away/ships/sol_ssmd/ssmd_ship.dm | 5 +- .../ships/tajara/circus/adhomian_circus.dm | 5 +- .../tajara/taj_smuggler/tajaran_smuggler.dm | 5 +- .../tirakqi_smuggler/tirakqi_smuggler.dm | 5 +- .../ships/tramp_freighter/tramp_freighter.dm | 5 +- .../hiskyn/unathi_pirate_hiskyn.dm | 5 +- .../izharshan/unathi_pirate_izharshan.dm | 5 +- .../tarwa/unathi_pirate_tarwa.dm | 5 +- .../ships/wildlands_militia/militia_ship.dm | 5 +- .../ships/wildlands_militia/militia_ship.dmm | 65 ++------- maps/away/ships/yacht/yacht.dm | 5 +- maps/away/ships/yacht_civ/yacht_civ_.dm | 5 +- .../adhomai/adhomai_abadoned_village.dm | 4 +- .../adhomai/adhomai_abandoned_labor_camp.dm | 4 +- .../exoplanets/adhomai/adhomai_amohdan.dm | 4 +- .../exoplanets/adhomai/adhomai_archeology.dm | 4 +- .../exoplanets/adhomai/adhomai_bar.dm | 4 +- .../exoplanets/adhomai/adhomai_battlefield.dm | 4 +- .../exoplanets/adhomai/adhomai_cavern.dm | 4 +- .../adhomai/adhomai_cavern_geist.dm | 4 +- .../adhomai/adhomai_chemical_testing.dm | 4 +- .../exoplanets/adhomai/adhomai_deserter.dm | 4 +- .../adhomai/adhomai_fallout_bunker.dm | 4 +- .../exoplanets/adhomai/adhomai_hunting.dm | 4 +- .../exoplanets/adhomai/adhomai_minefield.dm | 4 +- .../adhomai/adhomai_nuclear_waste.dm | 4 +- .../adhomai_nuclear_waste_makeshift.dm | 4 +- .../adhomai/adhomai_president_hadii_statue.dm | 4 +- .../adhomai_president_hadii_statue_toppled.dm | 4 +- .../exoplanets/adhomai/adhomai_rafama_herd.dm | 4 +- .../adhomai/adhomai_raskara_ritual.dm | 4 +- .../adhomai/adhomai_raskariim_hideout.dm | 4 +- .../adhomai/adhomai_rredouane_shrine.dm | 4 +- .../adhomai/adhomai_schlorrgo_cage.dm | 4 +- .../exoplanets/adhomai/adhomai_silo.dm | 4 +- .../adhomai/adhomai_sole_rock_nomad.dm | 4 +- .../adhomai/adhomai_tunneler_nest.dm | 4 +- .../exoplanets/adhomai/adhomai_village.dm | 4 +- .../adhomai/adhomai_war_memorial.dm | 4 +- .../exoplanets/adhomai/ala_base.dm | 4 +- .../exoplanets/adhomai/ala_cell.dm | 4 +- .../exoplanets/adhomai/nka_base.dm | 4 +- .../exoplanets/adhomai/north_pole_monolith.dm | 4 +- .../adhomai/north_pole_nka_expedition.dm | 4 +- .../exoplanets/adhomai/north_pole_worm.dm | 4 +- .../exoplanets/adhomai/pra_base.dm | 4 +- .../exoplanets/adhomai/pra_mining_camp.dm | 4 +- .../exoplanets/adhomai/psis_outpost.dm | 4 +- .../abandoned_prison/abandoned_prison.dm | 4 +- .../exoplanets/asteroid/asteroid.dm | 56 +++++-- .../asteroid/coalition_base/coalition_base.dm | 4 +- .../satellite_crash_unique.dmm | 0 .../exoplanets/burzsia/burzsia_dead_ipc.dm | 4 +- .../exoplanets/burzsia/burzsia_mining.dm | 4 +- .../exoplanets/crashed_pod/crashed_pod.dm | 5 +- .../exoplanets/delivery/delivery_site.dm | 4 +- maps/random_ruins/exoplanets/desert/desert.dm | 4 +- .../exoplanets/exoplanet_ruins.dm | 7 + maps/random_ruins/exoplanets/grove/grove.dm | 9 +- .../exoplanets/haneunim/haneunim_crash.dm | 5 +- .../exoplanets/haneunim/haneunim_crash.dmm | 26 +++- .../exoplanets/haneunim/haneunim_flag.dm | 4 +- .../exoplanets/haneunim/haneunim_mining.dm | 4 +- .../exoplanets/haneunim/haneunim_mystery.dm | 4 +- .../exoplanets/haneunim/haneunim_refugees.dm | 4 +- .../konyang/abandoned/abandoned_outpost.dm | 5 +- .../konyang/abandoned/abandoned_outpost.dmm | 138 ++++++++++-------- .../konyang/abandoned/abandoned_village.dm | 5 +- .../konyang/abandoned/factory_arms.dm | 4 +- .../konyang/abandoned/factory_refinery.dm | 4 +- .../konyang/abandoned/factory_robotics.dm | 4 +- .../exoplanets/konyang/abandoned/garage.dm | 4 +- .../konyang/abandoned/house _small.dm | 4 +- .../konyang/abandoned/landing_zone.dm | 4 +- .../exoplanets/konyang/abandoned/office.dm | 4 +- .../konyang/abandoned/rural_clinic.dm | 4 +- .../exoplanets/konyang/fireoutpost.dm | 4 +- .../exoplanets/konyang/hivebot_burrows_1.dm | 4 +- .../exoplanets/konyang/hivebot_burrows_2.dm | 4 +- .../exoplanets/konyang/homestead.dm | 4 +- .../exoplanets/konyang/jeweler_nest.dm | 4 +- .../exoplanets/konyang/landing_zone.dm | 4 +- .../exoplanets/konyang/pirate_moonshine.dm | 4 +- .../exoplanets/konyang/pirate_outpost.dm | 4 +- .../exoplanets/konyang/pirate_outpost.dmm | 33 ++++- .../exoplanets/konyang/stranded_police.dm | 4 +- .../exoplanets/konyang/swamp_1.dm | 4 +- .../exoplanets/konyang/swamp_2.dm | 4 +- .../exoplanets/konyang/swamp_3.dm | 4 +- .../exoplanets/konyang/swamp_4.dm | 4 +- .../exoplanets/konyang/telecomms_outpost.dm | 5 +- .../exoplanets/konyang/tribute.dm | 4 +- .../exoplanets/konyang/village.dm | 5 +- maps/random_ruins/exoplanets/lava/lava.dm | 5 +- .../raskara/pra_exploration_drone.dm | 4 +- .../exoplanets/raskara/raskara_okon.dm | 4 +- .../exoplanets/raskara/raskara_ritual.dm | 4 +- .../exoplanets/raskara/raskara_wreck.dm | 4 +- 170 files changed, 870 insertions(+), 302 deletions(-) create mode 100644 html/changelogs/fluffyghost-makeruinpathsmoresane.yml rename maps/random_ruins/exoplanets/asteroid/{satellite _crash => satellite_crash}/satellite_crash_unique.dmm (100%) diff --git a/code/datums/ruins.dm b/code/datums/ruins.dm index 4073ca5b0e0..a965dc08d45 100644 --- a/code/datums/ruins.dm +++ b/code/datums/ruins.dm @@ -40,11 +40,30 @@ */ var/list/sectors_blacklist = list() - /// Prefix part of the path to the dmm maps. + /** + * Static part of the ruin path, ie the folder + * have to start without a slash, and end with a slash + * + * eg. `away_site/` + * + * Gets combined with the other prefixes in the inheritance tree + * (under /New()) to form the relative path from the root of the codebase + * to the folder this ruin is in + * + * If you implement a subtype of another subtype, it is *your* responsibility to + * ensure that `/New()` chains the path correctly + */ var/prefix = null - /// A list of suffix parts of paths of the dmm maps. - /// Combined with prefix to get the actual path. + /** + * The dynamic part of the ruin path, ie the files + * + * A `/list` with only the file names of the DMM files + * + * eg. `my_awesome_ruin.dmm` + * + * Gets combined with the prefix to form the path to the map files, that are loaded when the ruin loads + */ var/list/suffixes = null /// Template flags for this ruin @@ -59,7 +78,13 @@ ///Listed ruins are removed from the set of available spawns var/list/ban_ruins -/datum/map_template/ruin/New() +/** + * Ensure to call the parent constructor *last* + * + * If you have subtypes and you change the `prefix`, it is *your* responsibility to + * chain your changed `prefix` here, before calling the parent constructor + */ +/datum/map_template/ruin/New(var/list/paths = null, rename = null) // get the map paths if (suffixes) mappaths = list() diff --git a/code/modules/maps/map_template.dm b/code/modules/maps/map_template.dm index 74bc344f900..82ebc6fc368 100644 --- a/code/modules/maps/map_template.dm +++ b/code/modules/maps/map_template.dm @@ -26,6 +26,8 @@ if(rename) name = rename + ..() + /datum/map_template/proc/preload_size(paths) var/list/bounds = list(1.#INF, 1.#INF, 1.#INF, -1.#INF, -1.#INF, -1.#INF) var/z_offset = 1 // needed to calculate z-bounds correctly diff --git a/code/unit_tests/ruins_tests.dm b/code/unit_tests/ruins_tests.dm index 3b57087eb38..7a0d574a5be 100644 --- a/code/unit_tests/ruins_tests.dm +++ b/code/unit_tests/ruins_tests.dm @@ -49,3 +49,50 @@ TEST_PASS("All the ruins in [src.name] loaded successfully!") return UNIT_TEST_PASSED + +/datum/unit_test/ruins_test/all_files_valid + name = "All Ruins Files Exist" + groups = list("generic") //This runs as a generic test as we only need to pass them once, not in every pod + +/datum/unit_test/ruins_test/all_files_valid/start_test() + + . = UNIT_TEST_PASSED + + //Look into every ruin, and see if all the file paths are valid (the file exists) + //or otherwise do not respect the convention + for(var/ruin in subtypesof(/datum/map_template/ruin)) + LOG_GITHUB_NOTICE("Testing files for ruin [ruin]") + + var/datum/map_template/ruin/tested_ruin = new ruin() + + for(var/path in tested_ruin.mappaths) + LOG_GITHUB_DEBUG("Now testing [path] for ruin [ruin]") + + //Path format must be respected, start without a slash, and end with a slash + if(!initial(tested_ruin.prefix) || tested_ruin.prefix[1] == "/" || tested_ruin.prefix[length_char(tested_ruin.prefix)] != "/") + TEST_FAIL("Ruin [tested_ruin.name] has an invalid prefix path: [tested_ruin.prefix]") + . = UNIT_TEST_FAILED + + //No subfolders in the suffixes list + var/regex/no_subfolders_in_suffixes = regex(@"[\\\/]+") + for(var/suffix in tested_ruin.suffixes) + LOG_GITHUB_DEBUG("Checking suffix [suffix]") + if(no_subfolders_in_suffixes.Find(suffix)) + TEST_FAIL("Ruin [ruin] contains a slash or a backslash in the suffixes list!") + . = UNIT_TEST_FAILED + + //See if the file actually exists + var/file_content = file2text(file(path)) + if(!length(file_content)) + TEST_FAIL("Ruin [ruin] - [path] have paths that do not exist or are empty!") + . = UNIT_TEST_FAILED + + + + if(. == UNIT_TEST_PASSED) + TEST_PASS("All ruins have valid files!") + return UNIT_TEST_PASSED + + else + TEST_FAIL("Some ruins have invalid paths, read above!") + return UNIT_TEST_FAILED diff --git a/html/changelogs/fluffyghost-makeruinpathsmoresane.yml b/html/changelogs/fluffyghost-makeruinpathsmoresane.yml new file mode 100644 index 00000000000..2e2c7d071a0 --- /dev/null +++ b/html/changelogs/fluffyghost-makeruinpathsmoresane.yml @@ -0,0 +1,41 @@ +################################ +# Example Changelog File +# +# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb. +# +# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.) +# When it is, any changes listed below will disappear. +# +# Valid Prefixes: +# bugfix +# wip (For works in progress) +# tweak +# soundadd +# sounddel +# rscadd (general adding of nice things) +# rscdel (general deleting of nice things) +# imageadd +# imagedel +# maptweak +# spellcheck (typo fixes) +# experiment +# balance +# admin +# backend +# security +# refactor +################################# + +# Your name. +author: FluffyGhost + +# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again. +delete-after: True + +# Any changes you've made. See valid prefix list above. +# INDENT WITH TWO SPACES. NOT TABS. SPACES. +# SCREW THIS UP AND IT WON'T WORK. +# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries. +# Please surround your changes in double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog. +changes: + - code_imp: "Properly split and use prefixes and suffixes, unit test to verify the file exists and is not empty, and that the format convention is respected." diff --git a/maps/away/away_site/abandoned_diner/abandoned_diner.dm b/maps/away/away_site/abandoned_diner/abandoned_diner.dm index 80647292d4a..db9e8a38a84 100644 --- a/maps/away/away_site/abandoned_diner/abandoned_diner.dm +++ b/maps/away/away_site/abandoned_diner/abandoned_diner.dm @@ -6,7 +6,8 @@ id = "abandoned_diner"//Arbitrary tag to make things work. This should be lowercase and unique spawn_cost = 1 spawn_weight = 1 - suffixes = list("away_site/abandoned_diner/abandoned_diner.dmm") + prefix = "away_site/abandoned_diner/" + suffixes = list("abandoned_diner.dmm") sectors = list(ALL_CORPORATE_SECTORS) sectors_blacklist = list(SECTOR_TAU_CETI, SECTOR_HANEUNIM) diff --git a/maps/away/away_site/abandoned_industrial/abandoned_industrial_station.dm b/maps/away/away_site/abandoned_industrial/abandoned_industrial_station.dm index f39d1d6b5cf..85bfdfda88a 100644 --- a/maps/away/away_site/abandoned_industrial/abandoned_industrial_station.dm +++ b/maps/away/away_site/abandoned_industrial/abandoned_industrial_station.dm @@ -6,7 +6,8 @@ id = "abandoned_industrial_station"//Arbitrary tag to make things work. This should be lowercase and unique spawn_cost = 1 spawn_weight = 1 - suffixes = list("away_site/abandoned_industrial/abandoned_industrial_station.dmm") + prefix = "away_site/abandoned_industrial/" + suffixes = list("abandoned_industrial_station.dmm") sectors = list(ALL_POSSIBLE_SECTORS) sectors_blacklist = list(SECTOR_TAU_CETI, SECTOR_HANEUNIM) diff --git a/maps/away/away_site/abandoned_mining/cursed.dm b/maps/away/away_site/abandoned_mining/cursed.dm index fe41815dcfb..21d4a56fe52 100644 --- a/maps/away/away_site/abandoned_mining/cursed.dm +++ b/maps/away/away_site/abandoned_mining/cursed.dm @@ -1,7 +1,10 @@ /datum/map_template/ruin/away_site/cursed name = "lone asteroid" description = "A lone asteroid with a hangar. Latest data from this sector shows it as a Hephaestus mining station, two years ago." - suffixes = list("away_site/abandoned_mining/cursed.dmm") + + prefix = "away_site/abandoned_mining/" + suffixes = list("cursed.dmm") + sectors = list(ALL_TAU_CETI_SECTORS, SECTOR_VALLEY_HALE, SECTOR_BADLANDS, ALL_COALITION_SECTORS) sectors_blacklist = list(SECTOR_HANEUNIM, SECTOR_BURZSIA, SECTOR_TAU_CETI) //you're not gonna have a station left alone for 2 years in the middle of inhabited space spawn_weight = 1 diff --git a/maps/away/away_site/abandoned_propellant_depot/abandoned_propellant_depot_.dm b/maps/away/away_site/abandoned_propellant_depot/abandoned_propellant_depot_.dm index 0c35ee239e7..d5fd582121f 100644 --- a/maps/away/away_site/abandoned_propellant_depot/abandoned_propellant_depot_.dm +++ b/maps/away/away_site/abandoned_propellant_depot/abandoned_propellant_depot_.dm @@ -2,7 +2,10 @@ name = "Abandoned Propellant Depot" description = "Abandoned Propellant Depot." id = "abandoned_propellant_depot" - suffixes = list("away_site/abandoned_propellant_depot/abandoned_propellant_depot.dmm") + + prefix = "away_site/abandoned_propellant_depot/" + suffixes = list("abandoned_propellant_depot.dmm") + spawn_cost = 1 spawn_weight = 1 sectors = list(ALL_POSSIBLE_SECTORS) diff --git a/maps/away/away_site/big_derelict/bigderelict.dm b/maps/away/away_site/big_derelict/bigderelict.dm index bb42c0b87e5..81819dca5f4 100644 --- a/maps/away/away_site/big_derelict/bigderelict.dm +++ b/maps/away/away_site/big_derelict/bigderelict.dm @@ -1,7 +1,10 @@ /datum/map_template/ruin/away_site/big_derelict name = "large derelict" description = "A very large derelict station. According to the starmap, it shouldn't exist." - suffixes = list("away_site/big_derelict/bigderelict.dmm") + + prefix = "away_site/big_derelict/" + suffixes = list("bigderelict.dmm") + sectors = list(SECTOR_ROMANOVICH, SECTOR_CORP_ZONE, SECTOR_VALLEY_HALE, SECTOR_NEW_ANKARA, SECTOR_BADLANDS, SECTOR_AEMAQ, ALL_COALITION_SECTORS) sectors_blacklist = list(SECTOR_HANEUNIM) spawn_weight = 1 diff --git a/maps/away/away_site/blueriver/blueriver.dm b/maps/away/away_site/blueriver/blueriver.dm index 791c9a7bbb2..cccdeaa6df0 100644 --- a/maps/away/away_site/blueriver/blueriver.dm +++ b/maps/away/away_site/blueriver/blueriver.dm @@ -4,7 +4,10 @@ spawn_cost = 1 spawn_weight = 1 description = "An arctic planet and an alien underground surface." - suffixes = list("away_site/blueriver/blueriver-1.dmm","away_site/blueriver/blueriver-2.dmm") + + prefix = "away_site/blueriver/" + suffixes = list("blueriver-1.dmm","blueriver-2.dmm") + generate_mining_by_z = 2 sectors = list(SECTOR_ROMANOVICH, SECTOR_CORP_ZONE, SECTOR_VALLEY_HALE, SECTOR_BADLANDS, ALL_COALITION_SECTORS) sectors_blacklist = list(SECTOR_BURZSIA, SECTOR_HANEUNIM, SECTOR_TAU_CETI, SECTOR_SRANDMARR) //it's a whole ass planet, shouldn't have it in predefined sectors diff --git a/maps/away/away_site/crashed_elyran_tanker/crashed_elyran_tanker.dm b/maps/away/away_site/crashed_elyran_tanker/crashed_elyran_tanker.dm index 77c977e200e..4fe2e110ffd 100644 --- a/maps/away/away_site/crashed_elyran_tanker/crashed_elyran_tanker.dm +++ b/maps/away/away_site/crashed_elyran_tanker/crashed_elyran_tanker.dm @@ -3,7 +3,10 @@ /datum/map_template/ruin/away_site/crashed_elyran_tanker name = "Crashed Elyran Tanker" description = "A small tanker, emitting a very faint IFF signal of civilian vessels registered in Elyra. It seems to be partially embedded into a small asteroid, and appears to be completely cold." - suffixes = list("away_site/crashed_elyran_tanker/crashed_elyran_tanker.dmm") + + prefix = "away_site/crashed_elyran_tanker/" + suffixes = list("crashed_elyran_tanker.dmm") + sectors = list(SECTOR_ROMANOVICH, SECTOR_CORP_ZONE, SECTOR_VALLEY_HALE, SECTOR_NEW_ANKARA, SECTOR_BADLANDS, SECTOR_AEMAQ) spawn_weight = 1 spawn_cost = 1 diff --git a/maps/away/away_site/crystal_planet_outpost/crystal_planet_outpost_.dm b/maps/away/away_site/crystal_planet_outpost/crystal_planet_outpost_.dm index 507ee632b74..84b38fd61a9 100644 --- a/maps/away/away_site/crystal_planet_outpost/crystal_planet_outpost_.dm +++ b/maps/away/away_site/crystal_planet_outpost/crystal_planet_outpost_.dm @@ -4,7 +4,10 @@ id = "crystal_planet_outpost" spawn_cost = 1 spawn_weight = 1 - suffixes = list("away_site/crystal_planet_outpost/crystal_planet_outpost.dmm") + + prefix = "away_site/crystal_planet_outpost/" + suffixes = list("crystal_planet_outpost.dmm") + sectors = list(ALL_POSSIBLE_SECTORS) sectors_blacklist = list(SECTOR_BURZSIA, SECTOR_HANEUNIM, SECTOR_SRANDMARR, SECTOR_TAU_CETI) //it's a whole planet, shouldn't have it in predefined sectors unit_test_groups = list(1) diff --git a/maps/away/away_site/first_aurora/first_aurora.dm b/maps/away/away_site/first_aurora/first_aurora.dm index d112cadad19..0a5868552cf 100644 --- a/maps/away/away_site/first_aurora/first_aurora.dm +++ b/maps/away/away_site/first_aurora/first_aurora.dm @@ -1,7 +1,10 @@ /datum/map_template/ruin/away_site/first_aurora name = "space station derelict" description = "An abandoned space station." - suffixes = list("away_site/first_aurora/first_aurora.dmm") + + prefix = "away_site/first_aurora/" + suffixes = list("first_aurora.dmm") + sectors = list(SECTOR_ROMANOVICH) spawn_weight = 1 spawn_cost = 2 diff --git a/maps/away/away_site/hivebot_hub/hivebot_hub.dm b/maps/away/away_site/hivebot_hub/hivebot_hub.dm index 0db603e0bc3..afb5bf623ba 100644 --- a/maps/away/away_site/hivebot_hub/hivebot_hub.dm +++ b/maps/away/away_site/hivebot_hub/hivebot_hub.dm @@ -3,7 +3,10 @@ description = "derelict supply hub" id = "hivebot_hub" - suffixes = list("away_site/hivebot_hub/hivebot_hub.dmm") + + prefix = "away_site/hivebot_hub/" + suffixes = list("hivebot_hub.dmm") + sectors = list(SECTOR_ROMANOVICH, SECTOR_CORP_ZONE, SECTOR_VALLEY_HALE, SECTOR_NEW_ANKARA, SECTOR_BADLANDS, SECTOR_AEMAQ, ALL_COALITION_SECTORS) spawn_weight = 1 spawn_cost = 1 diff --git a/maps/away/away_site/idris_wreck/idris_wreck.dm b/maps/away/away_site/idris_wreck/idris_wreck.dm index 8e6ab8d5458..2c0b974dbe1 100644 --- a/maps/away/away_site/idris_wreck/idris_wreck.dm +++ b/maps/away/away_site/idris_wreck/idris_wreck.dm @@ -1,7 +1,10 @@ /datum/map_template/ruin/away_site/idris_wreck name = "Wrecked Idris Transport" description = "An Idris vessel, set upon by pirates and left in ruins." - suffixes = list("away_site/idris_wreck/idris_wreck.dmm") + + prefix = "away_site/idris_wreck/" + suffixes = list("idris_wreck.dmm") + sectors = list(SECTOR_BADLANDS, SECTOR_WEEPING_STARS, SECTOR_CORP_ZONE, SECTOR_VALLEY_HALE) //sectors that an idris ship might be passing through, but frontier enough that it could get raided spawn_weight = 1 spawn_cost = 1 diff --git a/maps/away/away_site/konyang/point_verdant/point_verdant.dm b/maps/away/away_site/konyang/point_verdant/point_verdant.dm index 9a67b21daad..9895ea1ea1f 100644 --- a/maps/away/away_site/konyang/point_verdant/point_verdant.dm +++ b/maps/away/away_site/konyang/point_verdant/point_verdant.dm @@ -3,7 +3,10 @@ id = "point_verdant" description = "A landing zone designated by local authorities within an SCC-affiliated spaceport. Accommodations have been made to ensure full visitation of any open facilities present." sectors = list(SECTOR_HANEUNIM) - suffixes = list("away_site/konyang/point_verdant/point_verdant-1.dmm","away_site/konyang/point_verdant/point_verdant-2.dmm","away_site/konyang/point_verdant/point_verdant-3.dmm") + + prefix = "away_site/konyang/point_verdant/" + suffixes = list("point_verdant-1.dmm", "point_verdant-2.dmm", "point_verdant-3.dmm") + spawn_weight = 1 spawn_cost = 1 template_flags = TEMPLATE_FLAG_PORT_SPAWN diff --git a/maps/away/away_site/magshield/magshield.dm b/maps/away/away_site/magshield/magshield.dm index 1b029ced8bb..0c8b203cdcf 100644 --- a/maps/away/away_site/magshield/magshield.dm +++ b/maps/away/away_site/magshield/magshield.dm @@ -3,7 +3,10 @@ id = "magshield" description = "It's an orbital shield station." sectors = list(ALL_TAU_CETI_SECTORS, SECTOR_VALLEY_HALE, SECTOR_BADLANDS, SECTOR_AEMAQ, SECTOR_SRANDMARR, SECTOR_NRRAHRAHUL, SECTOR_GAKAL, SECTOR_UUEOAESA, ALL_COALITION_SECTORS) - suffixes = list("away_site/magshield/magshield.dmm") + + prefix = "away_site/magshield/" + suffixes = list("magshield.dmm") + spawn_weight = 1 spawn_cost = 1 diff --git a/maps/away/away_site/orion/orion_automated_station.dm b/maps/away/away_site/orion/orion_automated_station.dm index 0c4946ecf68..751ee553809 100644 --- a/maps/away/away_site/orion/orion_automated_station.dm +++ b/maps/away/away_site/orion/orion_automated_station.dm @@ -9,7 +9,9 @@ id = "orion_automated_station" // arbitrary tag to make things work, this should be lowercase and unique spawn_cost = 1 spawn_weight = 1 - suffixes = list("away_site/orion/orion_automated_station.dmm") + + prefix = "away_site/orion/" + suffixes = list("orion_automated_station.dmm") sectors = list(ALL_CORPORATE_SECTORS) sectors_blacklist = list(ALL_DANGEROUS_SECTORS) diff --git a/maps/away/away_site/overgrown_mining_station/overgrown_mining_station.dm b/maps/away/away_site/overgrown_mining_station/overgrown_mining_station.dm index 820119e4552..52d0348f6df 100644 --- a/maps/away/away_site/overgrown_mining_station/overgrown_mining_station.dm +++ b/maps/away/away_site/overgrown_mining_station/overgrown_mining_station.dm @@ -1,7 +1,10 @@ /datum/map_template/ruin/away_site/overgrown_mining_station name = "overgrown_mining_station" description = "An abandoned mining station with a dionae growing into it" - suffixes = list("away_site/overgrown_mining_station/overgrown_mining_station.dmm") + + prefix = "away_site/overgrown_mining_station/" + suffixes = list("overgrown_mining_station.dmm") + sectors = list(SECTOR_TAU_CETI, SECTOR_ROMANOVICH, SECTOR_CORP_ZONE) spawn_weight = 1 spawn_cost = 2 diff --git a/maps/away/away_site/pirate_base/pirate_base.dm b/maps/away/away_site/pirate_base/pirate_base.dm index 8efb833e4ea..db9b38558d4 100644 --- a/maps/away/away_site/pirate_base/pirate_base.dm +++ b/maps/away/away_site/pirate_base/pirate_base.dm @@ -1,7 +1,10 @@ /datum/map_template/ruin/away_site/pirate_base name = "pirate base" description = "An asteroid with a occupied hangar carved into it." - suffixes = list("away_site/pirate_base/pirate_base.dmm") + + prefix = "away_site/pirate_base/" + suffixes = list("pirate_base.dmm") + sectors = list(SECTOR_ROMANOVICH, SECTOR_CORP_ZONE, SECTOR_VALLEY_HALE, SECTOR_BADLANDS, ALL_COALITION_SECTORS) spawn_weight = 1 ship_cost = 1 diff --git a/maps/away/away_site/racers/racers.dm b/maps/away/away_site/racers/racers.dm index aa54fe14f8b..7e9732ec652 100644 --- a/maps/away/away_site/racers/racers.dm +++ b/maps/away/away_site/racers/racers.dm @@ -1,7 +1,10 @@ /datum/map_template/ruin/away_site/racers name = "unregistered station" description = "A station that doesn't appear to have been legally registered. It has four large hangar bays and a small habitation module - and the signals emittered by its dying equipment seem to identify it as belonging to an underground racing group." - suffixes = list("away_site/racers/racers.dmm") + + prefix = "away_site/racers/" + suffixes = list("racers.dmm") + sectors = list(SECTOR_TAU_CETI, SECTOR_ROMANOVICH, SECTOR_CORP_ZONE, SECTOR_VALLEY_HALE, SECTOR_NEW_ANKARA, SECTOR_BADLANDS, SECTOR_AEMAQ, ALL_COALITION_SECTORS) spawn_weight = 1 spawn_cost = 2 diff --git a/maps/away/away_site/romanovich/grand_romanovich.dm b/maps/away/away_site/romanovich/grand_romanovich.dm index 5bb56f22272..ac61689f1fe 100644 --- a/maps/away/away_site/romanovich/grand_romanovich.dm +++ b/maps/away/away_site/romanovich/grand_romanovich.dm @@ -1,7 +1,10 @@ /datum/map_template/ruin/away_site/grand_romanovich name = "Grand Romanovich Casino" description = "An adhomian style casino in Tau Ceti's space." - suffixes = list("away_site/romanovich/grand_romanovich.dmm") + + prefix = "away_site/romanovich/" + suffixes = list("grand_romanovich.dmm") + sectors = list(SECTOR_ROMANOVICH) spawn_weight = 1 ship_cost = 2 diff --git a/maps/away/away_site/sensor_relay/sensor_relay.dm b/maps/away/away_site/sensor_relay/sensor_relay.dm index 7875b5bfecf..2dcb33b829d 100644 --- a/maps/away/away_site/sensor_relay/sensor_relay.dm +++ b/maps/away/away_site/sensor_relay/sensor_relay.dm @@ -1,7 +1,10 @@ /datum/map_template/ruin/away_site/sensor_relay name = "sensor relay" description = "A ring-shaped installation with a powerful sensor suite. These stations were originally built during the pre-Interstellar War era by the Solarian Alliance’s Department of Colonization as a method of making interstellar travel safer. Thousands of these “beacon stations” were built by the Alliance and many were abandoned during the Interstellar War and its aftermath. While they have been mostly replaced in more developed sectors, such as Liberty’s Cradle and the Jewel Worlds, beacon stations are still a common sight in less developed sectors of the Orion Spur such as the Badlands and Weeping Stars." - suffixes = list("away_site/sensor_relay/sensor_relay.dmm") + + prefix = "away_site/sensor_relay/" + suffixes = list("sensor_relay.dmm") + sectors = ALL_POSSIBLE_SECTORS id = "sensor_relay" template_flags = TEMPLATE_FLAG_SPAWN_GUARANTEED diff --git a/maps/away/away_site/shady/shady.dm b/maps/away/away_site/shady/shady.dm index da5281b359f..2ba21540763 100644 --- a/maps/away/away_site/shady/shady.dm +++ b/maps/away/away_site/shady/shady.dm @@ -1,7 +1,10 @@ /datum/map_template/ruin/away_site/shady name = "shady asteroid" description = "An asteroid with a hangar carved out inside it. Scans detect an unregistered structure within, with multiple lifeforms present." - suffixes = list("away_site/shady/shady.dmm") + + prefix = "away_site/shady/" + suffixes = list("shady.dmm") + sectors = list(SECTOR_ROMANOVICH, SECTOR_CORP_ZONE, SECTOR_VALLEY_HALE, SECTOR_BADLANDS, ALL_COALITION_SECTORS) sectors_blacklist = list(SECTOR_BURZSIA, SECTOR_HANEUNIM) spawn_weight = 1 diff --git a/maps/away/away_site/sol_bunker/bunker.dm b/maps/away/away_site/sol_bunker/bunker.dm index 9f48832fe2d..2a0de29fd49 100644 --- a/maps/away/away_site/sol_bunker/bunker.dm +++ b/maps/away/away_site/sol_bunker/bunker.dm @@ -1,7 +1,10 @@ /datum/map_template/ruin/away_site/abandoned_bunker name = "lone asteroid" description = "A lone asteroid. Strange signals are coming from this one." - suffixes = list("away_site/sol_bunker/bunker.dmm") + + prefix = "away_site/sol_bunker/" + suffixes = list("bunker.dmm") + sectors = list(SECTOR_ROMANOVICH, SECTOR_CORP_ZONE, SECTOR_VALLEY_HALE, SECTOR_WEEPING_STARS) spawn_weight = 1 spawn_cost = 1 diff --git a/maps/away/away_site/tajara/mining_jack/mining_jack.dm b/maps/away/away_site/tajara/mining_jack/mining_jack.dm index 1ec4994cbc8..2ad751b2d1c 100644 --- a/maps/away/away_site/tajara/mining_jack/mining_jack.dm +++ b/maps/away/away_site/tajara/mining_jack/mining_jack.dm @@ -1,7 +1,10 @@ /datum/map_template/ruin/away_site/tajara_mining_jack name = "adhomian mining outpost" description = "An outpost used by the crew of mining jacks." - suffixes = list("away_site/tajara/mining_jack/mining_jack.dmm") + + prefix = "away_site/tajara/mining_jack/" + suffixes = list("mining_jack.dmm") + sectors = list(SECTOR_BADLANDS, SECTOR_SRANDMARR, SECTOR_NRRAHRAHUL, SECTOR_GAKAL) spawn_weight = 1 ship_cost = 1 diff --git a/maps/away/away_site/tajara/peoples_station/peoples_station.dm b/maps/away/away_site/tajara/peoples_station/peoples_station.dm index 78bcfbc8e69..5156129f8c1 100644 --- a/maps/away/away_site/tajara/peoples_station/peoples_station.dm +++ b/maps/away/away_site/tajara/peoples_station/peoples_station.dm @@ -1,7 +1,10 @@ /datum/map_template/ruin/away_site/peoples_station name = "People's Space Station" description = "Built in the interwar period, the People's Space Station bears the prestige of being the first space installation designed, constructed, and manned by Tajara." - suffixes = list("away_site/tajara/peoples_station/peoples_station.dmm") + + prefix = "away_site/tajara/peoples_station/" + suffixes = list("peoples_station.dmm") + sectors = list(SECTOR_SRANDMARR) spawn_weight = 1 spawn_cost = 1 diff --git a/maps/away/away_site/tajara/pra_satellite/pra_satellite.dm b/maps/away/away_site/tajara/pra_satellite/pra_satellite.dm index 851f2889ee3..8b0135bfb43 100644 --- a/maps/away/away_site/tajara/pra_satellite/pra_satellite.dm +++ b/maps/away/away_site/tajara/pra_satellite/pra_satellite.dm @@ -1,7 +1,10 @@ /datum/map_template/ruin/away_site/pra_satellite name = "hadiist satellite" description = "A People's Republic of Adhomai satellite used to survey the system." - suffixes = list("away_site/tajara/pra_satellite/pra_satellite.dmm") + + prefix = "away_site/tajara/pra_satellite/" + suffixes = list("pra_satellite.dmm") + sectors = list(SECTOR_SRANDMARR, SECTOR_NRRAHRAHUL) spawn_weight = 1 spawn_cost = 1 diff --git a/maps/away/away_site/tajara/saniorios_smuggler/saniorios_smuggler.dm b/maps/away/away_site/tajara/saniorios_smuggler/saniorios_smuggler.dm index 67e9f547c2b..92dba451124 100644 --- a/maps/away/away_site/tajara/saniorios_smuggler/saniorios_smuggler.dm +++ b/maps/away/away_site/tajara/saniorios_smuggler/saniorios_smuggler.dm @@ -1,7 +1,10 @@ /datum/map_template/ruin/away_site/saniorios_smuggler name = "Sani'Orios" description = "A gas giant composed of ammonia. Its planetary ring is home to several spaceship wrecks and hidden smuggler bases." - suffixes = list("away_site/tajara/saniorios_smuggler/saniorios_smuggler.dmm") + + prefix = "away_site/tajara/saniorios_smuggler/" + suffixes = list("saniorios_smuggler.dmm") + sectors = list(SECTOR_SRANDMARR) spawn_weight = 1 spawn_cost = 2 diff --git a/maps/away/away_site/tajara/scrapper/scrapper.dm b/maps/away/away_site/tajara/scrapper/scrapper.dm index d112e3be446..0c3e674b313 100644 --- a/maps/away/away_site/tajara/scrapper/scrapper.dm +++ b/maps/away/away_site/tajara/scrapper/scrapper.dm @@ -1,7 +1,10 @@ /datum/map_template/ruin/away_site/tajara_scrapper name = "adhomian scrapper outpost" description = "An outpost used by Tajaran scrappers. It offers repair and scrapping services." - suffixes = list("away_site/tajara/scrapper/scrapper.dmm") + + prefix = "away_site/tajara/scrapper/" + suffixes = list("scrapper.dmm") + sectors = list(SECTOR_BADLANDS, SECTOR_SRANDMARR, SECTOR_NRRAHRAHUL, SECTOR_GAKAL) spawn_weight = 1 ship_cost = 1 diff --git a/maps/away/away_site/tajara/taj_safehouse/tajara_safehouse.dm b/maps/away/away_site/tajara/taj_safehouse/tajara_safehouse.dm index bb198edce50..24bf11f2117 100644 --- a/maps/away/away_site/tajara/taj_safehouse/tajara_safehouse.dm +++ b/maps/away/away_site/tajara/taj_safehouse/tajara_safehouse.dm @@ -1,7 +1,10 @@ /datum/map_template/ruin/away_site/tajara_safehouse name = "abandoned outpost" description = "A derelict space outpost." - suffixes = list("away_site/tajara/taj_safehouse/tajara_safehouse.dmm") + + prefix = "away_site/tajara/taj_safehouse/" + suffixes = list("tajara_safehouse.dmm") + sectors = list(SECTOR_CORP_ZONE, SECTOR_VALLEY_HALE, SECTOR_BADLANDS) spawn_weight = 1 ship_cost = 2 diff --git a/maps/away/away_site/wrecked_nt_ship/wrecked_nt_ship.dm b/maps/away/away_site/wrecked_nt_ship/wrecked_nt_ship.dm index e0c7e21bba8..a10bd3a3af7 100644 --- a/maps/away/away_site/wrecked_nt_ship/wrecked_nt_ship.dm +++ b/maps/away/away_site/wrecked_nt_ship/wrecked_nt_ship.dm @@ -1,7 +1,10 @@ /datum/map_template/ruin/away_site/wrecked_nt_ship name = "wrecked NT ship" description = "A wrecked ship once owned by NanoTrasen." - suffixes = list("away_site/wrecked_nt_ship/wrecked_nt_ship.dmm") + + prefix = "away_site/wrecked_nt_ship/" + suffixes = list("wrecked_nt_ship.dmm") + sectors = list(SECTOR_TAU_CETI, SECTOR_ROMANOVICH, SECTOR_CORP_ZONE, SECTOR_VALLEY_HALE, SECTOR_BADLANDS, ALL_COALITION_SECTORS, SECTOR_SRANDMARR) sectors_blacklist = list(SECTOR_BURZSIA, SECTOR_HANEUNIM) //NT has pretty much no presence in either of these, why would there be a wrecked ship spawn_weight = 1 diff --git a/maps/away/away_sites.dm b/maps/away/away_sites.dm index 4c521356960..f6a04b4d0a3 100644 --- a/maps/away/away_sites.dm +++ b/maps/away/away_sites.dm @@ -3,3 +3,10 @@ /datum/map_template/ruin/away_site var/list/generate_mining_by_z prefix = "maps/away/" + +/datum/map_template/ruin/away_site/New(var/list/paths = null, rename = null) + + //Apply the subfolder that all ruins are in, as the prefix will get overwritten + prefix = "maps/away/[prefix]" + + ..() diff --git a/maps/away/ships/biesel/tcaf_corvette/tcaf_corvette.dm b/maps/away/ships/biesel/tcaf_corvette/tcaf_corvette.dm index 25bcd24439f..38612b4ad71 100644 --- a/maps/away/ships/biesel/tcaf_corvette/tcaf_corvette.dm +++ b/maps/away/ships/biesel/tcaf_corvette/tcaf_corvette.dm @@ -1,7 +1,10 @@ /datum/map_template/ruin/away_site/tcaf_corvette name = "Republican Fleet Corvette" description = "A patrol vessel of Biesel's Republican Fleet." - suffixes = list("ships/biesel/tcaf_corvette/tcaf_corvette.dmm") + + prefix = "ships/biesel/tcaf_corvette/" + suffixes = list("tcaf_corvette.dmm") + sectors = list(ALL_TAU_CETI_SECTORS, SECTOR_BADLANDS, SECTOR_VALLEY_HALE) spawn_weight = 1 ship_cost = 1 diff --git a/maps/away/ships/biesel/tcfl_patrol/tcfl_peacekeeper_ship.dm b/maps/away/ships/biesel/tcfl_patrol/tcfl_peacekeeper_ship.dm index 40f4caa695e..ed17c1e8cb2 100644 --- a/maps/away/ships/biesel/tcfl_patrol/tcfl_peacekeeper_ship.dm +++ b/maps/away/ships/biesel/tcfl_patrol/tcfl_peacekeeper_ship.dm @@ -1,7 +1,10 @@ /datum/map_template/ruin/away_site/tcfl_peacekeeper_ship name = "TCFL Corvette" description = "Serving as the very foundation of the SCC's (And more specifically, NanoTrasen's) fleet of asset protection vessels, the Cetus-class is versatile and durable, but also clumsy and somewhat underpowered in regards to its engine and propulsion. It features small weapon hardpoints in its thruster arms, and a massive hangar host to the design's interdiction counterpart - the Hydrus-class shuttle. This one appears to be a Decanus-class, the Tau Ceti Foreign Legion variation of the design." - suffixes = list("ships/tcfl_patrol/tcfl_peacekeeper_ship.dmm") + + prefix = "ships/biesel/tcfl_patrol/" + suffixes = list("tcfl_peacekeeper_ship.dmm") + sectors = list(ALL_TAU_CETI_SECTORS, SECTOR_VALLEY_HALE, SECTOR_BADLANDS) spawn_weight = 1 ship_cost = 1 diff --git a/maps/away/ships/casino/casino.dm b/maps/away/ships/casino/casino.dm index 0bf17e122ce..9c7afab9e14 100644 --- a/maps/away/ships/casino/casino.dm +++ b/maps/away/ships/casino/casino.dm @@ -1,7 +1,10 @@ /datum/map_template/ruin/away_site/casino name = "Casino" description = "A casino ship!" - suffixes = list("ships/casino/casino.dmm") + + prefix = "ships/casino/" + suffixes = list("casino.dmm") + sectors = list(ALL_TAU_CETI_SECTORS, SECTOR_VALLEY_HALE, SECTOR_BADLANDS, SECTOR_NEW_ANKARA, SECTOR_AEMAQ, SECTOR_SRANDMARR, SECTOR_NRRAHRAHUL, SECTOR_GAKAL, SECTOR_UUEOAESA, ALL_COALITION_SECTORS) spawn_weight = 1 spawn_cost = 1 diff --git a/maps/away/ships/coc/coc_ranger/coc_ship.dm b/maps/away/ships/coc/coc_ranger/coc_ship.dm index f17f9de0f14..5c86e9f1a09 100644 --- a/maps/away/ships/coc/coc_ranger/coc_ship.dm +++ b/maps/away/ships/coc/coc_ranger/coc_ship.dm @@ -1,7 +1,10 @@ /datum/map_template/ruin/away_site/ranger_corvette name = "Ranger Gunboat" description = "The Xansan-class is not, in fact, a distinct design in of itself. It is instead Xanu Prime’s variant of the Lagos-class gunboat, a Solarian light attack ship design. While the Lagos-class has been out of service with the Alliance’s navy for centuries, the blueprints were captured during the Interstellar war by Xanu Prime militiamen from a regional naval shipyard during the opening stages of the conflict, and were immediately used to construct ships of the class for use by Xanu Prime’s burgeoning military. While the Xansan-class has been retired from Xanu service, the leftover ships were donated en masse to the Frontier Marshal Bureau, and the Rangers make use of the craft to this day, in spite of their advanced age." - suffixes = list("ships/coc/coc_ranger/coc_ship.dmm") + + prefix = "ships/coc/coc_ranger/" + suffixes = list("coc_ship.dmm") + sectors = list(SECTOR_BADLANDS, ALL_COALITION_SECTORS) sectors_blacklist = list(SECTOR_HANEUNIM, SECTOR_BURZSIA) spawn_weight = 1 diff --git a/maps/away/ships/coc/coc_scarab/coc_scarab.dm b/maps/away/ships/coc/coc_scarab/coc_scarab.dm index 170d38fd476..8f74e7bc91c 100644 --- a/maps/away/ships/coc/coc_scarab/coc_scarab.dm +++ b/maps/away/ships/coc/coc_scarab/coc_scarab.dm @@ -1,7 +1,10 @@ /datum/map_template/ruin/away_site/coc_scarab name = "Scarab Salvage Ship" description = "Scarab salvage ship." - suffixes = list("ships/coc/coc_scarab/coc_scarab_deck_1.dmm", "ships/coc/coc_scarab/coc_scarab_deck_2.dmm") + + prefix = "ships/coc/coc_scarab/" + suffixes = list("coc_scarab_deck_1.dmm", "coc_scarab_deck_2.dmm") + sectors = list(SECTOR_COALITION, SECTOR_WEEPING_STARS, SECTOR_ARUSHA, SECTOR_LIBERTYS_CRADLE) spawn_weight = 1 ship_cost = 1 diff --git a/maps/away/ships/coc/coc_surveyor/coc_surveyor.dm b/maps/away/ships/coc/coc_surveyor/coc_surveyor.dm index a058a0be94d..aeac1f8a377 100644 --- a/maps/away/ships/coc/coc_surveyor/coc_surveyor.dm +++ b/maps/away/ships/coc/coc_surveyor/coc_surveyor.dm @@ -1,7 +1,10 @@ /datum/map_template/ruin/away_site/coc_surveyor name = "COC Survey Ship" description = "Coalition science ship." - suffixes = list("ships/coc/coc_surveyor/coc_surveyor.dmm") + + prefix = "ships/coc/coc_surveyor/" + suffixes = list("coc_surveyor.dmm") + sectors = list(SECTOR_BADLANDS, ALL_COALITION_SECTORS, ALL_VOID_SECTORS) sectors_blacklist = list(SECTOR_HANEUNIM, SECTOR_BURZSIA) spawn_weight = 1 diff --git a/maps/away/ships/coc/gadpathur_patrol/gadpathur_patrol.dm b/maps/away/ships/coc/gadpathur_patrol/gadpathur_patrol.dm index 902eb897ba5..0d2d3a66cdb 100644 --- a/maps/away/ships/coc/gadpathur_patrol/gadpathur_patrol.dm +++ b/maps/away/ships/coc/gadpathur_patrol/gadpathur_patrol.dm @@ -1,7 +1,10 @@ /datum/map_template/ruin/away_site/gadpathur_patrol name = "Gadpathurian Patrol Corvette" description = "Gadpathur navy patrol ship." - suffixes = list("ships/coc/gadpathur_patrol/gadpathur_patrol.dmm") + + prefix = "ships/coc/gadpathur_patrol/" + suffixes = list("gadpathur_patrol.dmm") + sectors = list(ALL_COALITION_SECTORS) //NOTE: Gadpathur patrols all of the Coalition, however, they are intentionally -not- present in Haneunim. Konyang and Gadpathur are not friendly as of the Amor Patriae arc. sectors_blacklist = list(SECTOR_HANEUNIM, SECTOR_BURZSIA) spawn_weight = 1 diff --git a/maps/away/ships/dionae/diona_rokz_ship/diona_rokz_ship.dm b/maps/away/ships/dionae/diona_rokz_ship/diona_rokz_ship.dm index 46d2649dd5b..6bfe3d7d9db 100644 --- a/maps/away/ships/dionae/diona_rokz_ship/diona_rokz_ship.dm +++ b/maps/away/ships/dionae/diona_rokz_ship/diona_rokz_ship.dm @@ -1,7 +1,10 @@ /datum/map_template/ruin/away_site/diona_rokz_ship name = "Rokz Clan Ship" description = "A ship belonging to the Rokz voidtamer clan, a group of dionae who specialize in selling space fauna." - suffixes = list("ships/dionae/diona_rokz_ship/diona_rokz_ship.dmm") + + prefix = "ships/dionae/diona_rokz_ship/" + suffixes = list("diona_rokz_ship.dmm") + sectors = list(SECTOR_BADLANDS, SECTOR_GAKAL, SECTOR_UUEOAESA) spawn_weight = 1 ship_cost = 1 diff --git a/maps/away/ships/dionae/diona_serz_ship/diona_serz_ship.dm b/maps/away/ships/dionae/diona_serz_ship/diona_serz_ship.dm index 567557f3af9..09caef8be23 100644 --- a/maps/away/ships/dionae/diona_serz_ship/diona_serz_ship.dm +++ b/maps/away/ships/dionae/diona_serz_ship/diona_serz_ship.dm @@ -1,7 +1,10 @@ /datum/map_template/ruin/away_site/diona_serz_ship name = "Serz Clan Ship" description = "A ship belonging to the Serz voidtamer clan, a group of dionae who specialize in selling space fauna." - suffixes = list("ships/dionae/diona_serz_ship/diona_serz_ship.dmm") + + prefix = "ships/dionae/diona_serz_ship/" + suffixes = list("diona_serz_ship.dmm") + sectors = list(SECTOR_BADLANDS, SECTOR_GAKAL, SECTOR_UUEOAESA) spawn_weight = 1 ship_cost = 1 diff --git a/maps/away/ships/dominia/dominian_corvette/dominian_corvette.dm b/maps/away/ships/dominia/dominian_corvette/dominian_corvette.dm index 29b4a0732b5..797508d00a4 100644 --- a/maps/away/ships/dominia/dominian_corvette/dominian_corvette.dm +++ b/maps/away/ships/dominia/dominian_corvette/dominian_corvette.dm @@ -1,7 +1,10 @@ /datum/map_template/ruin/away_site/dominian_corvette name = "Dominian Corvette" description = "One of the most common ships in the Imperial Fleet, Lammergeier-class corvettes are often used as the vanguard of battlefleets entering a system marked for annexation into the glorious Empire as it is tasked to find and scout routes for the larger fleet. Though intended for scouting and screening work the Lammergeier is, like its larger counterparts, quite heavily armed and armored for a typical corvette. Any frontier savages who attempt to meet one with force of arms will soon find themselves staring down the barrels of Zhurong’s finest weaponry, and the Fleet-trained Ma’zals entrusted to operate it. The heavy armament and sensors of the Lammergeier-class come at a cost: it lacks a shield generator and is much larger than a typical Solarian corvette, thus requiring a larger crew. Lammergeier-class captains are generally loyal Ma’zals, such as the citizens of Novi Jadran, and are authorized to take whatever measures are necessary to ensure their crew remains loyal to both Empire and Goddess. This one’s transponder marks it as belonging to the Empire’s First Battlefleet – a battle-hardened formation responsible for patrolling the region of the northern Sparring Sea between the Empire, Hegemony, and Republic of dominia." - suffixes = list("ships/dominia/dominian_corvette/dominian_corvette.dmm") + + prefix = "ships/dominia/dominian_corvette/" + suffixes = list("dominian_corvette.dmm") + sectors = list(SECTOR_BADLANDS) spawn_weight = 1 ship_cost = 1 diff --git a/maps/away/ships/dominia/dominian_science_vessel/dominian_science_vessel.dm b/maps/away/ships/dominia/dominian_science_vessel/dominian_science_vessel.dm index cdb6e7a5415..584ced2995a 100644 --- a/maps/away/ships/dominia/dominian_science_vessel/dominian_science_vessel.dm +++ b/maps/away/ships/dominia/dominian_science_vessel/dominian_science_vessel.dm @@ -1,7 +1,10 @@ /datum/map_template/ruin/away_site/dominian_science_vessel name = "Dominian Science Vessel" description = "Based on the Lammergeier-class corvette, this vessel has been repurposed by House Volvalaad for long range survey and scientific tasks. Due to its repurposement, the vessel features an enlarged hangar and shuttle, as well as scientific labs and a smaller defensive armament." - suffixes = list("ships/dominia/dominian_science_vessel/dominian_science_vessel.dmm") + + prefix = "ships/dominia/dominian_science_vessel/" + suffixes = list("dominian_science_vessel.dmm") + sectors = list(ALL_TAU_CETI_SECTORS, ALL_COALITION_SECTORS, SECTOR_BADLANDS) sectors_blacklist = list(SECTOR_HANEUNIM) spawn_weight = 1 diff --git a/maps/away/ships/dominia/dominian_unathi_privateer/dominian_unathi_privateer.dm b/maps/away/ships/dominia/dominian_unathi_privateer/dominian_unathi_privateer.dm index fb4ac6580ff..e8247fcd08f 100644 --- a/maps/away/ships/dominia/dominian_unathi_privateer/dominian_unathi_privateer.dm +++ b/maps/away/ships/dominia/dominian_unathi_privateer/dominian_unathi_privateer.dm @@ -1,7 +1,10 @@ /datum/map_template/ruin/away_site/dominian_unathi name = "Kazhkz Privateer Ship" description = "Dominian Unathi pirates" - suffixes = list("ships/dominia/dominian_unathi_privateer/dominian_unathi_privateer.dmm") + + prefix = "ships/dominia/dominian_unathi_privateer/" + suffixes = list("dominian_unathi_privateer.dmm") + sectors = list(SECTOR_BADLANDS, SECTOR_WEEPING_STARS) spawn_weight = 1 ship_cost = 1 diff --git a/maps/away/ships/dpra/hailstorm/hailstorm_ship.dm b/maps/away/ships/dpra/hailstorm/hailstorm_ship.dm index ef1e72e152f..d631caca1a8 100644 --- a/maps/away/ships/dpra/hailstorm/hailstorm_ship.dm +++ b/maps/away/ships/dpra/hailstorm/hailstorm_ship.dm @@ -2,7 +2,10 @@ name = "Hailstorm Ship" id = "hailstorm_ship" description = "A People's Volunteer Spacer Militia ship." - suffixes = list("ships/dpra/hailstorm/hailstorm_ship.dmm") + + prefix = "ships/dpra/hailstorm/" + suffixes = list("hailstorm_ship.dmm") + ship_cost = 1 spawn_weight = 1 shuttles_to_initialise = list(/datum/shuttle/autodock/overmap/hailstorm_shuttle) diff --git a/maps/away/ships/einstein/ee_spy_ship.dm b/maps/away/ships/einstein/ee_spy_ship.dm index 04ff2f2badf..924b46e4a21 100644 --- a/maps/away/ships/einstein/ee_spy_ship.dm +++ b/maps/away/ships/einstein/ee_spy_ship.dm @@ -1,7 +1,10 @@ /datum/map_template/ruin/away_site/ee_spy_ship name = "Einstein Engines Research Ship" description = "A research ship belonging to Einstein Engines, the Stellar Corporate Conglomerate's main competitor." - suffixes = list("ships/einstein/ee_spy_ship.dmm") + + prefix = "ships/einstein/" + suffixes = list("ee_spy_ship.dmm") + sectors = list(SECTOR_TAU_CETI, SECTOR_ROMANOVICH, SECTOR_CORP_ZONE, SECTOR_VALLEY_HALE) spawn_weight = 1 ship_cost = 1 diff --git a/maps/away/ships/elyra/elyra_corvette/elyra_corvette.dm b/maps/away/ships/elyra/elyra_corvette/elyra_corvette.dm index 57f0a916653..a0b8fac56bf 100644 --- a/maps/away/ships/elyra/elyra_corvette/elyra_corvette.dm +++ b/maps/away/ships/elyra/elyra_corvette/elyra_corvette.dm @@ -1,7 +1,10 @@ /datum/map_template/ruin/away_site/elyran_corvette name = "Elyran Corvette" description = "One of the first vessels from Elyra's recent military modernization efforts to enter active service, the Sahin-class has taken great strides in improved quality and survivability from previous designs and is on track to become the backbone of the Elyran Republic's border control efforts. Equipped and crewed to handle anti-piracy operations, border patrols, and even to assist with disaster relief, this vessel follows the Elyran Armed Force's doctrine of versatility and is capable of striking out on its own for weeks at a time without resupply if required." - suffixes = list("ships/elyra/elyra_corvette/elyra_corvette.dmm") + + prefix = "ships/elyra/elyra_corvette/" + suffixes = list("elyra_corvette.dmm") + sectors = list(SECTOR_VALLEY_HALE, SECTOR_BADLANDS, SECTOR_NEW_ANKARA, SECTOR_AEMAQ) spawn_weight = 1 ship_cost = 1 diff --git a/maps/away/ships/freebooter/freebooter_ship.dm b/maps/away/ships/freebooter/freebooter_ship.dm index 7dc08123d84..16446ee8777 100644 --- a/maps/away/ships/freebooter/freebooter_ship.dm +++ b/maps/away/ships/freebooter/freebooter_ship.dm @@ -1,7 +1,10 @@ /datum/map_template/ruin/away_site/freebooter_ship name = "Freebooter Ship" description = "One of the most common sights in the Orion Spur, even outside of human space, is the Hephaestus-produced Ox-class freighter. Designed to haul significant amounts of cargo on well-charted routes between civilized systems, the Ox-class is the backbone of many interstellar markets outside of the United Syndicates of Himeo. Repurposed Ox-class freighters are often used by pirates throughout the Spur thanks to their large size and ease of maintenance – and modification." - suffixes = list("ships/freebooter/freebooter_ship.dmm") + + prefix = "ships/freebooter/" + suffixes = list("freebooter_ship.dmm") + sectors = list(SECTOR_TAU_CETI, SECTOR_ROMANOVICH, SECTOR_CORP_ZONE, SECTOR_VALLEY_HALE, SECTOR_NEW_ANKARA, SECTOR_BADLANDS, SECTOR_AEMAQ, SECTOR_SRANDMARR, ALL_COALITION_SECTORS) spawn_weight = 1 ship_cost = 1 diff --git a/maps/away/ships/golden_deep/golden_deep.dm b/maps/away/ships/golden_deep/golden_deep.dm index d16c0fcfe3e..c6c1226ac12 100644 --- a/maps/away/ships/golden_deep/golden_deep.dm +++ b/maps/away/ships/golden_deep/golden_deep.dm @@ -2,7 +2,10 @@ name = "Golden Deep Merchant Vessel" id = "golden_deep" description = "A mercantile transport vessel, registered to the Golden Deep." - suffixes = list("ships/golden_deep/golden_deep_merchant.dmm") + + prefix = "ships/golden_deep/" + suffixes = list("golden_deep_merchant.dmm") + ship_cost = 1 spawn_weight = 1 diff --git a/maps/away/ships/hegemony/hegemony_corvette/hegemony_corvette.dm b/maps/away/ships/hegemony/hegemony_corvette/hegemony_corvette.dm index 041cdc5b44f..1755061cb0e 100644 --- a/maps/away/ships/hegemony/hegemony_corvette/hegemony_corvette.dm +++ b/maps/away/ships/hegemony/hegemony_corvette/hegemony_corvette.dm @@ -1,7 +1,10 @@ /datum/map_template/ruin/away_site/hegemony_corvette name = "Hegemony Corvette" description = "Ship with lizards." - suffixes = list("ships/hegemony/hegemony_corvette/hegemony_corvette.dmm") + + prefix = "ships/hegemony/hegemony_corvette/" + suffixes = list("hegemony_corvette.dmm") + sectors = list(SECTOR_BADLANDS, SECTOR_UUEOAESA) spawn_weight = 1 ship_cost = 1 diff --git a/maps/away/ships/hegemony/merchants_guild/merchant_freighter.dm b/maps/away/ships/hegemony/merchants_guild/merchant_freighter.dm index 33dbb9d7ac6..a4da2d4b8a3 100644 --- a/maps/away/ships/hegemony/merchants_guild/merchant_freighter.dm +++ b/maps/away/ships/hegemony/merchants_guild/merchant_freighter.dm @@ -2,7 +2,10 @@ name = "Merchants' Guild Freighter" id = "merchants_guild" description = "A freighter flying under the banner of the Izweski Hegemony Merchants' Guild." - suffixes = list("ships/hegemony/merchants_guild/merchant_freighter.dmm") + + prefix = "ships/hegemony/merchants_guild/" + suffixes = list("merchant_freighter.dmm") + ship_cost = 1 spawn_weight = 0 //the merchants guild has gone bankrupt, don't spawn this until we figure out how to rework it. diff --git a/maps/away/ships/hegemony/miners_guild/miners_guild_station.dm b/maps/away/ships/hegemony/miners_guild/miners_guild_station.dm index f8982882dbd..e76734a884b 100644 --- a/maps/away/ships/hegemony/miners_guild/miners_guild_station.dm +++ b/maps/away/ships/hegemony/miners_guild/miners_guild_station.dm @@ -1,7 +1,10 @@ /datum/map_template/ruin/away_site/miners_guild_station name = "Miners' Guild Outpost" description = "A station constructed by the Unathi Miners' Guild" - suffixes = list("ships/hegemony/miners_guild/miners_guild_station.dmm") + + prefix = "ships/hegemony/miners_guild/" + suffixes = list("miners_guild_station.dmm") + spawn_weight = 1 ship_cost = 1 sectors = list(SECTOR_BADLANDS, SECTOR_UUEOAESA) diff --git a/maps/away/ships/heph/cyclops/cyclops_mining_ship.dm b/maps/away/ships/heph/cyclops/cyclops_mining_ship.dm index 08da0271975..24cd8db4224 100644 --- a/maps/away/ships/heph/cyclops/cyclops_mining_ship.dm +++ b/maps/away/ships/heph/cyclops/cyclops_mining_ship.dm @@ -1,7 +1,10 @@ /datum/map_template/ruin/away_site/cyclops_mining_vessel name = "Cyclops Mining Vessel" description = "This bulky vessel is designed and operated by Hephaestus Industries. From asteroid cracking to planetary operations, this ship can do it all. " - suffixes = list("ships/heph/cyclops/cyclops.dmm") + + prefix = "ships/heph/cyclops/" + suffixes = list("cyclops.dmm") + sectors = list(SECTOR_TAU_CETI, SECTOR_ROMANOVICH, SECTOR_CORP_ZONE, SECTOR_VALLEY_HALE, SECTOR_BADLANDS, SECTOR_SRANDMARR, SECTOR_WEEPING_STARS, SECTOR_UUEOAESA, SECTOR_BURZSIA) spawn_weight = 1 ship_cost = 1 diff --git a/maps/away/ships/heph/heph_security/heph_security.dm b/maps/away/ships/heph/heph_security/heph_security.dm index 6d6cc70703a..217af275a92 100644 --- a/maps/away/ships/heph/heph_security/heph_security.dm +++ b/maps/away/ships/heph/heph_security/heph_security.dm @@ -1,7 +1,10 @@ /datum/map_template/ruin/away_site/heph_security name = "Hephaestus Security Vessel" description = "A vessel for protecting Hephaestus assets." - suffixes = list("ships/heph/heph_security/heph_security.dmm") + + prefix = "ships/heph/heph_security/" + suffixes = list("heph_security.dmm") + sectors = list(SECTOR_BURZSIA, SECTOR_UUEOAESA, SECTOR_TAU_CETI, SECTOR_CORP_ZONE) //Sectors with heavy Hephaestus presence specifically. These guys aren't going to be out patrolling the Badlands, they're going to be sticking close to valuable Heph installations. spawn_weight = 1 ship_cost = 1 diff --git a/maps/away/ships/iac/iac_rescue_ship.dm b/maps/away/ships/iac/iac_rescue_ship.dm index 95bc12bdfd1..e67aafe8a51 100644 --- a/maps/away/ships/iac/iac_rescue_ship.dm +++ b/maps/away/ships/iac/iac_rescue_ship.dm @@ -1,7 +1,10 @@ /datum/map_template/ruin/away_site/iac_rescue_ship name = "IAC Rescue Ship" description = "The Sanctuary-class rescue ship is a fast response medical vessel, based in large part off of the Asclepius-class medical transport, a much older and more widespread clinic ship, designed to operate mainly between planets rather than in open space. Most Sanctuary-class hulls are heavily refitted to accomodate for the new conditions in the Wildlands, sporting additional thrusters and a hangar bay, created from what was originally a waiting room. However, it is still limited by its origins, having only the bare minimum of crew and atmospherics facilities, as well as being rather obviously unarmed, often needing to return to port for repairs or supplies." - suffixes = list("ships/iac/iac_rescue_ship.dmm") + + prefix = "ships/iac/" + suffixes = list("iac_rescue_ship.dmm") + sectors = list(SECTOR_CORP_ZONE, SECTOR_VALLEY_HALE, SECTOR_BADLANDS, SECTOR_SRANDMARR, SECTOR_NRRAHRAHUL, ALL_COALITION_SECTORS) spawn_weight = 1 ship_cost = 1 diff --git a/maps/away/ships/idris/idris_cruiser.dm b/maps/away/ships/idris/idris_cruiser.dm index 7127047373f..dcb5e8e6da4 100644 --- a/maps/away/ships/idris/idris_cruiser.dm +++ b/maps/away/ships/idris/idris_cruiser.dm @@ -1,7 +1,10 @@ /datum/map_template/ruin/away_site/idris_cruiser name = "Idris Cruiser" description = "A small luxury cruiser run by Idris Incorporated's subsidiary, Celestial Cruises. The Argentum-class is more of a yacht than a proper cruise ship, and is easily dwarfed by the fleet's larger vessels. However, it makes up for its diminuitive size by its speed, flexibility, and low maintenance cost. It adopts a unique wandering business model, where it roams the Spur and caters to tired traveling vessel crews seeking a getaway among the stars. It comes with a bar and restaurant, a pool, a spa, and a viewing lounge, as well as four suites for overnight stayers." - suffixes = list("ships/idris/idris_cruiser.dmm") + + prefix = "ships/idris/" + suffixes = list("idris_cruiser.dmm") + sectors = list(ALL_CORPORATE_SECTORS) sectors_blacklist = list(ALL_DANGEROUS_SECTORS) spawn_weight = 1 diff --git a/maps/away/ships/kataphracts/kataphract_ship.dm b/maps/away/ships/kataphracts/kataphract_ship.dm index f5c4c41931e..e51533a080b 100644 --- a/maps/away/ships/kataphracts/kataphract_ship.dm +++ b/maps/away/ships/kataphracts/kataphract_ship.dm @@ -2,7 +2,10 @@ name = "kataphract ship" id = "awaysite_kataphract_ship" description = "Ship with lizard knights." - suffixes = list("ships/kataphracts/kataphract_ship.dmm") + + prefix = "ships/kataphracts/" + suffixes = list("kataphract_ship.dmm") + ship_cost = 1 spawn_weight = 1 spawn_weight_sector_dependent = list(SECTOR_UUEOAESA=3) diff --git a/maps/away/ships/konyang/air_konyang/air_konyang.dm b/maps/away/ships/konyang/air_konyang/air_konyang.dm index 6db1631378c..307e7f95aa1 100644 --- a/maps/away/ships/konyang/air_konyang/air_konyang.dm +++ b/maps/away/ships/konyang/air_konyang/air_konyang.dm @@ -1,7 +1,10 @@ /datum/map_template/ruin/away_site/air_konyang name = "Air Konyang" description = "Air Konyang civilian transport." - suffixes = list("ships/konyang/air_konyang/air_konyang.dmm") + + prefix = "ships/konyang/air_konyang/" + suffixes = list("air_konyang.dmm") + sectors = list(SECTOR_HANEUNIM) spawn_weight = 1 ship_cost = 1 diff --git a/maps/away/ships/konyang/einstein_shuttle/einstein_shuttle.dm b/maps/away/ships/konyang/einstein_shuttle/einstein_shuttle.dm index 70f0d7db0af..848951c5977 100644 --- a/maps/away/ships/konyang/einstein_shuttle/einstein_shuttle.dm +++ b/maps/away/ships/konyang/einstein_shuttle/einstein_shuttle.dm @@ -2,7 +2,10 @@ name = "Einstein Engines Shuttle" id = "einstein_shuttle" description = "An Einstein Engines transport shuttle." - suffixes = list("ships/konyang/einstein_shuttle/einstein_shuttle.dmm") + + prefix = "ships/konyang/einstein_shuttle/" + suffixes = list("einstein_shuttle.dmm") + spawn_weight = 1 ship_cost = 1 shuttles_to_initialise = list(/datum/shuttle/autodock/overmap/einstein_shuttle) diff --git a/maps/away/ships/konyang/ipc_refugee/ipc_refugee_ship.dm b/maps/away/ships/konyang/ipc_refugee/ipc_refugee_ship.dm index 7162121112b..267e24d39b1 100644 --- a/maps/away/ships/konyang/ipc_refugee/ipc_refugee_ship.dm +++ b/maps/away/ships/konyang/ipc_refugee/ipc_refugee_ship.dm @@ -1,7 +1,10 @@ /datum/map_template/ruin/away_site/ipc_refugee_ship name = "IPC Refugee Ship" description = "The Akers-class freighter is an ancient design, dating back nearly two hundred years. It was considered a reliable freighter for its time, but is completely obsolete by modern standards, making it a rare sight outside of ship graveyards. Scans indicate this vessel in particular to be exceptionally run down, bearing severe structural damage across the whole ship. Damage appears to be from a mix of both meteors and ballistic armaments. Despite this, power signatures seem to indicate the vessel is still somehow operable." - suffixes = list("ships/konyang/ipc_refugee/ipc_refugee_ship.dmm") + + prefix = "ships/konyang/ipc_refugee/" + suffixes = list("ipc_refugee_ship.dmm") + sectors = list(SECTOR_HANEUNIM, SECTOR_LIBERTYS_CRADLE) spawn_weight = 1 ship_cost = 1 diff --git a/maps/away/ships/konyang/kasf_ship/kasf_ship.dm b/maps/away/ships/konyang/kasf_ship/kasf_ship.dm index 46d34aa9fe6..51b2e08abd8 100644 --- a/maps/away/ships/konyang/kasf_ship/kasf_ship.dm +++ b/maps/away/ships/konyang/kasf_ship/kasf_ship.dm @@ -1,7 +1,10 @@ /datum/map_template/ruin/away_site/kasf_corvette name = "KASF Corvette" description = "An older design of patrol corvette that saw its fair share of service in its golden days among the Xanu fleets, the Sai-class corvette would be considered obsolete by modern standards were it not retrofitted with newer weaponry, sensors, and other ship systems. In recent decades this class of ship has largely been mothballed by Xanu, but a large number were reactivated and donated when Konyang declared independence from Sol and joined the Coalition of Colonies. Now it serves an important role in the KASF, commonly seen combatting pirates and controlling the flow of refugees from the Wildlands." - suffixes = list("ships/konyang/kasf_ship/kasf_ship.dmm") + + prefix = "ships/konyang/kasf_ship/" + suffixes = list("kasf_ship.dmm") + id = "kasf_corvette" shuttles_to_initialise = list(/datum/shuttle/autodock/overmap/kasf_shuttle) diff --git a/maps/away/ships/konyang/konyang_wreck/konyang_wreck.dm b/maps/away/ships/konyang/konyang_wreck/konyang_wreck.dm index 45386ac5eb8..19115eb3fcb 100644 --- a/maps/away/ships/konyang/konyang_wreck/konyang_wreck.dm +++ b/maps/away/ships/konyang/konyang_wreck/konyang_wreck.dm @@ -2,7 +2,10 @@ name = "Konyang Wrecked Cargo Ship" id = "konyang_wreck" description = "Orion Express cargo ship, home to an unfortunate outbreak of infected IPCs." - suffixes = list("ships/konyang_wreck/konyang_wreck.dmm") + + prefix = "ships/konyang/konyang_wreck/" + suffixes = list("konyang_wreck.dmm") + spawn_cost = 1 spawn_weight = 1 sectors = list(SECTOR_HANEUNIM) diff --git a/maps/away/ships/konyang/water_barge/water_barge.dm b/maps/away/ships/konyang/water_barge/water_barge.dm index 69d55c99067..4d2c599aa72 100644 --- a/maps/away/ships/konyang/water_barge/water_barge.dm +++ b/maps/away/ships/konyang/water_barge/water_barge.dm @@ -1,7 +1,10 @@ /datum/map_template/ruin/away_site/water_barge name = "Water Barge" description = "A PACHROM transport barge, exporting water." - suffixes = list("ships/konyang/water_barge/water_barge.dmm") + + prefix = "ships/konyang/water_barge/" + suffixes = list("water_barge.dmm") + sectors = list(SECTOR_HANEUNIM) spawn_weight = 1 ship_cost = 1 diff --git a/maps/away/ships/nka/nka_merchant/nka_merchant.dm b/maps/away/ships/nka/nka_merchant/nka_merchant.dm index 024658735cb..dafdee47b04 100644 --- a/maps/away/ships/nka/nka_merchant/nka_merchant.dm +++ b/maps/away/ships/nka/nka_merchant/nka_merchant.dm @@ -2,7 +2,10 @@ name = "Her Majesty's Mercantile Flotilla Ship" id = "nka_merchant" description = "A merchant ship of the New Kingdom's Mercantile Flotilla." - suffixes = list("ships/nka/nka_merchant/nka_merchant.dmm") + + prefix = "ships/nka/nka_merchant/" + suffixes = list("nka_merchant.dmm") + ship_cost = 1 spawn_weight = 1 shuttles_to_initialise = list(/datum/shuttle/autodock/overmap/nka_merchant_shuttle) diff --git a/maps/away/ships/orion/orion_express_ship.dm b/maps/away/ships/orion/orion_express_ship.dm index 96868a39de5..080b18ad809 100644 --- a/maps/away/ships/orion/orion_express_ship.dm +++ b/maps/away/ships/orion/orion_express_ship.dm @@ -1,7 +1,10 @@ /datum/map_template/ruin/away_site/orion_express_ship name = "Orion Express Mobile Station" description = "The Traveler-class mobile station is a relatively old design, but nonetheless venerable and one of the building blocks of interstellar commerce. While relatively small, is a treasured asset in the Orion Express corporation's fleet, and has been referred to as “the gas station of the stars”, offering food, supplies, and fuel to anyone who may need it." - suffixes = list("ships/orion/orion_express_ship.dmm") + + prefix = "ships/orion/" + suffixes = list("orion_express_ship.dmm") + sectors = list(ALL_CORPORATE_SECTORS) spawn_weight = 1 ship_cost = 1 diff --git a/maps/away/ships/pra/database_freighter/database_freighter.dm b/maps/away/ships/pra/database_freighter/database_freighter.dm index 13db06315d5..183f783dd0a 100644 --- a/maps/away/ships/pra/database_freighter/database_freighter.dm +++ b/maps/away/ships/pra/database_freighter/database_freighter.dm @@ -2,7 +2,10 @@ name = "Database Freighter" id = "database_freighter" description = "Made from adapted designs of the first freighter Tajara ever worked upon, Database freighters are PRA vessels made specially for gathering information on star systems and what passes through them." - suffixes = list("ships/pra/database_freighter/database_freighter.dmm") + + prefix = "ships/pra/database_freighter/" + suffixes = list("database_freighter.dmm") + ship_cost = 1 spawn_weight = 1 shuttles_to_initialise = list(/datum/shuttle/autodock/overmap/database_freighter_shuttle) diff --git a/maps/away/ships/pra/headmaster/headmaster_ship.dm b/maps/away/ships/pra/headmaster/headmaster_ship.dm index afaf986889d..ab809951d35 100644 --- a/maps/away/ships/pra/headmaster/headmaster_ship.dm +++ b/maps/away/ships/pra/headmaster/headmaster_ship.dm @@ -2,7 +2,10 @@ name = "Headmaster Ship" id = "headmaster_ship" description = "A People's Republic Orbital Fleet ship." - suffixes = list("ships/pra/headmaster/headmaster_ship.dmm") + + prefix = "ships/pra/headmaster/" + suffixes = list("headmaster_ship.dmm") + ship_cost = 1 spawn_weight = 1 shuttles_to_initialise = list(/datum/shuttle/autodock/overmap/headmaster_shuttle) diff --git a/maps/away/ships/sadar_scout/sadar_scout.dm b/maps/away/ships/sadar_scout/sadar_scout.dm index 8d985fb2cb0..b40b36ade7d 100644 --- a/maps/away/ships/sadar_scout/sadar_scout.dm +++ b/maps/away/ships/sadar_scout/sadar_scout.dm @@ -1,7 +1,10 @@ /datum/map_template/ruin/away_site/sadar_scout name = "Unified Sadar Fleet Scout" description = "The Boreas-class is a small and ancient class of expeditionary vessels dating back a couple hundreds years to when it was commissioned by the Solarian Department of Colonization for Colony Fleet SFE-528-RFS - better known now as the Scarab Fleet. Like most scarab ships, this one has been heavily modified with much of necessary equipment retrofitted and superfluous components stripped away." - suffixes = list("ships/sadar_scout/sadar_scout.dmm") + + prefix = "ships/sadar_scout/" + suffixes = list("sadar_scout.dmm") + sectors = list(ALL_COALITION_SECTORS) sectors_blacklist = list(SECTOR_HANEUNIM, SECTOR_BURZSIA) spawn_weight = 1 diff --git a/maps/away/ships/scc/scc_scout_ship.dm b/maps/away/ships/scc/scc_scout_ship.dm index 897208ead17..e2c45f520cb 100644 --- a/maps/away/ships/scc/scc_scout_ship.dm +++ b/maps/away/ships/scc/scc_scout_ship.dm @@ -1,7 +1,10 @@ /datum/map_template/ruin/away_site/scc_scout_ship name = "SCC Scout Ship" description = "A small ship commonly fielded by the Stellar Corporate Conglomerate, the Serendipity-class, Hephaestus-designed and produced. It is supposed to be a small platform, entirely self-sufficient general-purpose scouting and surveying ship, the Serendipity is equipped with both a bluespace and a warp drive and two different engines." - suffixes = list("ships/scc/scc_scout_ship.dmm") + + prefix = "ships/scc/" + suffixes = list("scc_scout_ship.dmm") + sectors = list(ALL_POSSIBLE_SECTORS) spawn_weight = 1 ship_cost = 1 diff --git a/maps/away/ships/sol_merc/fsf_patrol_ship.dm b/maps/away/ships/sol_merc/fsf_patrol_ship.dm index d953d2e1b24..9ed899e25f0 100644 --- a/maps/away/ships/sol_merc/fsf_patrol_ship.dm +++ b/maps/away/ships/sol_merc/fsf_patrol_ship.dm @@ -1,7 +1,10 @@ /datum/map_template/ruin/away_site/fsf_patrol_ship name = "FSF Corvette" description = "A small corvette manufactured for the Solarian Navy by Hephaestus, the Montevideo-class is an anti-piracy vessel through and through - with a shuttle bay that takes up a third of the ship and only a single weapon hardpoint located in one arm of the ship, the Montevideo is designed for long-term, self-sufficient operations in inhabited space against small-time pirate vessels that would be unable to overcome the ship's lackluster armaments. Generous automation and streamlined equipment allows it to function with a very small crew." - suffixes = list("ships/sol_merc/fsf_patrol_ship.dmm") + + prefix = "ships/sol_merc/" + suffixes = list("fsf_patrol_ship.dmm") + sectors = list(SECTOR_ROMANOVICH, SECTOR_CORP_ZONE, SECTOR_VALLEY_HALE) spawn_weight = 1 ship_cost = 1 diff --git a/maps/away/ships/sol_pirate/sfa_patrol_ship.dm b/maps/away/ships/sol_pirate/sfa_patrol_ship.dm index 739b2eb9082..8bee840b1bc 100644 --- a/maps/away/ships/sol_pirate/sfa_patrol_ship.dm +++ b/maps/away/ships/sol_pirate/sfa_patrol_ship.dm @@ -1,7 +1,10 @@ /datum/map_template/ruin/away_site/sfa_patrol_ship name = "SFA Corvette" description = "A small ship that appears to be, at its core, a Montevideo-class corvette, a Solarian anti-piracy and patrol corvette designed with ample automation and streamlined equipment which allows for it to be manned by a small crew. This one, however, seems to have been host to a myriad of haphazard and radical modifications, and is scarcely identifiable as the original craft. Beyond the changes made to the ship itself, it also appears to have suffered extensive damage and wear, and seems to be near-derelict" - suffixes = list("ships/sol_pirate/sfa_patrol_ship.dmm") + + prefix = "ships/sol_pirate/" + suffixes = list("sfa_patrol_ship.dmm") + sectors = list(SECTOR_CORP_ZONE, SECTOR_VALLEY_HALE, SECTOR_BADLANDS) spawn_weight = 1 ship_cost = 1 diff --git a/maps/away/ships/sol_ssmd/ssmd_ship.dm b/maps/away/ships/sol_ssmd/ssmd_ship.dm index aa54c223f75..ed6859562b9 100644 --- a/maps/away/ships/sol_ssmd/ssmd_ship.dm +++ b/maps/away/ships/sol_ssmd/ssmd_ship.dm @@ -2,7 +2,10 @@ name = "SSMD Corvette" description = "A long-range reconnaissance corvette design in use by the Solarian Navy, the Uhlan-class is a relatively costly and somewhat uncommon ship to be seen in the Alliance's fleets, and is typically reserved for more elite (or at least better equipped and trained) units. Designed to operate alone or as part of a small task force with minimal support in unfriendly space, it is most commonly seen assigned to probing, surveillance, harassment, and strike operations. \ In spite of its small size, the Uhlan has relatively generous crew facilities and it is well-armed relative to its size and role, all made possible by extensive automation." - suffixes = list("ships/sol_ssmd/ssmd_ship.dmm") + + prefix = "ships/sol_ssmd/" + suffixes = list("ssmd_ship.dmm") + sectors = list(SECTOR_BADLANDS) spawn_weight = 1 ship_cost = 1 diff --git a/maps/away/ships/tajara/circus/adhomian_circus.dm b/maps/away/ships/tajara/circus/adhomian_circus.dm index 80ac95a7b4e..65d1954a33e 100644 --- a/maps/away/ships/tajara/circus/adhomian_circus.dm +++ b/maps/away/ships/tajara/circus/adhomian_circus.dm @@ -1,7 +1,10 @@ /datum/map_template/ruin/away_site/adhomian_circus name = "Adhomian Traveling Circus" description = "The N'hanzafu class is a bulky Adhomian freighter designed with a large crew and cargo in mind. This one is painted in bright colors." - suffixes = list("ships/tajara/circus/adhomian_circus.dmm") + + prefix = "ships/tajara/circus/" + suffixes = list("adhomian_circus.dmm") + sectors = list(ALL_TAU_CETI_SECTORS, SECTOR_VALLEY_HALE, SECTOR_BADLANDS, SECTOR_SRANDMARR, SECTOR_NRRAHRAHUL, SECTOR_GAKAL) spawn_weight = 1 ship_cost = 1 diff --git a/maps/away/ships/tajara/taj_smuggler/tajaran_smuggler.dm b/maps/away/ships/tajara/taj_smuggler/tajaran_smuggler.dm index b8d2e7e3eb2..ce707ab5f85 100644 --- a/maps/away/ships/tajara/taj_smuggler/tajaran_smuggler.dm +++ b/maps/away/ships/tajara/taj_smuggler/tajaran_smuggler.dm @@ -1,7 +1,10 @@ /datum/map_template/ruin/away_site/tajaran_smuggler name = "Adhomian Freighter" description = "Built with reliability in mind, the Zhsram Freighter is one of the most common Adhomian designs. This vessel is cheap and has a sizeable cargo storage. It is frequently used by Tajaran traders and smugglers." - suffixes = list("ships/tajara/taj_smuggler/tajaran_smuggler.dmm") + + prefix = "ships/tajara/taj_smuggler/" + suffixes = list("tajaran_smuggler.dmm") + sectors = list(SECTOR_ROMANOVICH, SECTOR_CORP_ZONE, SECTOR_VALLEY_HALE, SECTOR_BADLANDS, SECTOR_SRANDMARR, SECTOR_NRRAHRAHUL, SECTOR_GAKAL, SECTOR_WEEPING_STARS) spawn_weight = 1 ship_cost = 1 diff --git a/maps/away/ships/tirakqi_smuggler/tirakqi_smuggler.dm b/maps/away/ships/tirakqi_smuggler/tirakqi_smuggler.dm index 3fdc247b742..321138a9aea 100644 --- a/maps/away/ships/tirakqi_smuggler/tirakqi_smuggler.dm +++ b/maps/away/ships/tirakqi_smuggler/tirakqi_smuggler.dm @@ -1,7 +1,10 @@ /datum/map_template/ruin/away_site/tirakqi_smuggler name = "Ti'Rakqi Smuggler" description = "Featuring a respectable cargo bay, light frame, and large thruster nacelles, the Xroquv-class is one of the fastest federation freighters of this size. This one in particular appears to be refitted with expanded thruster nacelles and minor structural modifications. This one's transponder identifies it as belonging to an independent freighter." - suffixes = list("ships/tirakqi_smuggler/tirakqi_smuggler.dmm") + + prefix = "ships/tirakqi_smuggler/" + suffixes = list("tirakqi_smuggler.dmm") + sectors = list(SECTOR_TAU_CETI, SECTOR_ROMANOVICH, SECTOR_CORP_ZONE, SECTOR_VALLEY_HALE, SECTOR_BADLANDS) spawn_weight = 1 ship_cost = 1 diff --git a/maps/away/ships/tramp_freighter/tramp_freighter.dm b/maps/away/ships/tramp_freighter/tramp_freighter.dm index 4a47d9ff2cf..acfb2da4c15 100644 --- a/maps/away/ships/tramp_freighter/tramp_freighter.dm +++ b/maps/away/ships/tramp_freighter/tramp_freighter.dm @@ -1,7 +1,10 @@ /datum/map_template/ruin/away_site/tramp_freighter name = "Tramp Freighter" description = "A freighter of mixed repute, the Catspaw-class is a rare independent design, and a favorite of small-scale freight businesses. It has a shielded cargo bay and an internal hangar, capable of accommodating a small shuttle. Its other features, however, are lacking - with cramped crew amenities and no defenses to speak of, the Catspaw is risky to operate in unpoliced space." - suffixes = list("ships/tramp_freighter/tramp_freighter.dmm") + + prefix = "ships/tramp_freighter/" + suffixes = list("tramp_freighter.dmm") + sectors = list(SECTOR_TAU_CETI, SECTOR_ROMANOVICH, SECTOR_CORP_ZONE, SECTOR_VALLEY_HALE, SECTOR_NEW_ANKARA, SECTOR_BADLANDS, SECTOR_AEMAQ, SECTOR_SRANDMARR, ALL_COALITION_SECTORS) spawn_weight = 1 ship_cost = 1 diff --git a/maps/away/ships/unathi_pirate/hiskyn/unathi_pirate_hiskyn.dm b/maps/away/ships/unathi_pirate/hiskyn/unathi_pirate_hiskyn.dm index 7f95c75eee4..d91de019eb7 100644 --- a/maps/away/ships/unathi_pirate/hiskyn/unathi_pirate_hiskyn.dm +++ b/maps/away/ships/unathi_pirate/hiskyn/unathi_pirate_hiskyn.dm @@ -1,7 +1,10 @@ /datum/map_template/ruin/away_site/hiskyn name = "Hiskyn Revanchists Ship" description = "Ship with pirate lizards." - suffixes = list("ships/unathi_pirate/hiskyn/unathi_pirate_hiskyn.dmm") + + prefix = "ships/unathi_pirate/hiskyn/" + suffixes = list("unathi_pirate_hiskyn.dmm") + sectors = list(SECTOR_BADLANDS, SECTOR_GAKAL) spawn_weight = 1 ship_cost = 1 diff --git a/maps/away/ships/unathi_pirate/izharshan/unathi_pirate_izharshan.dm b/maps/away/ships/unathi_pirate/izharshan/unathi_pirate_izharshan.dm index d7421615eb2..003c7863466 100644 --- a/maps/away/ships/unathi_pirate/izharshan/unathi_pirate_izharshan.dm +++ b/maps/away/ships/unathi_pirate/izharshan/unathi_pirate_izharshan.dm @@ -2,7 +2,10 @@ name = "empty sector" id = "unathi_pirate" description = "An empty sector." - suffixes = list("ships/unathi_pirate/izharshan/unathi_pirate_izharshan.dmm") + + prefix = "ships/unathi_pirate/izharshan/" + suffixes = list("unathi_pirate_izharshan.dmm") + spawn_weight = 1 ship_cost = 1 shuttles_to_initialise = list(/datum/shuttle/autodock/overmap/unathi_pirate_izharshan) diff --git a/maps/away/ships/unathi_pirate/tarwa/unathi_pirate_tarwa.dm b/maps/away/ships/unathi_pirate/tarwa/unathi_pirate_tarwa.dm index 7196c05c1b8..7ce48d82677 100644 --- a/maps/away/ships/unathi_pirate/tarwa/unathi_pirate_tarwa.dm +++ b/maps/away/ships/unathi_pirate/tarwa/unathi_pirate_tarwa.dm @@ -1,7 +1,10 @@ /datum/map_template/ruin/away_site/tarwa name = "Tarwa Conglomerate Ship" description = "Ship with pirate lizards, pirate plants" - suffixes = list("ships/unathi_pirate/tarwa/unathi_pirate_tarwa.dmm") + + prefix = "ships/unathi_pirate/tarwa/" + suffixes = list("unathi_pirate_tarwa.dmm") + sectors = list(SECTOR_BADLANDS, SECTOR_GAKAL, SECTOR_LIGHTS_EDGE, SECTOR_WEEPING_STARS) spawn_weight = 1 ship_cost = 1 diff --git a/maps/away/ships/wildlands_militia/militia_ship.dm b/maps/away/ships/wildlands_militia/militia_ship.dm index ee43162a0e9..ddedc1cb686 100644 --- a/maps/away/ships/wildlands_militia/militia_ship.dm +++ b/maps/away/ships/wildlands_militia/militia_ship.dm @@ -1,7 +1,10 @@ /datum/map_template/ruin/away_site/militia_ship name = "Militia Ship" description = "An unarmed and extremely prolific design of large, self-sufficient shuttle, prized for its modularity. Found all throughout the spur, the Yak-class shuttle can be configured to conceivably serve in any role, though it is only rarely armed with ship-to-ship weapons. Manufactured by Hephaestus." - suffixes = list("ships/wildlands_milita/militia_ship.dmm") + + prefix = "ships/wildlands_militia/" + suffixes = list("militia_ship.dmm") + sectors = list(SECTOR_ROMANOVICH, SECTOR_CORP_ZONE, SECTOR_VALLEY_HALE, SECTOR_BADLANDS) spawn_weight = 1 ship_cost = 1 diff --git a/maps/away/ships/wildlands_militia/militia_ship.dmm b/maps/away/ships/wildlands_militia/militia_ship.dmm index 214f0ebdc41..8f430642edb 100644 --- a/maps/away/ships/wildlands_militia/militia_ship.dmm +++ b/maps/away/ships/wildlands_militia/militia_ship.dmm @@ -18,7 +18,6 @@ "aad" = ( /obj/machinery/door/airlock/security{ name = "Brig"; - req_access = null; dir = 4 }, /turf/simulated/floor/tiled/dark, @@ -105,10 +104,7 @@ /obj/item/paper_bin, /obj/item/pen/multi, /obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/tiled{ - name = "cooled floor"; - temperature = 278 - }, +/turf/simulated/floor/tiled/cooled, /area/ship/militia_ship) "aCd" = ( /obj/structure/bed/stool/chair/office/bridge/pilot{ @@ -156,20 +152,13 @@ /area/ship/militia_ship) "aJd" = ( /obj/machinery/atmospherics/binary/pump/high_power{ - dir = 1; + dir = 1 }, /turf/simulated/floor, /area/ship/militia_ship) "aMB" = ( -/obj/effect/decal/cleanable/dirt, /obj/machinery/blackbox_recorder, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/bluegrid{ - name = "Server Base"; - nitrogen = 500; - oxygen = 0; - temperature = 80 - }, +/turf/simulated/floor/bluegrid/cooled, /area/ship/militia_ship) "aOU" = ( /obj/machinery/light/small{ @@ -566,24 +555,15 @@ /obj/item/modular_computer/console/preset/civilian, /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/cobweb, -/turf/simulated/floor/tiled{ - name = "cooled floor"; - temperature = 278 - }, +/turf/simulated/floor/tiled/cooled, /area/ship/militia_ship) "fVv" = ( /obj/machinery/telecomms/allinone/ship, -/turf/simulated/floor/bluegrid{ - name = "Server Base"; - nitrogen = 500; - oxygen = 0; - temperature = 80 - }, +/turf/simulated/floor/bluegrid/cooled, /area/ship/militia_ship) "fZq" = ( /obj/machinery/door/airlock/security{ name = "Brig"; - req_access = null; dir = 1 }, /turf/simulated/floor/tiled/dark, @@ -647,7 +627,7 @@ /area/ship/militia_ship) "hdb" = ( /obj/machinery/atmospherics/portables_connector{ - dir = 8; + dir = 8 }, /obj/machinery/portable_atmospherics/canister/carbon_dioxide, /turf/simulated/floor, @@ -666,10 +646,7 @@ dir = 8 }, /obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/tiled{ - name = "cooled floor"; - temperature = 278 - }, +/turf/simulated/floor/tiled/cooled, /area/ship/militia_ship) "hiw" = ( /obj/machinery/door/airlock/hatch{ @@ -801,7 +778,6 @@ "iGK" = ( /obj/machinery/door/airlock/glass{ name = "Dinner Hall"; - req_access = null; dir = 4 }, /obj/effect/floor_decal/corner/red/diagonal, @@ -915,7 +891,6 @@ /obj/effect/floor_decal/corner/black/diagonal, /obj/machinery/door/airlock/silver{ name = "Kitchen"; - req_access = null; dir = 4 }, /turf/simulated/floor/tiled/white, @@ -1123,8 +1098,7 @@ /turf/simulated/floor/tiled/white, /area/ship/militia_ship) "ofY" = ( -/obj/machinery/atmospherics/portables_connector{ - }, +/obj/machinery/atmospherics/portables_connector, /obj/machinery/portable_atmospherics/canister/carbon_dioxide, /turf/simulated/floor/shuttle/black, /area/shuttle/militia_shuttle) @@ -1165,9 +1139,7 @@ /turf/simulated/floor/shuttle/dark_blue, /area/ship/militia_ship) "piw" = ( -/obj/structure/closet/secure_closet/kitchen_cabinet/standard{ - req_access = null - }, +/obj/structure/closet/secure_closet/kitchen_cabinet/standard, /obj/item/reagent_containers/food/snacks/meat, /obj/item/reagent_containers/food/snacks/meat, /obj/item/reagent_containers/food/snacks/meat, @@ -1262,7 +1234,6 @@ "qwS" = ( /obj/machinery/door/airlock/security{ name = "Dock"; - req_access = null; dir = 4 }, /turf/simulated/floor/shuttle/dark_blue, @@ -1333,7 +1304,6 @@ "sGi" = ( /obj/machinery/door/airlock/security{ name = "Cockpit"; - req_access = null; dir = 1 }, /turf/simulated/floor/tiled/dark, @@ -1482,7 +1452,6 @@ "vlC" = ( /obj/machinery/door/airlock/security{ name = "Captain's Quarters"; - req_access = null; dir = 1 }, /turf/simulated/floor/carpet/rubber, @@ -1557,10 +1526,7 @@ /obj/machinery/light/small{ dir = 4 }, -/turf/simulated/floor/tiled{ - name = "cooled floor"; - temperature = 278 - }, +/turf/simulated/floor/tiled/cooled, /area/ship/militia_ship) "vRq" = ( /turf/simulated/floor/tiled/dark, @@ -1704,9 +1670,6 @@ /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/tiled/dark, /area/ship/militia_ship) -"xAC" = ( -/turf/simulated/wall/shuttle/space_ship/mercenary, -/area/ship/militia_ship) "xHt" = ( /obj/machinery/atmospherics/unary/vent_pump/high_volume{ dir = 8; @@ -1728,9 +1691,7 @@ /turf/simulated/floor, /area/ship/militia_ship) "xPN" = ( -/obj/machinery/computer/ship/helm{ - req_access = null - }, +/obj/machinery/computer/ship/helm, /turf/simulated/floor/shuttle/black, /area/shuttle/militia_shuttle) "xQS" = ( @@ -32441,8 +32402,8 @@ mxc xzv uNN yjk -xAC -xAC +mhS +mhS aac dTw wLs diff --git a/maps/away/ships/yacht/yacht.dm b/maps/away/ships/yacht/yacht.dm index bdf13bb6cb3..f2cc53f4470 100644 --- a/maps/away/ships/yacht/yacht.dm +++ b/maps/away/ships/yacht/yacht.dm @@ -2,7 +2,10 @@ name = "Yacht" id = "awaysite_yacht" description = "Tiny movable ship with spiders." - suffixes = list("ships/yacht/yacht.dmm") + + prefix = "ships/yacht/" + suffixes = list("yacht.dmm") + spawn_cost = 0.5 spawn_weight = 0.5 sectors = list(SECTOR_ROMANOVICH, SECTOR_TAU_CETI, SECTOR_CORP_ZONE, SECTOR_VALLEY_HALE, SECTOR_BADLANDS, ALL_COALITION_SECTORS, SECTOR_NEW_ANKARA, SECTOR_AEMAQ, SECTOR_SRANDMARR, SECTOR_NRRAHRAHUL, SECTOR_GAKAL, SECTOR_UUEOAESA) diff --git a/maps/away/ships/yacht_civ/yacht_civ_.dm b/maps/away/ships/yacht_civ/yacht_civ_.dm index 45a466a2fb5..5e88f9f2ae8 100644 --- a/maps/away/ships/yacht_civ/yacht_civ_.dm +++ b/maps/away/ships/yacht_civ/yacht_civ_.dm @@ -1,7 +1,10 @@ /datum/map_template/ruin/away_site/yacht_civ name = "Civilian Yacht" description = "Civilian Yacht" - suffixes = list("ships/yacht_civ/yacht_civ.dmm") + + prefix = "ships/yacht_civ/" + suffixes = list("yacht_civ.dmm") + sectors = list(ALL_POSSIBLE_SECTORS) sectors_blacklist = list(ALL_DANGEROUS_SECTORS) spawn_weight = 1 diff --git a/maps/random_ruins/exoplanets/adhomai/adhomai_abadoned_village.dm b/maps/random_ruins/exoplanets/adhomai/adhomai_abadoned_village.dm index be38662d7c1..fc016271557 100644 --- a/maps/random_ruins/exoplanets/adhomai/adhomai_abadoned_village.dm +++ b/maps/random_ruins/exoplanets/adhomai/adhomai_abadoned_village.dm @@ -5,4 +5,6 @@ template_flags = TEMPLATE_FLAG_NO_RUINS|TEMPLATE_FLAG_RUIN_STARTS_DISALLOWED sectors = list(SECTOR_SRANDMARR) - suffixes = list("adhomai/abandoned_village.dmm") + + prefix = "adhomai/" + suffixes = list("abandoned_village.dmm") diff --git a/maps/random_ruins/exoplanets/adhomai/adhomai_abandoned_labor_camp.dm b/maps/random_ruins/exoplanets/adhomai/adhomai_abandoned_labor_camp.dm index 0ed41a49101..383d22c8d76 100644 --- a/maps/random_ruins/exoplanets/adhomai/adhomai_abandoned_labor_camp.dm +++ b/maps/random_ruins/exoplanets/adhomai/adhomai_abandoned_labor_camp.dm @@ -5,4 +5,6 @@ template_flags = TEMPLATE_FLAG_NO_RUINS|TEMPLATE_FLAG_RUIN_STARTS_DISALLOWED sectors = list(SECTOR_SRANDMARR) - suffixes = list("adhomai/adhomai_abandoned_labor_camp.dmm") + + prefix = "adhomai/" + suffixes = list("adhomai_abandoned_labor_camp.dmm") diff --git a/maps/random_ruins/exoplanets/adhomai/adhomai_amohdan.dm b/maps/random_ruins/exoplanets/adhomai/adhomai_amohdan.dm index 0b73f6a61e9..9d8b63e432b 100644 --- a/maps/random_ruins/exoplanets/adhomai/adhomai_amohdan.dm +++ b/maps/random_ruins/exoplanets/adhomai/adhomai_amohdan.dm @@ -7,7 +7,9 @@ spawn_cost = 2 template_flags = TEMPLATE_FLAG_NO_RUINS|TEMPLATE_FLAG_RUIN_STARTS_DISALLOWED sectors = list(SECTOR_SRANDMARR) - suffixes = list("adhomai/adhomai_amohdan.dmm") + + prefix = "adhomai/" + suffixes = list("adhomai_amohdan.dmm") //ghost roles diff --git a/maps/random_ruins/exoplanets/adhomai/adhomai_archeology.dm b/maps/random_ruins/exoplanets/adhomai/adhomai_archeology.dm index 0fbca3c6eb1..322bdfb8ec7 100644 --- a/maps/random_ruins/exoplanets/adhomai/adhomai_archeology.dm +++ b/maps/random_ruins/exoplanets/adhomai/adhomai_archeology.dm @@ -7,7 +7,9 @@ spawn_cost = 2 template_flags = TEMPLATE_FLAG_NO_RUINS|TEMPLATE_FLAG_RUIN_STARTS_DISALLOWED sectors = list(SECTOR_SRANDMARR) - suffixes = list( "adhomai/adhomai_archeology.dmm") + + prefix = "adhomai/" + suffixes = list( "adhomai_archeology.dmm") /area/adhomai_archeology name = "Adhomian Archeology Camp" diff --git a/maps/random_ruins/exoplanets/adhomai/adhomai_bar.dm b/maps/random_ruins/exoplanets/adhomai/adhomai_bar.dm index 07c1285f46c..439a24430ce 100644 --- a/maps/random_ruins/exoplanets/adhomai/adhomai_bar.dm +++ b/maps/random_ruins/exoplanets/adhomai/adhomai_bar.dm @@ -7,7 +7,9 @@ spawn_cost = 2 template_flags = TEMPLATE_FLAG_NO_RUINS|TEMPLATE_FLAG_RUIN_STARTS_DISALLOWED sectors = list(SECTOR_SRANDMARR) - suffixes = list("adhomai/adhomai_bar.dmm") + + prefix = "adhomai/" + suffixes = list("adhomai_bar.dmm") /area/adhomai_bar name = "Adhomian Inn" diff --git a/maps/random_ruins/exoplanets/adhomai/adhomai_battlefield.dm b/maps/random_ruins/exoplanets/adhomai/adhomai_battlefield.dm index c7547d5994c..af14ce6318c 100644 --- a/maps/random_ruins/exoplanets/adhomai/adhomai_battlefield.dm +++ b/maps/random_ruins/exoplanets/adhomai/adhomai_battlefield.dm @@ -5,7 +5,9 @@ template_flags = TEMPLATE_FLAG_NO_RUINS|TEMPLATE_FLAG_RUIN_STARTS_DISALLOWED sectors = list(SECTOR_SRANDMARR) - suffixes = list("adhomai/adhomai_battlefield.dmm") + + prefix = "adhomai/" + suffixes = list("adhomai_battlefield.dmm") /obj/effect/landmark/corpse/pra_soldier name = "PRA Soldier" diff --git a/maps/random_ruins/exoplanets/adhomai/adhomai_cavern.dm b/maps/random_ruins/exoplanets/adhomai/adhomai_cavern.dm index 7e3f91dbe00..4233a6b17db 100644 --- a/maps/random_ruins/exoplanets/adhomai/adhomai_cavern.dm +++ b/maps/random_ruins/exoplanets/adhomai/adhomai_cavern.dm @@ -5,4 +5,6 @@ template_flags = TEMPLATE_FLAG_NO_RUINS|TEMPLATE_FLAG_RUIN_STARTS_DISALLOWED sectors = list(SECTOR_SRANDMARR) - suffixes = list("adhomai/adhomai_cavern.dmm") + + prefix = "adhomai/" + suffixes = list("adhomai_cavern.dmm") diff --git a/maps/random_ruins/exoplanets/adhomai/adhomai_cavern_geist.dm b/maps/random_ruins/exoplanets/adhomai/adhomai_cavern_geist.dm index acd9d288d85..e6a4d47741f 100644 --- a/maps/random_ruins/exoplanets/adhomai/adhomai_cavern_geist.dm +++ b/maps/random_ruins/exoplanets/adhomai/adhomai_cavern_geist.dm @@ -7,7 +7,9 @@ spawn_cost = 2 template_flags = TEMPLATE_FLAG_NO_RUINS|TEMPLATE_FLAG_RUIN_STARTS_DISALLOWED sectors = list(SECTOR_SRANDMARR) - suffixes = list("adhomai/adhomai_cavern_geist.dmm") + + prefix = "adhomai/" + suffixes = list("adhomai_cavern_geist.dmm") //ghost roles diff --git a/maps/random_ruins/exoplanets/adhomai/adhomai_chemical_testing.dm b/maps/random_ruins/exoplanets/adhomai/adhomai_chemical_testing.dm index 8332b41b919..f59a216e851 100644 --- a/maps/random_ruins/exoplanets/adhomai/adhomai_chemical_testing.dm +++ b/maps/random_ruins/exoplanets/adhomai/adhomai_chemical_testing.dm @@ -5,4 +5,6 @@ template_flags = TEMPLATE_FLAG_NO_RUINS|TEMPLATE_FLAG_RUIN_STARTS_DISALLOWED sectors = list(SECTOR_SRANDMARR) - suffixes = list("adhomai/adhomai_chemical_testing.dmm") + + prefix = "adhomai/" + suffixes = list("adhomai_chemical_testing.dmm") diff --git a/maps/random_ruins/exoplanets/adhomai/adhomai_deserter.dm b/maps/random_ruins/exoplanets/adhomai/adhomai_deserter.dm index 7b75623b597..5466264307f 100644 --- a/maps/random_ruins/exoplanets/adhomai/adhomai_deserter.dm +++ b/maps/random_ruins/exoplanets/adhomai/adhomai_deserter.dm @@ -7,7 +7,9 @@ spawn_cost = 2 template_flags = TEMPLATE_FLAG_NO_RUINS|TEMPLATE_FLAG_RUIN_STARTS_DISALLOWED sectors = list(SECTOR_SRANDMARR) - suffixes = list("adhomai/adhomai_deserter.dmm") + + prefix = "adhomai/" + suffixes = list("adhomai_deserter.dmm") //ghost roles diff --git a/maps/random_ruins/exoplanets/adhomai/adhomai_fallout_bunker.dm b/maps/random_ruins/exoplanets/adhomai/adhomai_fallout_bunker.dm index 6eb3559297a..20b35653cf7 100644 --- a/maps/random_ruins/exoplanets/adhomai/adhomai_fallout_bunker.dm +++ b/maps/random_ruins/exoplanets/adhomai/adhomai_fallout_bunker.dm @@ -4,7 +4,9 @@ description = "A fallout bunker built by the People's Republic of Adhomai after the armistice." template_flags = TEMPLATE_FLAG_NO_RUINS|TEMPLATE_FLAG_RUIN_STARTS_DISALLOWED sectors = list(SECTOR_SRANDMARR) - suffixes = list("adhomai/adhomai_fallout_bunker.dmm") + + prefix = "adhomai/" + suffixes = list("adhomai_fallout_bunker.dmm") /area/adhomai_fallout_bunker name = "Fallout Bunker" diff --git a/maps/random_ruins/exoplanets/adhomai/adhomai_hunting.dm b/maps/random_ruins/exoplanets/adhomai/adhomai_hunting.dm index 3d53eb6380e..72161057513 100644 --- a/maps/random_ruins/exoplanets/adhomai/adhomai_hunting.dm +++ b/maps/random_ruins/exoplanets/adhomai/adhomai_hunting.dm @@ -7,7 +7,9 @@ spawn_cost = 2 template_flags = TEMPLATE_FLAG_NO_RUINS|TEMPLATE_FLAG_RUIN_STARTS_DISALLOWED sectors = list(SECTOR_SRANDMARR) - suffixes = list("adhomai/adhomai_hunting.dmm") + + prefix = "adhomai/" + suffixes = list("adhomai_hunting.dmm") /area/adhomai_hunting name = "Adhomai Hunting Lodge" diff --git a/maps/random_ruins/exoplanets/adhomai/adhomai_minefield.dm b/maps/random_ruins/exoplanets/adhomai/adhomai_minefield.dm index 8dce5869c84..645385b97b8 100644 --- a/maps/random_ruins/exoplanets/adhomai/adhomai_minefield.dm +++ b/maps/random_ruins/exoplanets/adhomai/adhomai_minefield.dm @@ -5,7 +5,9 @@ template_flags = TEMPLATE_FLAG_NO_RUINS|TEMPLATE_FLAG_RUIN_STARTS_DISALLOWED sectors = list(SECTOR_SRANDMARR) - suffixes = list("adhomai/adhomai_minefield.dmm") + + prefix = "adhomai/" + suffixes = list("adhomai_minefield.dmm") /obj/structure/adhomai_minefield name = "siik'maas sign" diff --git a/maps/random_ruins/exoplanets/adhomai/adhomai_nuclear_waste.dm b/maps/random_ruins/exoplanets/adhomai/adhomai_nuclear_waste.dm index fba5e188457..036fe714b87 100644 --- a/maps/random_ruins/exoplanets/adhomai/adhomai_nuclear_waste.dm +++ b/maps/random_ruins/exoplanets/adhomai/adhomai_nuclear_waste.dm @@ -5,7 +5,9 @@ template_flags = TEMPLATE_FLAG_NO_RUINS|TEMPLATE_FLAG_RUIN_STARTS_DISALLOWED sectors = list(SECTOR_SRANDMARR) - suffixes = list("adhomai/adhomai_nuclear_waste.dmm") + + prefix = "adhomai/" + suffixes = list("adhomai_nuclear_waste.dmm") /area/adhomai_nuclear_waste name = "Radioactive Waste Disposal Site" diff --git a/maps/random_ruins/exoplanets/adhomai/adhomai_nuclear_waste_makeshift.dm b/maps/random_ruins/exoplanets/adhomai/adhomai_nuclear_waste_makeshift.dm index ff030a0cf6e..fb4cbb78bbd 100644 --- a/maps/random_ruins/exoplanets/adhomai/adhomai_nuclear_waste_makeshift.dm +++ b/maps/random_ruins/exoplanets/adhomai/adhomai_nuclear_waste_makeshift.dm @@ -5,7 +5,9 @@ template_flags = TEMPLATE_FLAG_NO_RUINS|TEMPLATE_FLAG_RUIN_STARTS_DISALLOWED sectors = list(SECTOR_SRANDMARR) - suffixes = list("adhomai/adhomai_nuclear_waste_makeshift.dmm") + + prefix = "adhomai/" + suffixes = list("adhomai_nuclear_waste_makeshift.dmm") /area/adhomai_nuclear_waste_makeshift name = "Makeshift Radioactive Waste Disposal Site" diff --git a/maps/random_ruins/exoplanets/adhomai/adhomai_president_hadii_statue.dm b/maps/random_ruins/exoplanets/adhomai/adhomai_president_hadii_statue.dm index 7243f151611..9273bce7a8f 100644 --- a/maps/random_ruins/exoplanets/adhomai/adhomai_president_hadii_statue.dm +++ b/maps/random_ruins/exoplanets/adhomai/adhomai_president_hadii_statue.dm @@ -5,4 +5,6 @@ template_flags = TEMPLATE_FLAG_NO_RUINS|TEMPLATE_FLAG_RUIN_STARTS_DISALLOWED sectors = list(SECTOR_SRANDMARR) - suffixes = list("adhomai/adhomai_president_hadii_statue.dmm") + + prefix = "adhomai/" + suffixes = list("adhomai_president_hadii_statue.dmm") diff --git a/maps/random_ruins/exoplanets/adhomai/adhomai_president_hadii_statue_toppled.dm b/maps/random_ruins/exoplanets/adhomai/adhomai_president_hadii_statue_toppled.dm index b22e3a7bc90..cbfa1ae06d5 100644 --- a/maps/random_ruins/exoplanets/adhomai/adhomai_president_hadii_statue_toppled.dm +++ b/maps/random_ruins/exoplanets/adhomai/adhomai_president_hadii_statue_toppled.dm @@ -5,4 +5,6 @@ template_flags = TEMPLATE_FLAG_NO_RUINS|TEMPLATE_FLAG_RUIN_STARTS_DISALLOWED sectors = list(SECTOR_SRANDMARR) - suffixes = list("adhomai/adhomai_president_hadii_statue_toppled.dmm") + + prefix = "adhomai/" + suffixes = list("adhomai_president_hadii_statue_toppled.dmm") diff --git a/maps/random_ruins/exoplanets/adhomai/adhomai_rafama_herd.dm b/maps/random_ruins/exoplanets/adhomai/adhomai_rafama_herd.dm index 8077e01b261..2a78e1f35ab 100644 --- a/maps/random_ruins/exoplanets/adhomai/adhomai_rafama_herd.dm +++ b/maps/random_ruins/exoplanets/adhomai/adhomai_rafama_herd.dm @@ -5,4 +5,6 @@ template_flags = TEMPLATE_FLAG_NO_RUINS|TEMPLATE_FLAG_RUIN_STARTS_DISALLOWED sectors = list(SECTOR_SRANDMARR) - suffixes = list("adhomai/adhomai_rafama_herd.dmm") + + prefix = "adhomai/" + suffixes = list("adhomai_rafama_herd.dmm") diff --git a/maps/random_ruins/exoplanets/adhomai/adhomai_raskara_ritual.dm b/maps/random_ruins/exoplanets/adhomai/adhomai_raskara_ritual.dm index f3312fe6840..055c348efc7 100644 --- a/maps/random_ruins/exoplanets/adhomai/adhomai_raskara_ritual.dm +++ b/maps/random_ruins/exoplanets/adhomai/adhomai_raskara_ritual.dm @@ -5,7 +5,9 @@ template_flags = TEMPLATE_FLAG_NO_RUINS|TEMPLATE_FLAG_RUIN_STARTS_DISALLOWED sectors = list(SECTOR_SRANDMARR) - suffixes = list("adhomai/adhomai_raskara_ritual.dmm") + + prefix = "adhomai/" + suffixes = list("adhomai_raskara_ritual.dmm") /area/adhomai_raskara_ritual name = "Adhomian Wilderness" diff --git a/maps/random_ruins/exoplanets/adhomai/adhomai_raskariim_hideout.dm b/maps/random_ruins/exoplanets/adhomai/adhomai_raskariim_hideout.dm index 4653a481f61..7c3ff254bc3 100644 --- a/maps/random_ruins/exoplanets/adhomai/adhomai_raskariim_hideout.dm +++ b/maps/random_ruins/exoplanets/adhomai/adhomai_raskariim_hideout.dm @@ -7,7 +7,9 @@ spawn_cost = 2 template_flags = TEMPLATE_FLAG_NO_RUINS|TEMPLATE_FLAG_RUIN_STARTS_DISALLOWED sectors = list(SECTOR_SRANDMARR) - suffixes = list("adhomai/adhomai_raskariim_hideout.dmm") + + prefix = "adhomai/" + suffixes = list("adhomai_raskariim_hideout.dmm") /area/adhomai_raskariim_hideout name = "Abandoned House" diff --git a/maps/random_ruins/exoplanets/adhomai/adhomai_rredouane_shrine.dm b/maps/random_ruins/exoplanets/adhomai/adhomai_rredouane_shrine.dm index 231aeae27c9..11a44d88d11 100644 --- a/maps/random_ruins/exoplanets/adhomai/adhomai_rredouane_shrine.dm +++ b/maps/random_ruins/exoplanets/adhomai/adhomai_rredouane_shrine.dm @@ -5,4 +5,6 @@ template_flags = TEMPLATE_FLAG_NO_RUINS|TEMPLATE_FLAG_RUIN_STARTS_DISALLOWED sectors = list(SECTOR_SRANDMARR) - suffixes = list("adhomai/adhomai_rredouane_shrine.dmm") + + prefix = "adhomai/" + suffixes = list("adhomai_rredouane_shrine.dmm") diff --git a/maps/random_ruins/exoplanets/adhomai/adhomai_schlorrgo_cage.dm b/maps/random_ruins/exoplanets/adhomai/adhomai_schlorrgo_cage.dm index 863c177e73b..a91ae3f14bf 100644 --- a/maps/random_ruins/exoplanets/adhomai/adhomai_schlorrgo_cage.dm +++ b/maps/random_ruins/exoplanets/adhomai/adhomai_schlorrgo_cage.dm @@ -5,7 +5,9 @@ template_flags = TEMPLATE_FLAG_NO_RUINS|TEMPLATE_FLAG_RUIN_STARTS_DISALLOWED sectors = list(SECTOR_SRANDMARR) - suffixes = list("adhomai/adhomai_schlorrgo_cage.dmm") + + prefix = "adhomai/" + suffixes = list("adhomai_schlorrgo_cage.dmm") /area/adhomai_schlorrgo_cage name = "Adhomian Schlorrgo Testing Site" diff --git a/maps/random_ruins/exoplanets/adhomai/adhomai_silo.dm b/maps/random_ruins/exoplanets/adhomai/adhomai_silo.dm index f1476ea2ca3..75a0b7bca5c 100644 --- a/maps/random_ruins/exoplanets/adhomai/adhomai_silo.dm +++ b/maps/random_ruins/exoplanets/adhomai/adhomai_silo.dm @@ -6,7 +6,9 @@ spawn_cost = 2 template_flags = TEMPLATE_FLAG_NO_RUINS|TEMPLATE_FLAG_RUIN_STARTS_DISALLOWED sectors = list(SECTOR_SRANDMARR) - suffixes = list("adhomai/adhomai_silo.dmm") + + prefix = "adhomai/" + suffixes = list("adhomai_silo.dmm") /area/adhomai_silo name = "Adhomian Missile Silo" diff --git a/maps/random_ruins/exoplanets/adhomai/adhomai_sole_rock_nomad.dm b/maps/random_ruins/exoplanets/adhomai/adhomai_sole_rock_nomad.dm index caf3617f949..2019c636b51 100644 --- a/maps/random_ruins/exoplanets/adhomai/adhomai_sole_rock_nomad.dm +++ b/maps/random_ruins/exoplanets/adhomai/adhomai_sole_rock_nomad.dm @@ -8,7 +8,9 @@ template_flags = TEMPLATE_FLAG_NO_RUINS|TEMPLATE_FLAG_RUIN_STARTS_DISALLOWED sectors = list(SECTOR_SRANDMARR) template_flags = TEMPLATE_FLAG_NO_RUINS|TEMPLATE_FLAG_RUIN_STARTS_DISALLOWED - suffixes = list("adhomai/adhomai_sole_rock_nomad.dmm") + + prefix = "adhomai/" + suffixes = list("adhomai_sole_rock_nomad.dmm") //ghost roles diff --git a/maps/random_ruins/exoplanets/adhomai/adhomai_tunneler_nest.dm b/maps/random_ruins/exoplanets/adhomai/adhomai_tunneler_nest.dm index d8196613527..787c8ffb04d 100644 --- a/maps/random_ruins/exoplanets/adhomai/adhomai_tunneler_nest.dm +++ b/maps/random_ruins/exoplanets/adhomai/adhomai_tunneler_nest.dm @@ -5,7 +5,9 @@ template_flags = TEMPLATE_FLAG_NO_RUINS|TEMPLATE_FLAG_RUIN_STARTS_DISALLOWED sectors = list(SECTOR_SRANDMARR) - suffixes = list("adhomai/adhomai_tunneler_nest.dmm") + + prefix = "adhomai/" + suffixes = list("adhomai_tunneler_nest.dmm") /obj/structure/ice_tunneler_nest diff --git a/maps/random_ruins/exoplanets/adhomai/adhomai_village.dm b/maps/random_ruins/exoplanets/adhomai/adhomai_village.dm index 12d64c249e9..a6b06bd9bd9 100644 --- a/maps/random_ruins/exoplanets/adhomai/adhomai_village.dm +++ b/maps/random_ruins/exoplanets/adhomai/adhomai_village.dm @@ -7,7 +7,9 @@ spawn_cost = 2 template_flags = TEMPLATE_FLAG_NO_RUINS|TEMPLATE_FLAG_RUIN_STARTS_DISALLOWED sectors = list(SECTOR_SRANDMARR) - suffixes = list("adhomai/adhomai_village.dmm") + + prefix = "adhomai/" + suffixes = list("adhomai_village.dmm") /area/adhomai_village name = "Adhomian Village" diff --git a/maps/random_ruins/exoplanets/adhomai/adhomai_war_memorial.dm b/maps/random_ruins/exoplanets/adhomai/adhomai_war_memorial.dm index 1599cbdd1e2..b03fcd0138d 100644 --- a/maps/random_ruins/exoplanets/adhomai/adhomai_war_memorial.dm +++ b/maps/random_ruins/exoplanets/adhomai/adhomai_war_memorial.dm @@ -5,7 +5,9 @@ template_flags = TEMPLATE_FLAG_NO_RUINS|TEMPLATE_FLAG_RUIN_STARTS_DISALLOWED sectors = list(SECTOR_SRANDMARR) - suffixes = list("adhomai/adhomai_war_memorial.dmm") + + prefix = "adhomai/" + suffixes = list("adhomai_war_memorial.dmm") /obj/structure/sign/adhomai_memorial name = "memorial monument" diff --git a/maps/random_ruins/exoplanets/adhomai/ala_base.dm b/maps/random_ruins/exoplanets/adhomai/ala_base.dm index 99e1d0d8d35..ff551c2b023 100644 --- a/maps/random_ruins/exoplanets/adhomai/ala_base.dm +++ b/maps/random_ruins/exoplanets/adhomai/ala_base.dm @@ -7,7 +7,9 @@ spawn_cost = 2 template_flags = TEMPLATE_FLAG_NO_RUINS|TEMPLATE_FLAG_RUIN_STARTS_DISALLOWED sectors = list(SECTOR_SRANDMARR) - suffixes = list("adhomai/ala_base.dmm") + + prefix = "adhomai/" + suffixes = list("ala_base.dmm") /area/ala_base name = "ALA Military Outpost" diff --git a/maps/random_ruins/exoplanets/adhomai/ala_cell.dm b/maps/random_ruins/exoplanets/adhomai/ala_cell.dm index 647dd95b2c2..6e1d7faf011 100644 --- a/maps/random_ruins/exoplanets/adhomai/ala_cell.dm +++ b/maps/random_ruins/exoplanets/adhomai/ala_cell.dm @@ -7,4 +7,6 @@ spawn_cost = 2 template_flags = TEMPLATE_FLAG_NO_RUINS|TEMPLATE_FLAG_RUIN_STARTS_DISALLOWED sectors = list(SECTOR_SRANDMARR) - suffixes = list("adhomai/ala_cell.dmm") + + prefix = "adhomai/" + suffixes = list("ala_cell.dmm") diff --git a/maps/random_ruins/exoplanets/adhomai/nka_base.dm b/maps/random_ruins/exoplanets/adhomai/nka_base.dm index db3197a68f6..735841975ae 100644 --- a/maps/random_ruins/exoplanets/adhomai/nka_base.dm +++ b/maps/random_ruins/exoplanets/adhomai/nka_base.dm @@ -7,7 +7,9 @@ spawn_cost = 2 template_flags = TEMPLATE_FLAG_NO_RUINS|TEMPLATE_FLAG_RUIN_STARTS_DISALLOWED sectors = list(SECTOR_SRANDMARR) - suffixes = list("adhomai/nka_base.dmm") + + prefix = "adhomai/" + suffixes = list("nka_base.dmm") /area/nka_base name = "NKA Military Outpost" diff --git a/maps/random_ruins/exoplanets/adhomai/north_pole_monolith.dm b/maps/random_ruins/exoplanets/adhomai/north_pole_monolith.dm index 1e8734b6e80..aaee477c748 100644 --- a/maps/random_ruins/exoplanets/adhomai/north_pole_monolith.dm +++ b/maps/random_ruins/exoplanets/adhomai/north_pole_monolith.dm @@ -5,4 +5,6 @@ template_flags = TEMPLATE_FLAG_NO_RUINS|TEMPLATE_FLAG_RUIN_STARTS_DISALLOWED sectors = list(SECTOR_SRANDMARR) - suffixes = list("adhomai/north_pole_monolith.dmm") + + prefix = "adhomai/" + suffixes = list("north_pole_monolith.dmm") diff --git a/maps/random_ruins/exoplanets/adhomai/north_pole_nka_expedition.dm b/maps/random_ruins/exoplanets/adhomai/north_pole_nka_expedition.dm index b9ef6d28855..02c3bf7db91 100644 --- a/maps/random_ruins/exoplanets/adhomai/north_pole_nka_expedition.dm +++ b/maps/random_ruins/exoplanets/adhomai/north_pole_nka_expedition.dm @@ -5,7 +5,9 @@ template_flags = TEMPLATE_FLAG_NO_RUINS|TEMPLATE_FLAG_RUIN_STARTS_DISALLOWED sectors = list(SECTOR_SRANDMARR) - suffixes = list("adhomai/north_pole_nka_expedition.dmm") + + prefix = "adhomai/" + suffixes = list("north_pole_nka_expedition.dmm") //ghost roles diff --git a/maps/random_ruins/exoplanets/adhomai/north_pole_worm.dm b/maps/random_ruins/exoplanets/adhomai/north_pole_worm.dm index 0fbd479e0ac..5ae80a00e5a 100644 --- a/maps/random_ruins/exoplanets/adhomai/north_pole_worm.dm +++ b/maps/random_ruins/exoplanets/adhomai/north_pole_worm.dm @@ -5,4 +5,6 @@ template_flags = TEMPLATE_FLAG_NO_RUINS|TEMPLATE_FLAG_RUIN_STARTS_DISALLOWED sectors = list(SECTOR_SRANDMARR) - suffixes = list("adhomai/north_pole_worm.dmm") + + prefix = "adhomai/" + suffixes = list("north_pole_worm.dmm") diff --git a/maps/random_ruins/exoplanets/adhomai/pra_base.dm b/maps/random_ruins/exoplanets/adhomai/pra_base.dm index 15bd597c768..4404b038fc6 100644 --- a/maps/random_ruins/exoplanets/adhomai/pra_base.dm +++ b/maps/random_ruins/exoplanets/adhomai/pra_base.dm @@ -7,7 +7,9 @@ spawn_cost = 2 template_flags = TEMPLATE_FLAG_NO_RUINS|TEMPLATE_FLAG_RUIN_STARTS_DISALLOWED sectors = list(SECTOR_SRANDMARR) - suffixes = list("adhomai/pra_base.dmm") + + prefix = "adhomai/" + suffixes = list("pra_base.dmm") /area/pra_base name = "PRA Military Outpost" diff --git a/maps/random_ruins/exoplanets/adhomai/pra_mining_camp.dm b/maps/random_ruins/exoplanets/adhomai/pra_mining_camp.dm index 0fc93b169b3..048429f88d1 100644 --- a/maps/random_ruins/exoplanets/adhomai/pra_mining_camp.dm +++ b/maps/random_ruins/exoplanets/adhomai/pra_mining_camp.dm @@ -7,7 +7,9 @@ spawn_cost = 2 template_flags = TEMPLATE_FLAG_NO_RUINS|TEMPLATE_FLAG_RUIN_STARTS_DISALLOWED sectors = list(SECTOR_SRANDMARR) - suffixes = list("adhomai/pra_mining_camp.dmm") + + prefix = "adhomai/" + suffixes = list("pra_mining_camp.dmm") /area/pra_mining_camp name = "People's Republic Mining Camp" diff --git a/maps/random_ruins/exoplanets/adhomai/psis_outpost.dm b/maps/random_ruins/exoplanets/adhomai/psis_outpost.dm index 6b480fa30c3..1dc79119196 100644 --- a/maps/random_ruins/exoplanets/adhomai/psis_outpost.dm +++ b/maps/random_ruins/exoplanets/adhomai/psis_outpost.dm @@ -7,7 +7,9 @@ spawn_cost = 2 template_flags = TEMPLATE_FLAG_NO_RUINS|TEMPLATE_FLAG_RUIN_STARTS_DISALLOWED sectors = list(SECTOR_SRANDMARR) - suffixes = list("adhomai/psis_outpost.dmm") + + prefix = "adhomai/" + suffixes = list("psis_outpost.dmm") /area/psis_outpost name = "PSIS Outpost" diff --git a/maps/random_ruins/exoplanets/asteroid/abandoned_prison/abandoned_prison.dm b/maps/random_ruins/exoplanets/asteroid/abandoned_prison/abandoned_prison.dm index f42aa5593c3..b1ef7327584 100644 --- a/maps/random_ruins/exoplanets/asteroid/abandoned_prison/abandoned_prison.dm +++ b/maps/random_ruins/exoplanets/asteroid/abandoned_prison/abandoned_prison.dm @@ -5,7 +5,9 @@ sectors = list(ALL_COALITION_SECTORS) sectors_blacklist = list(SECTOR_HANEUNIM) - suffixes = list("asteroid/abandoned_prison/abandoned_prison.dmm") + + prefix = "asteroid/abandoned_prison/" + suffixes = list("abandoned_prison.dmm") planet_types = PLANET_ASTEROID|PLANET_BARREN ruin_tags = RUIN_AIRLESS|RUIN_LOWPOP diff --git a/maps/random_ruins/exoplanets/asteroid/asteroid.dm b/maps/random_ruins/exoplanets/asteroid/asteroid.dm index d714220e60a..a86823211fa 100644 --- a/maps/random_ruins/exoplanets/asteroid/asteroid.dm +++ b/maps/random_ruins/exoplanets/asteroid/asteroid.dm @@ -4,7 +4,9 @@ description = "An abandoned mining site. Some tools and materials were left behind." sectors = list(SECTOR_TAU_CETI, SECTOR_ROMANOVICH, SECTOR_CORP_ZONE, SECTOR_VALLEY_HALE, SECTOR_BADLANDS, ALL_COALITION_SECTORS) - suffixes = list("asteroid/mining_base/mining_base.dmm") + + prefix = "asteroid/mining_base/" + suffixes = list("mining_base.dmm") planet_types = PLANET_ASTEROID|PLANET_BARREN ruin_tags = RUIN_AIRLESS|RUIN_LOWPOP|RUIN_MINING @@ -15,7 +17,9 @@ description = "A nest of deadly space carps." sectors = list(SECTOR_TAU_CETI, SECTOR_ROMANOVICH, SECTOR_CORP_ZONE, SECTOR_VALLEY_HALE, SECTOR_BADLANDS, ALL_COALITION_SECTORS) - suffixes = list("asteroid/carp_nest/carp_nest.dmm") + + prefix = "asteroid/carp_nest/" + suffixes = list("carp_nest.dmm") planet_types = PLANET_ASTEROID|PLANET_BARREN ruin_tags = RUIN_AIRLESS|RUIN_LOWPOP|RUIN_HOSTILE|RUIN_NATURAL @@ -28,7 +32,9 @@ spawn_weight = 0.5 spawn_cost = 2 sectors = list(SECTOR_TAU_CETI, SECTOR_ROMANOVICH, SECTOR_CORP_ZONE, SECTOR_VALLEY_HALE, SECTOR_BADLANDS, ALL_COALITION_SECTORS) - suffixes = list("asteroid/hideout/hideout.dmm") + + prefix = "asteroid/hideout/" + suffixes = list("hideout.dmm") planet_types = PLANET_ASTEROID|PLANET_BARREN|PLANET_GROVE|PLANET_LAVA|PLANET_DESERT ruin_tags = RUIN_LOWPOP|RUIN_HOSTILE|RUIN_WRECK @@ -39,7 +45,9 @@ description = "A crashed shuttle, with some gear left behind." sectors = list(SECTOR_TAU_CETI, SECTOR_ROMANOVICH, SECTOR_CORP_ZONE, SECTOR_VALLEY_HALE, SECTOR_BADLANDS, ALL_COALITION_SECTORS) - suffixes = list("asteroid/crashed_shuttle/crashed_shuttle_01.dmm") + + prefix = "asteroid/crashed_shuttle/" + suffixes = list("crashed_shuttle_01.dmm") spawn_weight = 0.5 spawn_cost = 2 @@ -55,7 +63,9 @@ spawn_weight = 0.5 spawn_cost = 2 sectors = list(SECTOR_TAU_CETI, SECTOR_ROMANOVICH, SECTOR_CORP_ZONE, SECTOR_VALLEY_HALE, SECTOR_BADLANDS, SECTOR_WEEPING_STARS) - suffixes = list("asteroid/sol_ship/sol_ship_unique.dmm") + + prefix = "asteroid/sol_ship/" + suffixes = list("sol_ship_unique.dmm") planet_types = PLANET_ASTEROID|PLANET_BARREN|PLANET_GROVE|PLANET_LAVA|PLANET_DESERT ruin_tags = RUIN_LOWPOP|RUIN_WRECK @@ -68,7 +78,9 @@ spawn_weight = 0.5 spawn_cost = 3 sectors = list(SECTOR_TAU_CETI, SECTOR_ROMANOVICH, SECTOR_CORP_ZONE, SECTOR_VALLEY_HALE, SECTOR_BADLANDS) - suffixes = list("asteroid/skrell_ship/skrell_crash_unique.dmm") + + prefix = "asteroid/skrell_ship/" + suffixes = list("skrell_crash_unique.dmm") planet_types = PLANET_ASTEROID|PLANET_BARREN|PLANET_GROVE|PLANET_LAVA|PLANET_DESERT ruin_tags = RUIN_LOWPOP|RUIN_WRECK @@ -81,7 +93,9 @@ spawn_weight = 0.5 spawn_cost = 3 sectors = list(SECTOR_TAU_CETI, SECTOR_ROMANOVICH, SECTOR_CORP_ZONE, SECTOR_VALLEY_HALE, SECTOR_BADLANDS, ALL_COALITION_SECTORS) - suffixes = list("asteroid/mystery_ship/mystery_ship_unique.dmm") + + prefix = "asteroid/mystery_ship/" + suffixes = list("mystery_ship_unique.dmm") planet_types = PLANET_ASTEROID|PLANET_BARREN|PLANET_GROVE|PLANET_LAVA|PLANET_DESERT ruin_tags = RUIN_LOWPOP|RUIN_SCIENCE|RUIN_WRECK @@ -92,7 +106,9 @@ description = "A crashed satelite." sectors = list(SECTOR_TAU_CETI, SECTOR_ROMANOVICH, SECTOR_CORP_ZONE, SECTOR_VALLEY_HALE, SECTOR_BADLANDS, SECTOR_NEW_ANKARA, SECTOR_AEMAQ, SECTOR_SRANDMARR, SECTOR_NRRAHRAHUL, SECTOR_GAKAL, SECTOR_UUEOAESA, ALL_COALITION_SECTORS) - suffixes = list("asteroid/satelite_crash/satelite_crash_unique.dmm") + + prefix = "asteroid/satellite_crash/" + suffixes = list("satellite_crash_unique.dmm") planet_types = PLANET_ASTEROID|PLANET_BARREN ruin_tags = RUIN_AIRLESS|RUIN_LOWPOP|RUIN_WRECK|RUIN_HOSTILE @@ -105,7 +121,9 @@ spawn_weight = 1 spawn_cost = 2 sectors = list(SECTOR_TAU_CETI, SECTOR_ROMANOVICH, SECTOR_CORP_ZONE, SECTOR_VALLEY_HALE, SECTOR_BADLANDS, ALL_COALITION_SECTORS) - suffixes = list("asteroid/listening_post/listening_post_unique.dmm") + + prefix = "asteroid/listening_post/" + suffixes = list("listening_post_unique.dmm") planet_types = PLANET_ASTEROID|PLANET_BARREN|PLANET_GROVE|PLANET_LAVA|PLANET_DESERT ruin_tags = RUIN_LOWPOP|RUIN_HOSTILE @@ -118,7 +136,9 @@ spawn_weight = 0.5 spawn_cost = 1 sectors = list(SECTOR_TAU_CETI, SECTOR_ROMANOVICH, SECTOR_CORP_ZONE, SECTOR_VALLEY_HALE, SECTOR_BADLANDS, SECTOR_NEW_ANKARA, SECTOR_AEMAQ, ALL_COALITION_SECTORS) - suffixes = list("asteroid/escape_pod/escape_pod_unique.dmm") + + prefix = "asteroid/escape_pod/" + suffixes = list("escape_pod_unique.dmm") planet_types = PLANET_ASTEROID|PLANET_BARREN ruin_tags = RUIN_AIRLESS|RUIN_LOWPOP|RUIN_WRECK|RUIN_HOSTILE @@ -131,7 +151,9 @@ spawn_weight = 1 spawn_cost = 1 sectors = list(SECTOR_TAU_CETI, SECTOR_ROMANOVICH, SECTOR_CORP_ZONE, SECTOR_VALLEY_HALE, SECTOR_BADLANDS, SECTOR_NEW_ANKARA, SECTOR_AEMAQ, ALL_COALITION_SECTORS) - suffixes = list("asteroid/digsite/digsite_unique.dmm") + + prefix = "asteroid/digsite/" + suffixes = list("digsite_unique.dmm") planet_types = PLANET_ASTEROID|PLANET_BARREN|PLANET_GROVE|PLANET_LAVA|PLANET_DESERT ruin_tags = RUIN_LOWPOP|RUIN_SCIENCE @@ -144,7 +166,9 @@ spawn_weight = 1 spawn_cost = 0.5 sectors = list(SECTOR_TAU_CETI, SECTOR_ROMANOVICH, SECTOR_CORP_ZONE, SECTOR_VALLEY_HALE, SECTOR_BADLANDS, SECTOR_NEW_ANKARA, SECTOR_AEMAQ, ALL_COALITION_SECTORS) - suffixes = list("asteroid/crashed_pod/crashed_pod_unique.dmm") + + prefix = "asteroid/crashed_pod/" + suffixes = list("crashed_pod_unique.dmm") planet_types = PLANET_ASTEROID|PLANET_BARREN ruin_tags = RUIN_AIRLESS|RUIN_LOWPOP|RUIN_WRECK|RUIN_HOSTILE @@ -157,7 +181,9 @@ spawn_weight = 0.5 spawn_cost = 3 sectors = list(SECTOR_TAU_CETI, SECTOR_ROMANOVICH, SECTOR_CORP_ZONE, SECTOR_VALLEY_HALE, SECTOR_BADLANDS, ALL_COALITION_SECTORS) - suffixes = list("asteroid/coc_ship/coc_ship_unique.dmm") + + prefix = "asteroid/coc_ship/" + suffixes = list("coc_ship_unique.dmm") planet_types = PLANET_ASTEROID|PLANET_BARREN|PLANET_GROVE|PLANET_LAVA|PLANET_DESERT ruin_tags = RUIN_LOWPOP|RUIN_WRECK|RUIN_HOSTILE @@ -168,7 +194,9 @@ description = "A long-abandoned mining outpost." sectors = list(SECTOR_TAU_CETI, SECTOR_ROMANOVICH, SECTOR_CORP_ZONE, SECTOR_VALLEY_HALE, SECTOR_BADLANDS, ALL_COALITION_SECTORS) - suffixes = list("asteroid/old_outpost/old_outpost.dmm") + + prefix = "asteroid/old_outpost/" + suffixes = list("old_outpost.dmm") planet_types = PLANET_ASTEROID|PLANET_BARREN|PLANET_GROVE|PLANET_LAVA|PLANET_DESERT ruin_tags = RUIN_LOWPOP|RUIN_MINING diff --git a/maps/random_ruins/exoplanets/asteroid/coalition_base/coalition_base.dm b/maps/random_ruins/exoplanets/asteroid/coalition_base/coalition_base.dm index 8ba4357260d..1a02f94cfde 100644 --- a/maps/random_ruins/exoplanets/asteroid/coalition_base/coalition_base.dm +++ b/maps/random_ruins/exoplanets/asteroid/coalition_base/coalition_base.dm @@ -4,7 +4,9 @@ description = "An abandoned Coalition base." sectors = list(ALL_COALITION_SECTORS) - suffixes = list("asteroid/coalition_base/coalition_base.dmm") + + prefix = "asteroid/coalition_base/" + suffixes = list("coalition_base.dmm") planet_types = PLANET_ASTEROID|PLANET_BARREN ruin_tags = RUIN_AIRLESS|RUIN_LOWPOP diff --git a/maps/random_ruins/exoplanets/asteroid/satellite _crash/satellite_crash_unique.dmm b/maps/random_ruins/exoplanets/asteroid/satellite_crash/satellite_crash_unique.dmm similarity index 100% rename from maps/random_ruins/exoplanets/asteroid/satellite _crash/satellite_crash_unique.dmm rename to maps/random_ruins/exoplanets/asteroid/satellite_crash/satellite_crash_unique.dmm diff --git a/maps/random_ruins/exoplanets/burzsia/burzsia_dead_ipc.dm b/maps/random_ruins/exoplanets/burzsia/burzsia_dead_ipc.dm index 3cee321f1d9..3f8f03f26ea 100644 --- a/maps/random_ruins/exoplanets/burzsia/burzsia_dead_ipc.dm +++ b/maps/random_ruins/exoplanets/burzsia/burzsia_dead_ipc.dm @@ -7,4 +7,6 @@ spawn_cost = 1 template_flags = TEMPLATE_FLAG_NO_RUINS|TEMPLATE_FLAG_RUIN_STARTS_DISALLOWED sectors = list(SECTOR_BURZSIA) - suffixes = list("burzsia/burzsia_dead_ipc.dmm") + + prefix = "burzsia/" + suffixes = list("burzsia_dead_ipc.dmm") diff --git a/maps/random_ruins/exoplanets/burzsia/burzsia_mining.dm b/maps/random_ruins/exoplanets/burzsia/burzsia_mining.dm index dec7e9de0c6..463473d586c 100644 --- a/maps/random_ruins/exoplanets/burzsia/burzsia_mining.dm +++ b/maps/random_ruins/exoplanets/burzsia/burzsia_mining.dm @@ -7,7 +7,9 @@ spawn_cost = 1 template_flags = TEMPLATE_FLAG_NO_RUINS|TEMPLATE_FLAG_RUIN_STARTS_DISALLOWED sectors = list(SECTOR_BURZSIA) - suffixes = list("burzsia/burzsia_mining.dmm") + + prefix = "burzsia/" + suffixes = list("burzsia_mining.dmm") /area/burzsia_mining name = "Hephaestus Burzsia Mining Outpost" diff --git a/maps/random_ruins/exoplanets/crashed_pod/crashed_pod.dm b/maps/random_ruins/exoplanets/crashed_pod/crashed_pod.dm index bc1eb30a243..0d1e519b91a 100644 --- a/maps/random_ruins/exoplanets/crashed_pod/crashed_pod.dm +++ b/maps/random_ruins/exoplanets/crashed_pod/crashed_pod.dm @@ -2,7 +2,10 @@ name = "crashed survival pod" //This map is not very elaborate and is meant to be an example on how to make a ruin. id = "crashed_pod" description = "A crashed survival pod from a destroyed ship." - suffixes = list("crashed_pod/crashed_pod.dmm") + + prefix = "crashed_pod/" + suffixes = list("crashed_pod.dmm") + template_flags = TEMPLATE_FLAG_NO_RUINS | TEMPLATE_FLAG_RUIN_STARTS_DISALLOWED ruin_tags = RUIN_LOWPOP|RUIN_WRECK spawn_weight = 0.33 diff --git a/maps/random_ruins/exoplanets/delivery/delivery_site.dm b/maps/random_ruins/exoplanets/delivery/delivery_site.dm index b6d5f534d4d..5c8f5fb1d06 100644 --- a/maps/random_ruins/exoplanets/delivery/delivery_site.dm +++ b/maps/random_ruins/exoplanets/delivery/delivery_site.dm @@ -12,4 +12,6 @@ sectors = ALL_CORPORATE_SECTORS // available to all exoplanets, no filters ruin_tags = 0 - suffixes = list("delivery/delivery_site.dmm") + + prefix = "delivery/" + suffixes = list("delivery_site.dmm") diff --git a/maps/random_ruins/exoplanets/desert/desert.dm b/maps/random_ruins/exoplanets/desert/desert.dm index 2bd229950dc..dc6fb15929f 100644 --- a/maps/random_ruins/exoplanets/desert/desert.dm +++ b/maps/random_ruins/exoplanets/desert/desert.dm @@ -6,7 +6,9 @@ spawn_weight = 1 spawn_cost = 0.5 sectors = list(SECTOR_TAU_CETI, SECTOR_ROMANOVICH, SECTOR_CORP_ZONE, SECTOR_VALLEY_HALE, SECTOR_BADLANDS) - suffixes = list("desert/desert_oasis/desert_oasis.dmm") + + prefix = "desert/desert_oasis/" + suffixes = list("desert_oasis.dmm") planet_types = PLANET_DESERT ruin_tags = RUIN_NATURAL diff --git a/maps/random_ruins/exoplanets/exoplanet_ruins.dm b/maps/random_ruins/exoplanets/exoplanet_ruins.dm index bf708140b95..49389c64181 100644 --- a/maps/random_ruins/exoplanets/exoplanet_ruins.dm +++ b/maps/random_ruins/exoplanets/exoplanet_ruins.dm @@ -7,3 +7,10 @@ /// See __defines/ruin_tags.dm var/planet_types = ALL_PLANET_TYPES var/ruin_tags = RUIN_ALL_TAGS + +/datum/map_template/ruin/exoplanet/New(list/paths, rename) + + //Apply the prefix to the childs + prefix = "maps/random_ruins/exoplanets/[prefix]" + + ..() diff --git a/maps/random_ruins/exoplanets/grove/grove.dm b/maps/random_ruins/exoplanets/grove/grove.dm index 5d20d3aaa4c..6a1e739cbde 100644 --- a/maps/random_ruins/exoplanets/grove/grove.dm +++ b/maps/random_ruins/exoplanets/grove/grove.dm @@ -2,7 +2,10 @@ name = "hut" id = "hut" description = "A small and simple little research hut." - suffixes = list("grove/hut/hut.dmm") + + prefix = "grove/hut/" + suffixes = list("hut.dmm") + spawn_weight = 1 spawn_cost = 0.5 sectors = list(SECTOR_TAU_CETI, SECTOR_ROMANOVICH, SECTOR_CORP_ZONE, SECTOR_VALLEY_HALE, SECTOR_BADLANDS, ALL_COALITION_SECTORS) @@ -18,7 +21,9 @@ spawn_weight = 3 spawn_cost = 0.5 sectors = list(SECTOR_TAU_CETI, SECTOR_ROMANOVICH, SECTOR_CORP_ZONE, SECTOR_VALLEY_HALE, SECTOR_BADLANDS, ALL_COALITION_SECTORS) - suffixes = list("grove/crashsurvivors/crashsurvivors.dmm") + + prefix = "grove/crashsurvivors/" + suffixes = list("crashsurvivors.dmm") planet_types = PLANET_GROVE ruin_tags = RUIN_LOWPOP|RUIN_WRECK|RUIN_HOSTILE diff --git a/maps/random_ruins/exoplanets/haneunim/haneunim_crash.dm b/maps/random_ruins/exoplanets/haneunim/haneunim_crash.dm index d7751048549..638eaafb3d8 100644 --- a/maps/random_ruins/exoplanets/haneunim/haneunim_crash.dm +++ b/maps/random_ruins/exoplanets/haneunim/haneunim_crash.dm @@ -5,7 +5,10 @@ template_flags = TEMPLATE_FLAG_NO_RUINS|TEMPLATE_FLAG_RUIN_STARTS_DISALLOWED sectors = list(SECTOR_HANEUNIM) - suffixes = list("haneunim/haneunim_crash.dmm") + + prefix = "haneunim/" + suffixes = list("haneunim_crash.dmm") + shuttles_to_initialise = list(/datum/shuttle/autodock/overmap/haneunim_crash) /area/shuttle/haneunim_crash diff --git a/maps/random_ruins/exoplanets/haneunim/haneunim_crash.dmm b/maps/random_ruins/exoplanets/haneunim/haneunim_crash.dmm index eef9129f397..fe67c7c0c1b 100644 --- a/maps/random_ruins/exoplanets/haneunim/haneunim_crash.dmm +++ b/maps/random_ruins/exoplanets/haneunim/haneunim_crash.dmm @@ -125,7 +125,6 @@ /area/shuttle/haneunim_crash) "oL" = ( /obj/machinery/atmospherics/binary/pump{ - dir = 2; name = "pump to waste" }, /turf/simulated/floor/plating, @@ -223,6 +222,10 @@ }, /turf/simulated/floor/plating, /area/shuttle/haneunim_crash) +"uy" = ( +/obj/effect/landmark/entry_point/port, +/turf/simulated/wall/shuttle/raider, +/area/shuttle/haneunim_crash) "uG" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 8 @@ -249,6 +252,10 @@ }, /turf/simulated/floor/plating, /area/shuttle/haneunim_crash) +"xt" = ( +/obj/effect/landmark/entry_point/starboard, +/turf/simulated/wall/shuttle/raider, +/area/shuttle/haneunim_crash) "yc" = ( /obj/effect/floor_decal/corner/paleblue/diagonal, /obj/machinery/alarm/north, @@ -515,6 +522,11 @@ /obj/effect/map_effect/marker_helper/airlock/interior, /turf/simulated/floor/plating, /area/shuttle/haneunim_crash) +"Pt" = ( +/obj/effect/map_effect/window_spawner/full/reinforced/grille/firedoor, +/obj/effect/landmark/entry_point/fore, +/turf/simulated/floor/plating, +/area/shuttle/haneunim_crash) "Pu" = ( /obj/effect/floor_decal/corner/paleblue/diagonal, /obj/machinery/atmospherics/unary/vent_scrubber/on{ @@ -623,6 +635,10 @@ /obj/random/contraband, /turf/simulated/floor/tiled/dark, /area/shuttle/haneunim_crash) +"TT" = ( +/obj/effect/landmark/entry_point/aft, +/turf/simulated/wall/shuttle/raider, +/area/shuttle/haneunim_crash) "Vv" = ( /obj/machinery/atmospherics/pipe/simple/hidden/fuel{ dir = 4 @@ -977,7 +993,7 @@ GY GY Ic Ic -Ic +xt rD rD rD @@ -1167,7 +1183,7 @@ bL VT Ki tF -vw +Pt rD rD rD @@ -1184,7 +1200,7 @@ rD rD rD rD -Ic +TT DO AR DO @@ -1343,7 +1359,7 @@ ZA Ic Ic Ic -Ic +uy Ic Ic Ic diff --git a/maps/random_ruins/exoplanets/haneunim/haneunim_flag.dm b/maps/random_ruins/exoplanets/haneunim/haneunim_flag.dm index 66a269be848..2ff3489852c 100644 --- a/maps/random_ruins/exoplanets/haneunim/haneunim_flag.dm +++ b/maps/random_ruins/exoplanets/haneunim/haneunim_flag.dm @@ -5,4 +5,6 @@ template_flags = TEMPLATE_FLAG_NO_RUINS|TEMPLATE_FLAG_RUIN_STARTS_DISALLOWED sectors = list(SECTOR_HANEUNIM) - suffixes = list("haneunim/haneunim_mystery.dmm") + + prefix = "haneunim/" + suffixes = list("haneunim_mystery.dmm") diff --git a/maps/random_ruins/exoplanets/haneunim/haneunim_mining.dm b/maps/random_ruins/exoplanets/haneunim/haneunim_mining.dm index 3883a560f1e..8b6fe200f26 100644 --- a/maps/random_ruins/exoplanets/haneunim/haneunim_mining.dm +++ b/maps/random_ruins/exoplanets/haneunim/haneunim_mining.dm @@ -5,7 +5,9 @@ template_flags = TEMPLATE_FLAG_NO_RUINS|TEMPLATE_FLAG_RUIN_STARTS_DISALLOWED sectors = list(SECTOR_HANEUNIM) - suffixes = list("haneunim/haneunim_mining.dmm") + + prefix = "haneunim/" + suffixes = list("haneunim_mining.dmm") /area/haneunim_mining name = "Haneunim Mining Outpost" diff --git a/maps/random_ruins/exoplanets/haneunim/haneunim_mystery.dm b/maps/random_ruins/exoplanets/haneunim/haneunim_mystery.dm index 3334d6d63e9..870a49a97dd 100644 --- a/maps/random_ruins/exoplanets/haneunim/haneunim_mystery.dm +++ b/maps/random_ruins/exoplanets/haneunim/haneunim_mystery.dm @@ -5,7 +5,9 @@ template_flags = TEMPLATE_FLAG_NO_RUINS|TEMPLATE_FLAG_RUIN_STARTS_DISALLOWED sectors = list(SECTOR_HANEUNIM) - suffixes = list("haneunim/haneunim_mystery.dmm") + + prefix = "haneunim/" + suffixes = list("haneunim_mystery.dmm") /area/haneunim_mystery name = "Ancient Vessel" diff --git a/maps/random_ruins/exoplanets/haneunim/haneunim_refugees.dm b/maps/random_ruins/exoplanets/haneunim/haneunim_refugees.dm index ddfa74cd5cb..caaafc22c18 100644 --- a/maps/random_ruins/exoplanets/haneunim/haneunim_refugees.dm +++ b/maps/random_ruins/exoplanets/haneunim/haneunim_refugees.dm @@ -5,7 +5,9 @@ template_flags = TEMPLATE_FLAG_NO_RUINS|TEMPLATE_FLAG_RUIN_STARTS_DISALLOWED sectors = list(SECTOR_HANEUNIM) - suffixes = list("haneunim/haneunim_refugees.dmm") + + prefix = "haneunim/" + suffixes = list("haneunim_refugees.dmm") /area/haneunim_refugees name = "Wrecked Shuttle" diff --git a/maps/random_ruins/exoplanets/konyang/abandoned/abandoned_outpost.dm b/maps/random_ruins/exoplanets/konyang/abandoned/abandoned_outpost.dm index 7df73f32cfc..93ce23940d3 100644 --- a/maps/random_ruins/exoplanets/konyang/abandoned/abandoned_outpost.dm +++ b/maps/random_ruins/exoplanets/konyang/abandoned/abandoned_outpost.dm @@ -5,7 +5,10 @@ template_flags = TEMPLATE_FLAG_NO_RUINS|TEMPLATE_FLAG_RUIN_STARTS_DISALLOWED sectors = list(SECTOR_HANEUNIM) - suffixes = list("konyang/abandoned_outpost.dmm") + + prefix = "konyang/abandoned/" + suffixes = list("abandoned_outpost.dmm") + ban_ruins = list(/datum/map_template/ruin/exoplanet/konyang_telecomms_outpost) /obj/effect/landmark/corpse/konyang_army diff --git a/maps/random_ruins/exoplanets/konyang/abandoned/abandoned_outpost.dmm b/maps/random_ruins/exoplanets/konyang/abandoned/abandoned_outpost.dmm index 91da5ad04fd..144603f5ca6 100644 --- a/maps/random_ruins/exoplanets/konyang/abandoned/abandoned_outpost.dmm +++ b/maps/random_ruins/exoplanets/konyang/abandoned/abandoned_outpost.dmm @@ -77,7 +77,7 @@ /obj/structure/bed/stool/chair/office/dark{ dir = 8 }, -/turf/simulated/floor/tiled, +/turf/simulated/floor/exoplanet/tiled, /area/konyang_telecomms_outpost) "dB" = ( /obj/structure/table/wood, @@ -92,7 +92,7 @@ /obj/item/modular_computer/console/preset/civilian{ dir = 8 }, -/turf/simulated/floor/tiled, +/turf/simulated/floor/exoplanet/tiled, /area/konyang_telecomms_outpost) "eE" = ( /obj/structure/sign/flag/konyang/large/south{ @@ -122,7 +122,7 @@ /obj/machinery/light{ icon_state = "tube_empty" }, -/turf/simulated/floor/wood, +/turf/simulated/floor/exoplanet/wood, /area/konyang_telecomms_outpost) "hi" = ( /obj/effect/floor_decal/industrial/warning{ @@ -159,7 +159,7 @@ /turf/simulated/floor/tiled/white, /area/konyang_telecomms_outpost) "iT" = ( -/turf/simulated/floor/lino/diamond, +/turf/simulated/floor/exoplanet/lino/diamond, /area/konyang_telecomms_outpost) "ja" = ( /obj/structure/table/wood, @@ -172,7 +172,7 @@ name = "expensive flatscreen holovision"; pixel_y = 15 }, -/turf/simulated/floor/wood, +/turf/simulated/floor/exoplanet/wood, /area/konyang_telecomms_outpost) "jH" = ( /turf/simulated/floor/bluegrid/cooled, @@ -229,6 +229,9 @@ "lp" = ( /turf/simulated/floor/tiled, /area/konyang_telecomms_outpost) +"lD" = ( +/turf/simulated/floor/exoplanet/tiled, +/area/konyang_telecomms_outpost) "lF" = ( /obj/structure/table/steel, /obj/item/reagent_containers/food/drinks/drinkingglass/newglass/coffeecup/metal/coc{ @@ -238,7 +241,7 @@ /obj/item/ammo_casing/a556/spent, /obj/item/ammo_casing/a556/spent, /obj/item/ammo_casing/a556/spent, -/turf/simulated/floor/tiled, +/turf/simulated/floor/exoplanet/tiled, /area/konyang_telecomms_outpost) "lL" = ( /obj/structure/flora/rock/konyang/water, @@ -250,7 +253,7 @@ "mx" = ( /obj/structure/table/wood, /obj/item/toy/comic/inspector, -/turf/simulated/floor/wood, +/turf/simulated/floor/exoplanet/wood, /area/konyang_telecomms_outpost) "mT" = ( /obj/structure/table/steel, @@ -260,7 +263,7 @@ /obj/machinery/light{ dir = 8 }, -/turf/simulated/floor/tiled, +/turf/simulated/floor/exoplanet/tiled, /area/konyang_telecomms_outpost) "ni" = ( /obj/structure/flora/bush/konyang_reeds, @@ -278,7 +281,7 @@ pixel_x = -8; pixel_y = -4 }, -/turf/simulated/floor/lino/diamond, +/turf/simulated/floor/exoplanet/lino/diamond, /area/konyang_telecomms_outpost) "nt" = ( /obj/effect/decal/fake_object{ @@ -312,7 +315,7 @@ /obj/machinery/light{ dir = 1 }, -/turf/simulated/floor/tiled, +/turf/simulated/floor/exoplanet/tiled, /area/konyang_telecomms_outpost) "oJ" = ( /obj/structure/flora/bush/konyang_reeds, @@ -321,18 +324,21 @@ /obj/item/stack/rods, /turf/simulated/floor/exoplanet/konyang, /area/konyang_telecomms_outpost) +"pc" = ( +/turf/simulated/floor/exoplanet/wood, +/area/konyang_telecomms_outpost) "pf" = ( /obj/machinery/photocopier, /obj/machinery/light{ dir = 4 }, -/turf/simulated/floor/tiled, +/turf/simulated/floor/exoplanet/tiled, /area/konyang_telecomms_outpost) "pG" = ( /obj/structure/bed/stool/chair/sofa/right/brown{ dir = 8 }, -/turf/simulated/floor/wood, +/turf/simulated/floor/exoplanet/wood, /area/konyang_telecomms_outpost) "pT" = ( /obj/item/ammo_casing/a556/spent, @@ -351,7 +357,7 @@ /obj/machinery/computer/ship/sensors{ dir = 4 }, -/turf/simulated/floor/tiled, +/turf/simulated/floor/exoplanet/tiled, /area/konyang_telecomms_outpost) "rm" = ( /obj/effect/decal/road_marking/thin, @@ -372,7 +378,7 @@ /area/konyang_telecomms_outpost) "sA" = ( /obj/machinery/recharge_station, -/turf/simulated/floor/wood, +/turf/simulated/floor/exoplanet/wood, /area/konyang_telecomms_outpost) "sE" = ( /obj/structure/flora/rock/konyang/small, @@ -436,7 +442,7 @@ /obj/item/paper_bin, /obj/item/pen/black, /obj/item/stamp, -/turf/simulated/floor/tiled, +/turf/simulated/floor/exoplanet/tiled, /area/konyang_telecomms_outpost) "uR" = ( /obj/structure/chainlink_fence, @@ -455,7 +461,7 @@ pixel_x = 10; pixel_y = 1 }, -/turf/simulated/floor/tiled, +/turf/simulated/floor/exoplanet/tiled, /area/konyang_telecomms_outpost) "vq" = ( /obj/effect/decal/cleanable/blood/oil, @@ -474,7 +480,7 @@ /obj/machinery/light{ dir = 1 }, -/turf/simulated/floor/tiled, +/turf/simulated/floor/exoplanet/tiled, /area/konyang_telecomms_outpost) "vI" = ( /obj/structure/window/reinforced{ @@ -497,7 +503,7 @@ /obj/item/ammo_casing/a556/spent, /obj/item/ammo_casing/a556/spent, /obj/item/stamp/denied, -/turf/simulated/floor/tiled, +/turf/simulated/floor/exoplanet/tiled, /area/konyang_telecomms_outpost) "xJ" = ( /obj/structure/closet/cabinet, @@ -548,7 +554,7 @@ /area/konyang_telecomms_outpost) "yU" = ( /obj/effect/floor_decal/industrial/warning, -/turf/simulated/floor/tiled, +/turf/simulated/floor/exoplanet/tiled, /area/konyang_telecomms_outpost) "zv" = ( /turf/simulated/wall, @@ -574,7 +580,7 @@ /obj/machinery/light{ icon_state = "tube_empty" }, -/turf/simulated/floor/tiled, +/turf/simulated/floor/exoplanet/tiled, /area/konyang_telecomms_outpost) "zO" = ( /obj/item/ammo_casing/a556/spent, @@ -640,7 +646,7 @@ /area/konyang_telecomms_outpost) "Dd" = ( /obj/machinery/appliance/cooker/stove, -/turf/simulated/floor/lino/diamond, +/turf/simulated/floor/exoplanet/lino/diamond, /area/konyang_telecomms_outpost) "Dm" = ( /obj/effect/decal/fake_object{ @@ -660,7 +666,7 @@ /area/konyang_telecomms_outpost) "Dv" = ( /obj/structure/table/wood, -/turf/simulated/floor/wood, +/turf/simulated/floor/exoplanet/wood, /area/konyang_telecomms_outpost) "Dz" = ( /obj/structure/flora/bush/konyang_reeds, @@ -675,7 +681,7 @@ dir = 8; icon_state = "tube_empty" }, -/turf/simulated/floor/lino/diamond, +/turf/simulated/floor/exoplanet/lino/diamond, /area/konyang_telecomms_outpost) "Ei" = ( /obj/effect/floor_decal/industrial/warning{ @@ -707,7 +713,7 @@ dir = 8; icon_state = "tube_empty" }, -/turf/simulated/floor/lino/diamond, +/turf/simulated/floor/exoplanet/lino/diamond, /area/konyang_telecomms_outpost) "FV" = ( /obj/structure/window/reinforced{ @@ -764,7 +770,7 @@ /obj/machinery/light{ dir = 1 }, -/turf/simulated/floor/lino/diamond, +/turf/simulated/floor/exoplanet/lino/diamond, /area/konyang_telecomms_outpost) "GJ" = ( /obj/structure/bed/stool/chair/sofa/corner/concave/brown{ @@ -773,7 +779,7 @@ /obj/machinery/light{ dir = 4 }, -/turf/simulated/floor/wood, +/turf/simulated/floor/exoplanet/wood, /area/konyang_telecomms_outpost) "GL" = ( /obj/structure/table/steel, @@ -783,7 +789,7 @@ pixel_y = 10; pixel_x = 10 }, -/turf/simulated/floor/tiled, +/turf/simulated/floor/exoplanet/tiled, /area/konyang_telecomms_outpost) "Hv" = ( /obj/structure/flora/bush/konyang_reeds, @@ -820,13 +826,13 @@ /obj/machinery/light{ dir = 4 }, -/turf/simulated/floor/wood, +/turf/simulated/floor/exoplanet/wood, /area/konyang_telecomms_outpost) "Jh" = ( /obj/structure/bed/stool/chair/sofa/left/brown{ dir = 1 }, -/turf/simulated/floor/wood, +/turf/simulated/floor/exoplanet/wood, /area/konyang_telecomms_outpost) "Jl" = ( /obj/structure/table/wood, @@ -834,7 +840,7 @@ pixel_x = -20; pixel_y = -3 }, -/turf/simulated/floor/wood, +/turf/simulated/floor/exoplanet/wood, /area/konyang_telecomms_outpost) "JR" = ( /obj/structure/table/stone/marble, @@ -846,7 +852,7 @@ /obj/machinery/light{ icon_state = "tube_empty" }, -/turf/simulated/floor/lino/diamond, +/turf/simulated/floor/exoplanet/lino/diamond, /area/konyang_telecomms_outpost) "JS" = ( /obj/machinery/door/blast/shutters/open{ @@ -862,7 +868,7 @@ /area/konyang_telecomms_outpost) "Ks" = ( /obj/structure/bed/stool/padded/brown, -/turf/simulated/floor/wood, +/turf/simulated/floor/exoplanet/wood, /area/konyang_telecomms_outpost) "Kw" = ( /obj/machinery/light{ @@ -918,6 +924,12 @@ }, /turf/simulated/floor/tiled/white, /area/konyang_telecomms_outpost) +"Op" = ( +/obj/machinery/light{ + dir = 1 + }, +/turf/simulated/floor/exoplanet/wood, +/area/konyang_telecomms_outpost) "OC" = ( /obj/effect/landmark/corpse/ipc_zombie, /turf/simulated/floor/plating, @@ -977,7 +989,7 @@ pixel_x = 3; pixel_y = 4 }, -/turf/simulated/floor/lino/diamond, +/turf/simulated/floor/exoplanet/lino/diamond, /area/konyang_telecomms_outpost) "RZ" = ( /obj/structure/window/reinforced{ @@ -1039,13 +1051,13 @@ pixel_y = 10; pixel_x = -10 }, -/turf/simulated/floor/tiled, +/turf/simulated/floor/exoplanet/tiled, /area/konyang_telecomms_outpost) "UC" = ( /obj/structure/bed/stool/padded/brown{ dir = 1 }, -/turf/simulated/floor/wood, +/turf/simulated/floor/exoplanet/wood, /area/konyang_telecomms_outpost) "UO" = ( /obj/structure/flora/rock/konyang/small, @@ -1063,7 +1075,7 @@ pixel_x = -9; pixel_y = 1 }, -/turf/simulated/floor/tiled, +/turf/simulated/floor/exoplanet/tiled, /area/konyang_telecomms_outpost) "Wq" = ( /obj/effect/landmark/corpse/ipc_zombie, @@ -1076,7 +1088,7 @@ pixel_x = -4 }, /obj/effect/landmark/corpse/ipc_zombie, -/turf/simulated/floor/lino/diamond, +/turf/simulated/floor/exoplanet/lino/diamond, /area/konyang_telecomms_outpost) "WQ" = ( /obj/structure/table/stone/marble, @@ -1085,7 +1097,7 @@ pixel_y = 7 }, /obj/item/material/kitchen/rollingpin, -/turf/simulated/floor/lino/diamond, +/turf/simulated/floor/exoplanet/lino/diamond, /area/konyang_telecomms_outpost) "Yx" = ( /obj/item/ammo_casing/a556/spent, @@ -1119,7 +1131,7 @@ "Zj" = ( /obj/structure/table/wood, /obj/item/material/ashtray, -/turf/simulated/floor/wood, +/turf/simulated/floor/exoplanet/wood, /area/konyang_telecomms_outpost) "Zo" = ( /obj/effect/decal/road_marking/thin, @@ -1133,7 +1145,7 @@ /area/konyang_telecomms_outpost) "ZV" = ( /obj/machinery/hologram/holopad/long_range, -/turf/simulated/floor/tiled, +/turf/simulated/floor/exoplanet/tiled, /area/konyang_telecomms_outpost) (1,1,1) = {" @@ -1963,8 +1975,8 @@ FA Qc zO un -lp -lp +lD +lD yU EH Rc @@ -2005,8 +2017,8 @@ FA FA dd lp -lp -lp +lD +lD yU EH hi @@ -2150,8 +2162,8 @@ sg bM bM Ns -lp -lp +lD +lD Ns bM sE @@ -2192,8 +2204,8 @@ bM bM bM vC -lp -lp +lD +lD AH bM sg @@ -2450,11 +2462,11 @@ Kw BP BP cB -BP -BP -BP -BP -BP +pc +pc +pc +pc +pc fW bM bM @@ -2496,7 +2508,7 @@ Ks Dv Zj UC -BP +pc uU FA FA @@ -2538,7 +2550,7 @@ Ks Jl mx UC -BP +pc cB FA FA @@ -2576,10 +2588,10 @@ iQ hA zz fW -Kw -BP -BP -BP +Op +pc +pc +pc gw fW bM @@ -2618,9 +2630,9 @@ tu hA mh cB -BP -BP -BP +pc +pc +pc ja Jh fW @@ -2662,7 +2674,7 @@ BS fW IP sA -BP +pc pG GJ fW diff --git a/maps/random_ruins/exoplanets/konyang/abandoned/abandoned_village.dm b/maps/random_ruins/exoplanets/konyang/abandoned/abandoned_village.dm index a8118cd2ae8..21825548595 100644 --- a/maps/random_ruins/exoplanets/konyang/abandoned/abandoned_village.dm +++ b/maps/random_ruins/exoplanets/konyang/abandoned/abandoned_village.dm @@ -5,7 +5,10 @@ template_flags = TEMPLATE_FLAG_NO_RUINS|TEMPLATE_FLAG_RUIN_STARTS_DISALLOWED sectors = list(SECTOR_HANEUNIM) - suffixes = list("konyang/abandoned_village.dmm") + + prefix = "konyang/abandoned/" + suffixes = list("abandoned_village.dmm") + ban_ruins = list(/datum/map_template/ruin/exoplanet/konyang_village) /obj/effect/landmark/corpse/konyang_villager diff --git a/maps/random_ruins/exoplanets/konyang/abandoned/factory_arms.dm b/maps/random_ruins/exoplanets/konyang/abandoned/factory_arms.dm index dbd03dfa1c2..14fd69af343 100644 --- a/maps/random_ruins/exoplanets/konyang/abandoned/factory_arms.dm +++ b/maps/random_ruins/exoplanets/konyang/abandoned/factory_arms.dm @@ -5,7 +5,9 @@ template_flags = TEMPLATE_FLAG_NO_RUINS|TEMPLATE_FLAG_RUIN_STARTS_DISALLOWED sectors = list(SECTOR_HANEUNIM) - suffixes = list("konyang/abandoned/factory_arms.dmm") + + prefix = "konyang/abandoned/" + suffixes = list("factory_arms.dmm") /area/konyang/arms_factory name = "Arms Production Plant" diff --git a/maps/random_ruins/exoplanets/konyang/abandoned/factory_refinery.dm b/maps/random_ruins/exoplanets/konyang/abandoned/factory_refinery.dm index 19b267b03f7..eb39cac0039 100644 --- a/maps/random_ruins/exoplanets/konyang/abandoned/factory_refinery.dm +++ b/maps/random_ruins/exoplanets/konyang/abandoned/factory_refinery.dm @@ -5,7 +5,9 @@ template_flags = TEMPLATE_FLAG_NO_RUINS|TEMPLATE_FLAG_RUIN_STARTS_DISALLOWED sectors = list(SECTOR_HANEUNIM) - suffixes = list("konyang/abandoned/factory_refinery.dmm") + + prefix = "konyang/abandoned/" + suffixes = list("factory_refinery.dmm") /area/konyang/refinery name = "Planetary Material Refinery" diff --git a/maps/random_ruins/exoplanets/konyang/abandoned/factory_robotics.dm b/maps/random_ruins/exoplanets/konyang/abandoned/factory_robotics.dm index a9b3a4153d6..d70996e9efc 100644 --- a/maps/random_ruins/exoplanets/konyang/abandoned/factory_robotics.dm +++ b/maps/random_ruins/exoplanets/konyang/abandoned/factory_robotics.dm @@ -5,7 +5,9 @@ template_flags = TEMPLATE_FLAG_NO_RUINS|TEMPLATE_FLAG_RUIN_STARTS_DISALLOWED sectors = list(SECTOR_HANEUNIM) - suffixes = list("konyang/abandoned/factory_robotics.dmm") + + prefix = "konyang/abandoned/" + suffixes = list("factory_robotics.dmm") /area/konyang/robotics_factory name = "Robotics Assembly Plant" diff --git a/maps/random_ruins/exoplanets/konyang/abandoned/garage.dm b/maps/random_ruins/exoplanets/konyang/abandoned/garage.dm index fea18c7b578..0bbce76f793 100644 --- a/maps/random_ruins/exoplanets/konyang/abandoned/garage.dm +++ b/maps/random_ruins/exoplanets/konyang/abandoned/garage.dm @@ -5,7 +5,9 @@ template_flags = TEMPLATE_FLAG_NO_RUINS|TEMPLATE_FLAG_RUIN_STARTS_DISALLOWED sectors = list(SECTOR_HANEUNIM) - suffixes = list("konyang/abandoned/garage.dmm") + + prefix = "konyang/abandoned/" + suffixes = list("garage.dmm") /area/konyang/garage name = "Konyang Garage" diff --git a/maps/random_ruins/exoplanets/konyang/abandoned/house _small.dm b/maps/random_ruins/exoplanets/konyang/abandoned/house _small.dm index 635d6747625..b75070a1687 100644 --- a/maps/random_ruins/exoplanets/konyang/abandoned/house _small.dm +++ b/maps/random_ruins/exoplanets/konyang/abandoned/house _small.dm @@ -5,7 +5,9 @@ template_flags = TEMPLATE_FLAG_NO_RUINS|TEMPLATE_FLAG_RUIN_STARTS_DISALLOWED sectors = list(SECTOR_HANEUNIM) - suffixes = list("konyang/abandoned/house_small.dmm") + + prefix = "konyang/abandoned/" + suffixes = list("house_small.dmm") /area/konyang/house_small name = "Konyang Residence" diff --git a/maps/random_ruins/exoplanets/konyang/abandoned/landing_zone.dm b/maps/random_ruins/exoplanets/konyang/abandoned/landing_zone.dm index 295f42d68ae..9864ef07615 100644 --- a/maps/random_ruins/exoplanets/konyang/abandoned/landing_zone.dm +++ b/maps/random_ruins/exoplanets/konyang/abandoned/landing_zone.dm @@ -6,7 +6,9 @@ template_flags = TEMPLATE_FLAG_NO_RUINS|TEMPLATE_FLAG_RUIN_STARTS_DISALLOWED|TEMPLATE_FLAG_SPAWN_GUARANTEED sectors = list(SECTOR_HANEUNIM) - suffixes = list("konyang/abandoned/landing_zone.dmm") + + prefix = "konyang/abandoned/" + suffixes = list("landing_zone.dmm") /area/konyang_landing_zone/command_center_abandoned//Need to differentiate from the normal landing zone area, otherwise this messes stuff up name = "SCC Expedition Command Center" diff --git a/maps/random_ruins/exoplanets/konyang/abandoned/office.dm b/maps/random_ruins/exoplanets/konyang/abandoned/office.dm index b45021a0ace..9a330b8b707 100644 --- a/maps/random_ruins/exoplanets/konyang/abandoned/office.dm +++ b/maps/random_ruins/exoplanets/konyang/abandoned/office.dm @@ -5,7 +5,9 @@ template_flags = TEMPLATE_FLAG_NO_RUINS|TEMPLATE_FLAG_RUIN_STARTS_DISALLOWED sectors = list(SECTOR_HANEUNIM) - suffixes = list("konyang/abandoned/office.dmm") + + prefix = "konyang/abandoned/" + suffixes = list("office.dmm") /area/konyang/office name = "Konyang Office" diff --git a/maps/random_ruins/exoplanets/konyang/abandoned/rural_clinic.dm b/maps/random_ruins/exoplanets/konyang/abandoned/rural_clinic.dm index dc6f4a8b2e8..fefe760e172 100644 --- a/maps/random_ruins/exoplanets/konyang/abandoned/rural_clinic.dm +++ b/maps/random_ruins/exoplanets/konyang/abandoned/rural_clinic.dm @@ -5,7 +5,9 @@ template_flags = TEMPLATE_FLAG_NO_RUINS|TEMPLATE_FLAG_RUIN_STARTS_DISALLOWED sectors = list(SECTOR_HANEUNIM) - suffixes = list("konyang/abandoned/rural_clinic.dmm") + + prefix = "konyang/abandoned/" + suffixes = list("rural_clinic.dmm") /area/konyang/rural_clinic name = "Konyang Rural Clinic" diff --git a/maps/random_ruins/exoplanets/konyang/fireoutpost.dm b/maps/random_ruins/exoplanets/konyang/fireoutpost.dm index 8edcbc544fb..11999e5b0a3 100644 --- a/maps/random_ruins/exoplanets/konyang/fireoutpost.dm +++ b/maps/random_ruins/exoplanets/konyang/fireoutpost.dm @@ -5,7 +5,9 @@ template_flags = TEMPLATE_FLAG_NO_RUINS|TEMPLATE_FLAG_RUIN_STARTS_DISALLOWED sectors = list(SECTOR_HANEUNIM) - suffixes = list("konyang/fireoutpost.dmm") + + prefix = "konyang/" + suffixes = list("fireoutpost.dmm") /area/konyang_fireoutpost name = "Konyang Firewatch Post" diff --git a/maps/random_ruins/exoplanets/konyang/hivebot_burrows_1.dm b/maps/random_ruins/exoplanets/konyang/hivebot_burrows_1.dm index 256d7d49292..5eed0221664 100644 --- a/maps/random_ruins/exoplanets/konyang/hivebot_burrows_1.dm +++ b/maps/random_ruins/exoplanets/konyang/hivebot_burrows_1.dm @@ -5,7 +5,9 @@ template_flags = TEMPLATE_FLAG_NO_RUINS|TEMPLATE_FLAG_RUIN_STARTS_DISALLOWED sectors = list(SECTOR_HANEUNIM) - suffixes = list("konyang/hivebot_burrows_1.dmm") + + prefix = "konyang/" + suffixes = list("hivebot_burrows_1.dmm") ban_ruins = list(/datum/map_template/ruin/exoplanet/hivebot_burrows_2) diff --git a/maps/random_ruins/exoplanets/konyang/hivebot_burrows_2.dm b/maps/random_ruins/exoplanets/konyang/hivebot_burrows_2.dm index a9b5c6f9169..8c3c9d2da41 100644 --- a/maps/random_ruins/exoplanets/konyang/hivebot_burrows_2.dm +++ b/maps/random_ruins/exoplanets/konyang/hivebot_burrows_2.dm @@ -5,7 +5,9 @@ template_flags = TEMPLATE_FLAG_NO_RUINS|TEMPLATE_FLAG_RUIN_STARTS_DISALLOWED sectors = list(SECTOR_HANEUNIM) - suffixes = list("konyang/hivebot_burrows_2.dmm") + + prefix = "konyang/" + suffixes = list("hivebot_burrows_2.dmm") ban_ruins = list(/datum/map_template/ruin/exoplanet/hivebot_burrows_1) diff --git a/maps/random_ruins/exoplanets/konyang/homestead.dm b/maps/random_ruins/exoplanets/konyang/homestead.dm index 5583123ce23..f2035ac97ee 100644 --- a/maps/random_ruins/exoplanets/konyang/homestead.dm +++ b/maps/random_ruins/exoplanets/konyang/homestead.dm @@ -5,7 +5,9 @@ template_flags = TEMPLATE_FLAG_NO_RUINS|TEMPLATE_FLAG_RUIN_STARTS_DISALLOWED sectors = list(SECTOR_HANEUNIM) - suffixes = list("konyang/homestead.dmm") + + prefix = "konyang/" + suffixes = list("homestead.dmm") /area/konyang_homestead name = "Konyang Homestead" diff --git a/maps/random_ruins/exoplanets/konyang/jeweler_nest.dm b/maps/random_ruins/exoplanets/konyang/jeweler_nest.dm index f5e991fd905..5378c6d1043 100644 --- a/maps/random_ruins/exoplanets/konyang/jeweler_nest.dm +++ b/maps/random_ruins/exoplanets/konyang/jeweler_nest.dm @@ -5,4 +5,6 @@ template_flags = TEMPLATE_FLAG_NO_RUINS|TEMPLATE_FLAG_RUIN_STARTS_DISALLOWED sectors = list(SECTOR_HANEUNIM) - suffixes = list("konyang/jeweler_nest.dmm") + + prefix = "konyang/" + suffixes = list("jeweler_nest.dmm") diff --git a/maps/random_ruins/exoplanets/konyang/landing_zone.dm b/maps/random_ruins/exoplanets/konyang/landing_zone.dm index 0d1c2a91786..517f204bfd0 100644 --- a/maps/random_ruins/exoplanets/konyang/landing_zone.dm +++ b/maps/random_ruins/exoplanets/konyang/landing_zone.dm @@ -5,7 +5,9 @@ template_flags = TEMPLATE_FLAG_NO_RUINS|TEMPLATE_FLAG_RUIN_STARTS_DISALLOWED|TEMPLATE_FLAG_SPAWN_GUARANTEED sectors = list(SECTOR_HANEUNIM) - suffixes = list("konyang/landing_zone.dmm") + + prefix = "konyang/" + suffixes = list("landing_zone.dmm") /area/konyang_landing_zone name = "SCC Expedition Command Center" diff --git a/maps/random_ruins/exoplanets/konyang/pirate_moonshine.dm b/maps/random_ruins/exoplanets/konyang/pirate_moonshine.dm index c7ebb58c7fe..4489103d1ee 100644 --- a/maps/random_ruins/exoplanets/konyang/pirate_moonshine.dm +++ b/maps/random_ruins/exoplanets/konyang/pirate_moonshine.dm @@ -7,7 +7,9 @@ template_flags = TEMPLATE_FLAG_NO_RUINS|TEMPLATE_FLAG_RUIN_STARTS_DISALLOWED sectors = list(SECTOR_HANEUNIM) - suffixes = list("konyang/pirate_moonshine.dmm") + + prefix = "konyang/" + suffixes = list("pirate_moonshine.dmm") /area/konyang_pirate_moonshine diff --git a/maps/random_ruins/exoplanets/konyang/pirate_outpost.dm b/maps/random_ruins/exoplanets/konyang/pirate_outpost.dm index 2811d080ea6..db1e77745b2 100644 --- a/maps/random_ruins/exoplanets/konyang/pirate_outpost.dm +++ b/maps/random_ruins/exoplanets/konyang/pirate_outpost.dm @@ -7,7 +7,9 @@ template_flags = TEMPLATE_FLAG_NO_RUINS|TEMPLATE_FLAG_RUIN_STARTS_DISALLOWED sectors = list(SECTOR_HANEUNIM) - suffixes = list("konyang/pirate_outpost.dmm") + + prefix = "konyang/" + suffixes = list("pirate_outpost.dmm") shuttles_to_initialise = list(/datum/shuttle/autodock/overmap/konyang_pirate) diff --git a/maps/random_ruins/exoplanets/konyang/pirate_outpost.dmm b/maps/random_ruins/exoplanets/konyang/pirate_outpost.dmm index eb9e16ff3f3..9e2551d87e6 100644 --- a/maps/random_ruins/exoplanets/konyang/pirate_outpost.dmm +++ b/maps/random_ruins/exoplanets/konyang/pirate_outpost.dmm @@ -27,6 +27,15 @@ }, /turf/simulated/floor/wood, /area/konyang_pirate_outpost) +"cF" = ( +/obj/effect/map_effect/window_spawner/full/reinforced/grille/firedoor, +/obj/effect/landmark/entry_point/fore, +/turf/simulated/floor/plating, +/area/shuttle/konyang_pirate) +"cG" = ( +/obj/effect/landmark/entry_point/starboard, +/turf/simulated/wall/shuttle/raider, +/area/shuttle/konyang_pirate) "cN" = ( /obj/structure/bed/chair, /obj/item/bedsheet/random, @@ -122,6 +131,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/red{ dir = 8 }, +/obj/effect/landmark/entry_point/aft, /turf/simulated/wall/shuttle/raider, /area/shuttle/konyang_pirate) "gB" = ( @@ -463,6 +473,10 @@ /obj/machinery/computer/ship/sensors, /turf/simulated/floor/tiled/rust, /area/shuttle/konyang_pirate) +"yq" = ( +/obj/effect/landmark/entry_point/port, +/turf/simulated/wall/shuttle/raider, +/area/shuttle/konyang_pirate) "yQ" = ( /obj/random/dirt_75, /obj/machinery/door/urban, @@ -520,6 +534,11 @@ }, /turf/simulated/floor/tiled/rust, /area/shuttle/konyang_pirate) +"Df" = ( +/obj/structure/flora/bush/konyang_reeds, +/obj/effect/landmark/entry_point/north, +/turf/simulated/floor/exoplanet/konyang, +/area/konyang_pirate_outpost) "Dw" = ( /obj/structure/flora/tree/konyang/spring, /obj/structure/flora/bush/konyang_reeds, @@ -926,6 +945,10 @@ /obj/machinery/light, /turf/simulated/floor/wood, /area/konyang_pirate_outpost) +"Ya" = ( +/obj/structure/flora/bush/konyang_reeds, +/turf/simulated/floor/exoplanet/tiled, +/area/konyang_pirate_outpost) "YF" = ( /obj/machinery/computer/ship/engines, /turf/simulated/floor/tiled/rust, @@ -1328,7 +1351,7 @@ AV xe xe Dw -tZ +Ya tZ UF UF @@ -1477,7 +1500,7 @@ tZ tZ tZ xe -tZ +Df tZ Dw xe @@ -1541,7 +1564,7 @@ FO TH Ex oL -oL +cG oL oL wK @@ -1704,7 +1727,7 @@ Ik dL zY qM -aD +cF wK wK tZ @@ -1852,7 +1875,7 @@ kF oL oL oL -oL +yq oL oL oL diff --git a/maps/random_ruins/exoplanets/konyang/stranded_police.dm b/maps/random_ruins/exoplanets/konyang/stranded_police.dm index 1244edbcd39..ce4295a0d0f 100644 --- a/maps/random_ruins/exoplanets/konyang/stranded_police.dm +++ b/maps/random_ruins/exoplanets/konyang/stranded_police.dm @@ -5,7 +5,9 @@ template_flags = TEMPLATE_FLAG_NO_RUINS|TEMPLATE_FLAG_RUIN_STARTS_DISALLOWED sectors = list(SECTOR_HANEUNIM) - suffixes = list("konyang/stranded_police.dmm") + + prefix = "konyang/" + suffixes = list("stranded_police.dmm") /datum/ghostspawner/human/konyang_lostcop short_name = "konyang_lostcop" diff --git a/maps/random_ruins/exoplanets/konyang/swamp_1.dm b/maps/random_ruins/exoplanets/konyang/swamp_1.dm index c000cd78e81..41f5cb5d83f 100644 --- a/maps/random_ruins/exoplanets/konyang/swamp_1.dm +++ b/maps/random_ruins/exoplanets/konyang/swamp_1.dm @@ -5,4 +5,6 @@ template_flags = TEMPLATE_FLAG_NO_RUINS|TEMPLATE_FLAG_RUIN_STARTS_DISALLOWED sectors = list(SECTOR_HANEUNIM) - suffixes = list("konyang/swamp_1.dmm") + + prefix = "konyang/" + suffixes = list("swamp_1.dmm") diff --git a/maps/random_ruins/exoplanets/konyang/swamp_2.dm b/maps/random_ruins/exoplanets/konyang/swamp_2.dm index a2b3447cd6a..189c0cde609 100644 --- a/maps/random_ruins/exoplanets/konyang/swamp_2.dm +++ b/maps/random_ruins/exoplanets/konyang/swamp_2.dm @@ -5,4 +5,6 @@ template_flags = TEMPLATE_FLAG_NO_RUINS|TEMPLATE_FLAG_RUIN_STARTS_DISALLOWED sectors = list(SECTOR_HANEUNIM) - suffixes = list("konyang/swamp_2.dmm") + + prefix = "konyang/" + suffixes = list("swamp_2.dmm") diff --git a/maps/random_ruins/exoplanets/konyang/swamp_3.dm b/maps/random_ruins/exoplanets/konyang/swamp_3.dm index 8687dee1b50..d0b5dba7f33 100644 --- a/maps/random_ruins/exoplanets/konyang/swamp_3.dm +++ b/maps/random_ruins/exoplanets/konyang/swamp_3.dm @@ -5,4 +5,6 @@ template_flags = TEMPLATE_FLAG_NO_RUINS|TEMPLATE_FLAG_RUIN_STARTS_DISALLOWED sectors = list(SECTOR_HANEUNIM) - suffixes = list("konyang/swamp_3.dmm") + + prefix = "konyang/" + suffixes = list("swamp_3.dmm") diff --git a/maps/random_ruins/exoplanets/konyang/swamp_4.dm b/maps/random_ruins/exoplanets/konyang/swamp_4.dm index 520c2a21970..8d813b20948 100644 --- a/maps/random_ruins/exoplanets/konyang/swamp_4.dm +++ b/maps/random_ruins/exoplanets/konyang/swamp_4.dm @@ -5,7 +5,9 @@ template_flags = TEMPLATE_FLAG_NO_RUINS|TEMPLATE_FLAG_RUIN_STARTS_DISALLOWED sectors = list(SECTOR_HANEUNIM) - suffixes = list("konyang/swamp_4.dmm") + + prefix = "konyang/" + suffixes = list("swamp_4.dmm") /area/konyang_swamp_4 name = "Swamp Grill" diff --git a/maps/random_ruins/exoplanets/konyang/telecomms_outpost.dm b/maps/random_ruins/exoplanets/konyang/telecomms_outpost.dm index 70a6bd0597d..c460d49f5c8 100644 --- a/maps/random_ruins/exoplanets/konyang/telecomms_outpost.dm +++ b/maps/random_ruins/exoplanets/konyang/telecomms_outpost.dm @@ -7,7 +7,10 @@ template_flags = TEMPLATE_FLAG_NO_RUINS|TEMPLATE_FLAG_RUIN_STARTS_DISALLOWED sectors = list(SECTOR_HANEUNIM) - suffixes = list("konyang/telecomms_outpost.dmm") + + prefix = "konyang/" + suffixes = list("telecomms_outpost.dmm") + ban_ruins = list(/datum/map_template/ruin/exoplanet/konyang_abandoned_outpost) /area/konyang_telecomms_outpost diff --git a/maps/random_ruins/exoplanets/konyang/tribute.dm b/maps/random_ruins/exoplanets/konyang/tribute.dm index a9aadead165..e8d991f5555 100644 --- a/maps/random_ruins/exoplanets/konyang/tribute.dm +++ b/maps/random_ruins/exoplanets/konyang/tribute.dm @@ -5,4 +5,6 @@ template_flags = TEMPLATE_FLAG_NO_RUINS|TEMPLATE_FLAG_RUIN_STARTS_DISALLOWED sectors = list(SECTOR_HANEUNIM) - suffixes = list("konyang/tribute.dmm") + + prefix = "konyang/" + suffixes = list("tribute.dmm") diff --git a/maps/random_ruins/exoplanets/konyang/village.dm b/maps/random_ruins/exoplanets/konyang/village.dm index 318efcf8cb2..cecb88ff2d7 100644 --- a/maps/random_ruins/exoplanets/konyang/village.dm +++ b/maps/random_ruins/exoplanets/konyang/village.dm @@ -7,7 +7,10 @@ template_flags = TEMPLATE_FLAG_NO_RUINS|TEMPLATE_FLAG_RUIN_STARTS_DISALLOWED sectors = list(SECTOR_HANEUNIM) - suffixes = list("konyang/village.dmm") + + prefix = "konyang/" + suffixes = list("village.dmm") + ban_ruins = list(/datum/map_template/ruin/exoplanet/konyang_abandoned_village) /area/konyang_village diff --git a/maps/random_ruins/exoplanets/lava/lava.dm b/maps/random_ruins/exoplanets/lava/lava.dm index dd6acd7a1ea..6be3310c92b 100644 --- a/maps/random_ruins/exoplanets/lava/lava.dm +++ b/maps/random_ruins/exoplanets/lava/lava.dm @@ -2,7 +2,10 @@ name = "drill site" id = "drill_site" description = "A small, abandoned mining drill operation." - suffixes = list("lava/drill_site/drill_site.dmm") + + prefix = "lava/drill_site/" + suffixes = list("drill_site.dmm") + spawn_weight = 1 spawn_cost = 0.5 sectors = list(SECTOR_TAU_CETI, SECTOR_ROMANOVICH, SECTOR_CORP_ZONE, SECTOR_VALLEY_HALE, SECTOR_BADLANDS, ALL_COALITION_SECTORS) diff --git a/maps/random_ruins/exoplanets/raskara/pra_exploration_drone.dm b/maps/random_ruins/exoplanets/raskara/pra_exploration_drone.dm index da000982277..15b6840793e 100644 --- a/maps/random_ruins/exoplanets/raskara/pra_exploration_drone.dm +++ b/maps/random_ruins/exoplanets/raskara/pra_exploration_drone.dm @@ -5,4 +5,6 @@ template_flags = TEMPLATE_FLAG_NO_RUINS|TEMPLATE_FLAG_RUIN_STARTS_DISALLOWED sectors = list(SECTOR_SRANDMARR) - suffixes = list("raskara/pra_exploration_drone.dmm") + + prefix = "raskara/" + suffixes = list("pra_exploration_drone.dmm") diff --git a/maps/random_ruins/exoplanets/raskara/raskara_okon.dm b/maps/random_ruins/exoplanets/raskara/raskara_okon.dm index b40879adc28..e884b3bfbf7 100644 --- a/maps/random_ruins/exoplanets/raskara/raskara_okon.dm +++ b/maps/random_ruins/exoplanets/raskara/raskara_okon.dm @@ -5,7 +5,9 @@ template_flags = TEMPLATE_FLAG_NO_RUINS|TEMPLATE_FLAG_RUIN_STARTS_DISALLOWED sectors = list(SECTOR_SRANDMARR) - suffixes = list("raskara/raskara_okon.dmm") + + prefix = "raskara/" + suffixes = list("raskara_okon.dmm") /area/raskara_okon name = "Okon 011" diff --git a/maps/random_ruins/exoplanets/raskara/raskara_ritual.dm b/maps/random_ruins/exoplanets/raskara/raskara_ritual.dm index 8b0c0120e3a..1754805c25b 100644 --- a/maps/random_ruins/exoplanets/raskara/raskara_ritual.dm +++ b/maps/random_ruins/exoplanets/raskara/raskara_ritual.dm @@ -5,4 +5,6 @@ template_flags = TEMPLATE_FLAG_NO_RUINS|TEMPLATE_FLAG_RUIN_STARTS_DISALLOWED sectors = list(SECTOR_SRANDMARR) - suffixes = list("raskara/raskara_ritual.dmm") + + prefix = "raskara/" + suffixes = list("raskara_ritual.dmm") diff --git a/maps/random_ruins/exoplanets/raskara/raskara_wreck.dm b/maps/random_ruins/exoplanets/raskara/raskara_wreck.dm index d7a52c6a73d..5046d8a3386 100644 --- a/maps/random_ruins/exoplanets/raskara/raskara_wreck.dm +++ b/maps/random_ruins/exoplanets/raskara/raskara_wreck.dm @@ -5,4 +5,6 @@ template_flags = TEMPLATE_FLAG_NO_RUINS|TEMPLATE_FLAG_RUIN_STARTS_DISALLOWED sectors = list(SECTOR_SRANDMARR) - suffixes = list("raskara/raskara_wreck.dmm") + + prefix = "raskara/" + suffixes = list("raskara_wreck.dmm") From 610d3daa444e83866fbb5cca4cb1f7bedf23ab5c Mon Sep 17 00:00:00 2001 From: CometBlaze <59415394+CometBlaze@users.noreply.github.com> Date: Fri, 12 Apr 2024 23:21:43 +0100 Subject: [PATCH 4/7] Baseline Marking Fixes (#18907) Fixes some of the issues described in #18876, namely: - Hoplan using the wrong markings and having the option to add lights - Markings not applying to the hands when selecting the "Primary Color" option - Torso and arm markings not being selectable - Markings being lighter than the selected colour Additionally, makes it so the "Primary Color" option doesn't add a head marking to avoid applying the default TV head marking to the alternative heads. --- .../abstract/new_player/sprite_accessories.dm | 22 ++++++++++-------- html/changelogs/CometBlaze-baseline_stuff.yml | 10 ++++++++ icons/mob/human_races/markings_baseline.dmi | Bin 1751 -> 1780 bytes 3 files changed, 22 insertions(+), 10 deletions(-) create mode 100644 html/changelogs/CometBlaze-baseline_stuff.yml diff --git a/code/modules/mob/abstract/new_player/sprite_accessories.dm b/code/modules/mob/abstract/new_player/sprite_accessories.dm index 090ca5f9889..02c88d277fe 100644 --- a/code/modules/mob/abstract/new_player/sprite_accessories.dm +++ b/code/modules/mob/abstract/new_player/sprite_accessories.dm @@ -6189,6 +6189,7 @@ Follow by example and make good judgement based on length which list to include name = "Baseline - Raxus Primary Colors" icon = 'icons/mob/human_races/markings_baseline.dmi' icon_state = "raxus_primary" + icon_blend_mode = ICON_MULTIPLY is_painted = TRUE body_parts = list(BP_HEAD) robotize_type_required = list(PROSTHETIC_RAXUS) @@ -6208,32 +6209,33 @@ Follow by example and make good judgement based on length which list to include /datum/sprite_accessory/marking/baseline_head/hoplan name = "Baseline - Hoplan Primary Colors" - icon_state = "indricus_primary" + icon_state = "hoplan_primary" robotize_type_required = list(PROSTHETIC_HOPLAN) -/datum/sprite_accessory/marking/baseline_head/hoplan/lights - name = "Baseline - Hoplan Lights" - icon_state = "hoplan_lights" - /datum/sprite_accessory/marking/baseline_color name = "Baseline - Primary Colors" icon = 'icons/mob/human_races/markings_baseline.dmi' icon_state = "machine_primary" + icon_blend_mode = ICON_MULTIPLY is_painted = TRUE - body_parts = list(BP_L_FOOT,BP_R_FOOT,BP_L_LEG,BP_R_LEG,BP_L_HAND,BP_R_HAND,BP_L_ARM,BP_R_ARM,BP_GROIN,BP_CHEST,BP_HEAD) + body_parts = list(BP_L_FOOT,BP_R_FOOT,BP_L_LEG,BP_R_LEG,BP_L_HAND,BP_R_HAND,BP_L_ARM,BP_R_ARM,BP_GROIN,BP_CHEST) /datum/sprite_accessory/marking/baseline_color/arm name = "Baseline - Primary Arm Colors" - body_parts = list(BP_R_ARM, BP_L_ARM, BP_R_HAND, BP_L_HAND) + body_parts = list(BP_R_ARM,BP_L_ARM,BP_R_HAND,BP_L_HAND) -/datum/sprite_accessory/marking/baseline_color/arm +/datum/sprite_accessory/marking/baseline_color/leg name = "Baseline - Primary Leg Colors" - body_parts = list(BP_R_LEG, BP_L_LEG, BP_R_LEG, BP_L_LEG) + body_parts = list(BP_L_FOOT,BP_R_FOOT,BP_R_LEG,BP_L_LEG) -/datum/sprite_accessory/marking/baseline_color/chest +/datum/sprite_accessory/marking/baseline_color/head name = "Baseline - Primary Head Colors" body_parts = list(BP_HEAD) +/datum/sprite_accessory/marking/baseline_color/chest + name = "Baseline - Primary Chest Colors" + body_parts = list(BP_GROIN,BP_CHEST) + //bishop /datum/sprite_accessory/marking/bishop_lights name = "Bishop - Lights Colour" diff --git a/html/changelogs/CometBlaze-baseline_stuff.yml b/html/changelogs/CometBlaze-baseline_stuff.yml new file mode 100644 index 00000000000..14f1f0c6599 --- /dev/null +++ b/html/changelogs/CometBlaze-baseline_stuff.yml @@ -0,0 +1,10 @@ +author: CometBlaze + +delete-after: True + +changes: + - bugfix: "Hoplan Primary Color now uses the correct marking." + - bugfix: "Removed Hoplan Lights marking." + - bugfix: "Added the missing torso and arm markings to the list of available markings for baseline frames." + - bugfix: "Fixed markings for baseline frames using a lighter color than the one selected." + - bugfix: "Baseline - Primary Color no longer applies markings to the head to prevent issues where the default marking would be layered over the alternative ones." diff --git a/icons/mob/human_races/markings_baseline.dmi b/icons/mob/human_races/markings_baseline.dmi index 0e4dae31fb89489d8d69ae3c5fe044598858c937..8cb1a959219e3cdc9080b9b1eb5b758048a6bfea 100644 GIT binary patch delta 1718 zcmV;n21)tX4fG9=Qh(@rR9JLGWpiV4X>fFDZ*Bkpc$}To!D_=W3uupw>EFzq=N(oh1%E$+2*tUgYi;-?!NX%T^{!87bTE)`a^GD zR;oCYiFR1LZd75B8XNx>AwtBVTnJo#LdD}rc(w>;p$bD1#(xV`aS~{8tlx)SWax)- z{WOoaRnnZ>k~2c}Bc0d(vvxu)NdFkIzGHA{X3CbNTBt2KoRCx?ZL;DlC6xu29+7hy zW0R3FM{#xXK4vt_VztGPt{U;=l2z8D`u3(zM!Pk(cwOc2IJ9L|nt&dTatiZ$ox%iblfdrsAse*cfKvZ=gw&j1Y>MAkgN z${~&2Gc6ha(*nj$+tN!O04*&oF000000000$ zDX#LEYyBaAv;fx$oD&p*{s#a600000004lmOByX-s6CCAOuZOI(VW`DC}RFvb8W=5 zl}?%eDAoHW`Hi+(r^NPl5wA8IrD;ks99~R1q5qoh4%Ge`EvY^Dd3>eg57O1~N23HU zPj^b~-G9rD4XCH-jwZNFx0*bxX3=U!?M<@T(D+2p=$~L1Wjbk+ptl|jVs_w#oj`x> z{l_D|kA2eb8pMa}nLZq9-cEZ+^^y4dN1d`KASO64)4pY`jm?`vd_10000000000Oxo7yT4&MaWroiX_B}zr?+JoOhnC`(tVVL! zuOo`?tzT-+Ur2VnAY3Nm6Ini~Bhi2Oh<_IajQL9($YqO?Cqu4xW_1$$@UNx$izBK= z?=sE2?=vC*00000000000Qf41(vtesY>1PySmm?YWwDU?Rlk)6zaL^MWuRA5p%8ATK)Z?~Efp<8U5v2jAQ#q3Z;-=38-$jsFTmx`}AMjc5!11~$P;XlRUdG~$y;{d>=6`_|2mk>8Jp9W=QBiZo&9?Wj5%Br8?pc9g$7Nza z#ug_4RAKH{_?$eO`xUZ2y<=kCd*P~_AJUGzfjk#T>LTa)+Lu|)|6HWLiROMmulVkLNa z(XczZ1c{+6=;W=7#QsOxVDWO`M9p94Za09u1KsL(`&>U{`w!}Ibz4}s`kfl*`XSwa z@G`$&*;v=Dey7H{en=Ct<~QkBzgy?}A$`i${B}r(`kl9aPl#^sw>EEGbx%GjLd^XK zdy`--?yBGI-{&{`kNI^0aetKC>38{8jeK;{f4tAryXCf`jZkYp%u5hS|8ba?Hubso zV_&b&9DIlb_Vg;CAy`o*VG?>i7|?D|El!6xM2p3VBftknAs zWE;DFuxY6@0QUv@pCi!!T!H@Q4D>&Vg3Si$AyK~*;+;_wTmK{b4}XgKoeM!^&fw8FV`awaztBh{}qyEpX9~AVv>i9?I4~Y4@;e7KQ*8l(j M07*qoM6N<$f+{0vp#T5? delta 1689 zcmV;K24?y64c85jQh(igR9JLGWpiV4X>fFDZ*Bkpc$}Tn%?iRW3;^Ks`V_@oRs2Iw zUPKWO`U)ei(H62+()zQvcT<=k2)6W+q({4#0-mrl8v7rFV*mgJhehhVGe`7hnF< zGXwzu;4TQ$h2%1##@yH$dB%rZA-?wxr1+&2pN*vsLTXsviD$fCOYr~z0000000000 z09?jX9uwlz7q9r5{1z4{185_9#u6zt&tEF>R#_=KoOWolAZX zFIpGG4!0?`wb<^d{WD!sJNS8crR@jB>hQxU!PCo~QhWQnWew_S zv84$vi+>kQcB@&sno)a`Z#FbO*E4zwMro;YmjuIg5M*q_GdqCMI{c4Ed>=<-zH6NA z%O|=!(R@1XzR(BaA02eTUVxZjV8~~t+_oPZFE|fb2jzrcQ(?jD5mo*&nV-$kVwyW$ zgEl#z4;^~C zFzv{;uaVZdzf@1YHQC?Ol*w0>eNA~nErM{x>_f?HtxW}0yGfv)s3eG(z<4;mAE?7# zQ+2G;$F!4v=S%!l{SjN|*&}s0=6X);kPk}S+k%?3XyxpGdQ<6^+60+HCOA~gWS37PeW<85pE~`0GKCkKZgbe`{4cfl zX$GGl00000000000Dwu?8eQist~t!`8IqwV7!5r^aPQDk{0mnj*&MYIMR(ReK9uJH z;Y%Vuk>&F?68&EvaZsQYB^kE3aCpdgXMfoy!N2~kG=CB0bROKi0RR91000000002! z6H%;EzucO5_m;mRR=X?~GQaA#i@_h8m`WMzmF3~Z0FU7Cp%YkKMcO+5t4@fq2_4Jr zU2CdqpchsA<`x^*Twz_$*ilrckHvukev_&ik)KUD>Y%z@(K$`>HK^FUy13?oPI8MO0euRL8Jd5KAmv3{$O(a%?1PCGc&oY;Ke{q4t(}s6y{yKI$94z*K@9Zl5kF6i5$I|+PbdwnGi5ge>A6-8%oG3{S#H{>?8w)H{m+~~%-<&(^uJc|9#kLomAXgf5AUkx>23MGka1lgLj&tA3EyAGV0^oSjrZDAXTX@%K*kBi^h(bU8u3@f~2k zr@7W2dQ#O7n)Qb+Ul@JkMbyl$KWwfawCWFqcu(SuU4PhIKWNn-3V-qUPWA2Atp97) z4{iNXi1(x1*!6#n`k}2q3h@Bkn!fcvZ+h1Myy;v2^QLe8&!3+4KYx1G|2m*&{qOz} z^t+oQ=y$hA(C==Kq~8qy)bITR+_-*EqDj9S0*(6JAaK<0z}Mr(`rRGStltfQX8jJd jpi#dY0L}UxxXk|mBNDdm;J_hR00000NkvXXu0mjf-+)F~ From 5888de6ea0235ed71f3126f557bb1bebfcc0bda8 Mon Sep 17 00:00:00 2001 From: Fluffy <65877598+FluffyGhoster@users.noreply.github.com> Date: Sat, 13 Apr 2024 00:22:14 +0200 Subject: [PATCH 5/7] Implemented SI prefixes (KILO, MEGA, GIGA, TERA etc.) (#18874) Implemented SI prefixes (KILO, MEGA, GIGA, TERA etc.) --- aurorastation.dme | 1 + code/__DEFINES/machinery.dm | 5 +-- code/__DEFINES/si.dm | 21 ++++++++++ .../tree_manipulation.dm | 2 +- code/game/machinery/OpTable.dm | 2 +- code/game/machinery/cell_charger.dm | 2 +- code/game/machinery/crusher_piston.dm | 6 +-- code/game/machinery/from_beyond.dm | 4 +- code/game/machinery/mech_recharger.dm | 10 ++--- code/game/machinery/navbeacon.dm | 2 +- code/game/machinery/recharger.dm | 4 +- code/game/machinery/spaceheater.dm | 2 +- .../telecomms/machines/broadcaster.dm | 2 +- code/game/machinery/telecomms/machines/bus.dm | 4 +- code/game/machinery/telecomms/machines/hub.dm | 4 +- .../machinery/telecomms/machines/server.dm | 2 +- .../machinery/telecomms/telecommunications.dm | 2 +- .../machinery/cooking_machines/fryer.dm | 4 +- .../machinery/cooking_machines/oven.dm | 4 +- .../machinery/cooking_machines/stove.dm | 4 +- .../heavy_vehicle/equipment/_equipment.dm | 2 +- .../modules/heavy_vehicle/equipment/combat.dm | 2 +- .../heavy_vehicle/equipment/utility.dm | 4 +- .../modular_computers/hardware/ai_slot.dm | 2 +- .../ship_weaponry/weaponry/leviathan.dm | 4 +- .../fluffyghost-implementsiprefixes.yml | 41 +++++++++++++++++++ 26 files changed, 102 insertions(+), 40 deletions(-) create mode 100644 code/__DEFINES/si.dm create mode 100644 html/changelogs/fluffyghost-implementsiprefixes.yml diff --git a/aurorastation.dme b/aurorastation.dme index cd772040a22..1a80c686e7b 100644 --- a/aurorastation.dme +++ b/aurorastation.dme @@ -111,6 +111,7 @@ #include "code\__DEFINES\rust_g_overrides.dm" #include "code\__DEFINES\ship_weapons.dm" #include "code\__DEFINES\shuttle.dm" +#include "code\__DEFINES\si.dm" #include "code\__DEFINES\singletons.dm" #include "code\__DEFINES\smart_token_bucket.dm" #include "code\__DEFINES\solar.dm" diff --git a/code/__DEFINES/machinery.dm b/code/__DEFINES/machinery.dm index 2e57c309280..495fac0beba 100644 --- a/code/__DEFINES/machinery.dm +++ b/code/__DEFINES/machinery.dm @@ -1,6 +1,5 @@ -#define KILOWATTS *1000 -#define MEGAWATTS *1000000 -#define GIGAWATTS *1000000000 +//Watts, yes this is stupid but it's just for visual reference to the code reader, so deal with it +#define WATTS *1 /** * Multiplier for watts per tick <> cell storage (e.g., 0.02 means if there is a load of 1000 watts, 20 units will be taken from a cell per second) diff --git a/code/__DEFINES/si.dm b/code/__DEFINES/si.dm new file mode 100644 index 00000000000..b63f048e0b3 --- /dev/null +++ b/code/__DEFINES/si.dm @@ -0,0 +1,21 @@ +// Prefix values. +#define QUECTO * 1e-30 +#define RONTO * 1e-27 +#define YOCTO * 1e-24 +#define ZEPTO * 1e-21 +#define ATTO * 1e-18 +#define FEMPTO * 1e-15 +#define PICO * 1e-12 +#define NANO * 1e-9 +#define MICRO * 1e-6 +#define MILLI * 1e-3 +#define KILO * 1e3 +#define MEGA * 1e6 +#define GIGA * 1e9 +#define TERA * 1e12 +#define PETA * 1e15 +#define EXA * 1e18 +#define ZETTA * 1e21 +#define YOTTA * 1e24 +#define RONNA * 1e27 +#define QUETTA * 1e30 diff --git a/code/game/gamemodes/malfunction/newmalf_ability_trees/tree_manipulation.dm b/code/game/gamemodes/malfunction/newmalf_ability_trees/tree_manipulation.dm index 898a45b1082..c2e5890005c 100644 --- a/code/game/gamemodes/malfunction/newmalf_ability_trees/tree_manipulation.dm +++ b/code/game/gamemodes/malfunction/newmalf_ability_trees/tree_manipulation.dm @@ -206,7 +206,7 @@ if(!ability_pay(user,price)) return - M.use_power_oneoff(250 KILOWATTS) + M.use_power_oneoff(250 KILO WATTS) // Trigger a powernet alarm. Careful engineers will probably notice something is going on. var/area/temp_area = get_area(M) diff --git a/code/game/machinery/OpTable.dm b/code/game/machinery/OpTable.dm index a6b14102470..ee0e39628f0 100644 --- a/code/game/machinery/OpTable.dm +++ b/code/game/machinery/OpTable.dm @@ -221,7 +221,7 @@ if(stat & NOPOWER) return FALSE - src.use_power_oneoff(2 KILOWATTS) + src.use_power_oneoff(2 KILO WATTS) //Set it to unwillful sleep occupant_resolved.Sleeping(3.5*seconds_per_tick) diff --git a/code/game/machinery/cell_charger.dm b/code/game/machinery/cell_charger.dm index 4fa1d50fa18..56895a99467 100644 --- a/code/game/machinery/cell_charger.dm +++ b/code/game/machinery/cell_charger.dm @@ -6,7 +6,7 @@ icon_state = "ccharger" anchored = TRUE idle_power_usage = 5 - active_power_usage = 90 KILOWATTS + active_power_usage = 90 KILO WATTS power_channel = EQUIP update_icon_on_init = TRUE diff --git a/code/game/machinery/crusher_piston.dm b/code/game/machinery/crusher_piston.dm index 534a27aeb14..628921bb651 100644 --- a/code/game/machinery/crusher_piston.dm +++ b/code/game/machinery/crusher_piston.dm @@ -402,7 +402,7 @@ QDEL_NULL(pb3) /obj/machinery/crusher_piston/proc/extend_0_1() - use_power_oneoff(5 KILOWATTS) + use_power_oneoff(5 KILO WATTS) var/turf/T = get_turf(src) if(!can_extend_into(T)) return 0 @@ -414,7 +414,7 @@ return 1 /obj/machinery/crusher_piston/proc/extend_1_2() - use_power_oneoff(5 KILOWATTS) + use_power_oneoff(5 KILO WATTS) var/turf/T = get_turf(pb1) var/turf/extension_turf = get_step(T,SOUTH) if(!can_extend_into(extension_turf)) @@ -427,7 +427,7 @@ return 1 /obj/machinery/crusher_piston/proc/extend_2_3() - use_power_oneoff(5 KILOWATTS) + use_power_oneoff(5 KILO WATTS) var/turf/T = get_turf(pb2) var/turf/extension_turf = get_step(T,SOUTH) if(!can_extend_into(extension_turf)) diff --git a/code/game/machinery/from_beyond.dm b/code/game/machinery/from_beyond.dm index 9899c8b00c0..6dde31d3179 100644 --- a/code/game/machinery/from_beyond.dm +++ b/code/game/machinery/from_beyond.dm @@ -7,8 +7,8 @@ anchored = 0 density = 1 - idle_power_usage = 1 KILOWATTS - active_power_usage = 10 KILOWATTS + idle_power_usage = 1 KILO WATTS + active_power_usage = 10 KILO WATTS var/active = FALSE var/static/list/whispers = list( diff --git a/code/game/machinery/mech_recharger.dm b/code/game/machinery/mech_recharger.dm index 9150f8f04d1..4287e64baa1 100644 --- a/code/game/machinery/mech_recharger.dm +++ b/code/game/machinery/mech_recharger.dm @@ -7,11 +7,11 @@ layer = ABOVE_TILE_LAYER anchored = TRUE idle_power_usage = 300 // Some electronics, passive drain. - active_power_usage = 90 KILOWATTS // When charging + active_power_usage = 90 KILO WATTS // When charging var/mob/living/heavy_vehicle/charging - var/base_charge_rate = 90 KILOWATTS - var/repair_power_usage = 15 KILOWATTS // Per 1 HP of health. + var/base_charge_rate = 90 KILO WATTS + var/repair_power_usage = 15 KILO WATTS // Per 1 HP of health. var/repair = 0 var/charge @@ -118,9 +118,9 @@ desc = "A massive vehicle dock elevated slightly above the ground, constructed for equally massive charging speeds." icon_state = "supermechcharger" idle_power_usage = 400 - active_power_usage = 120 KILOWATTS + active_power_usage = 120 KILO WATTS - base_charge_rate = 120 KILOWATTS + base_charge_rate = 120 KILO WATTS repair = 1 component_types = list( diff --git a/code/game/machinery/navbeacon.dm b/code/game/machinery/navbeacon.dm index 2e3b4f7471c..60732eceff1 100644 --- a/code/game/machinery/navbeacon.dm +++ b/code/game/machinery/navbeacon.dm @@ -100,7 +100,7 @@ return FALSE //Wikipedia says this is the upper limit for a medium non directional beacon, deal with it - use_power_oneoff(2 KILOWATTS) + use_power_oneoff(2 KILO WATTS) var/datum/radio_frequency/frequency = SSradio.return_frequency(freq) diff --git a/code/game/machinery/recharger.dm b/code/game/machinery/recharger.dm index babbf201556..096bd39d577 100644 --- a/code/game/machinery/recharger.dm +++ b/code/game/machinery/recharger.dm @@ -7,7 +7,7 @@ icon_state = "recharger_off" anchored = 1 idle_power_usage = 6 - active_power_usage = 45 KILOWATTS + active_power_usage = 45 KILO WATTS pass_flags = PASSTABLE obj_flags = OBJ_FLAG_MOVES_UNSUPPORTED var/charging_efficiency = 1.3 @@ -176,7 +176,7 @@ desc = "A heavy duty wall recharger specialized for energy weaponry." icon = 'icons/obj/stationobjs.dmi' icon_state = "wrecharger_off" - active_power_usage = 75 KILOWATTS + active_power_usage = 75 KILO WATTS allowed_devices = list( /obj/item/gun/energy, /obj/item/melee/baton, diff --git a/code/game/machinery/spaceheater.dm b/code/game/machinery/spaceheater.dm index ab61436dfc3..12471b51e93 100644 --- a/code/game/machinery/spaceheater.dm +++ b/code/game/machinery/spaceheater.dm @@ -9,7 +9,7 @@ clicksound = /singleton/sound_category/switch_sound var/on = FALSE var/active = 0 - var/heating_power = 40 KILOWATTS + var/heating_power = 40 KILO WATTS var/set_temperature = T0C + 20 var/obj/item/cell/apc/cell diff --git a/code/game/machinery/telecomms/machines/broadcaster.dm b/code/game/machinery/telecomms/machines/broadcaster.dm index 7070fb1fc8c..9027cf3ba6d 100644 --- a/code/game/machinery/telecomms/machines/broadcaster.dm +++ b/code/game/machinery/telecomms/machines/broadcaster.dm @@ -11,7 +11,7 @@ desc = "A dish-shaped machine used to broadcast processed subspace signals." telecomms_type = /obj/machinery/telecomms/broadcaster idle_power_usage = 100 // WATTS - active_power_usage = 3 KILOWATTS + active_power_usage = 3 KILO WATTS produces_heat = FALSE delay = 7 circuitboard = "/obj/item/circuitboard/telecomms/broadcaster" diff --git a/code/game/machinery/telecomms/machines/bus.dm b/code/game/machinery/telecomms/machines/bus.dm index c9c56edb5cf..9c7d3ef9737 100644 --- a/code/game/machinery/telecomms/machines/bus.dm +++ b/code/game/machinery/telecomms/machines/bus.dm @@ -12,8 +12,8 @@ icon_state = "bus" desc = "A mighty piece of hardware used to send massive amounts of data quickly." telecomms_type = /obj/machinery/telecomms/bus - idle_power_usage = 1 KILOWATTS - active_power_usage = 3 KILOWATTS + idle_power_usage = 1 KILO WATTS + active_power_usage = 3 KILO WATTS circuitboard = "/obj/item/circuitboard/telecomms/bus" netspeed = 40 var/change_frequency = 0 diff --git a/code/game/machinery/telecomms/machines/hub.dm b/code/game/machinery/telecomms/machines/hub.dm index 10237ab5de3..d801553e727 100644 --- a/code/game/machinery/telecomms/machines/hub.dm +++ b/code/game/machinery/telecomms/machines/hub.dm @@ -15,8 +15,8 @@ telecomms_type = /obj/machinery/telecomms/hub density = TRUE anchored = TRUE - idle_power_usage = 1.6 KILOWATTS - active_power_usage = 5 KILOWATTS + idle_power_usage = 1.6 KILO WATTS + active_power_usage = 5 KILO WATTS circuitboard = "/obj/item/circuitboard/telecomms/hub" netspeed = 40 diff --git a/code/game/machinery/telecomms/machines/server.dm b/code/game/machinery/telecomms/machines/server.dm index f6c24d24f6e..70a6c5fb70a 100644 --- a/code/game/machinery/telecomms/machines/server.dm +++ b/code/game/machinery/telecomms/machines/server.dm @@ -20,7 +20,7 @@ density = TRUE anchored = TRUE idle_power_usage = 300 // WATTS - active_power_usage = 1 KILOWATTS + active_power_usage = 1 KILO WATTS circuitboard = "/obj/item/circuitboard/telecomms/server" var/list/log_entries = list() var/totaltraffic = 0 // gigabytes (if > 1024, divide by 1024 -> terrabytes) diff --git a/code/game/machinery/telecomms/telecommunications.dm b/code/game/machinery/telecomms/telecommunications.dm index d2529bf1a59..5226287099d 100644 --- a/code/game/machinery/telecomms/telecommunications.dm +++ b/code/game/machinery/telecomms/telecommunications.dm @@ -22,7 +22,7 @@ density = TRUE anchored = TRUE idle_power_usage = 600 // WATTS - active_power_usage = 2 KILOWATTS + active_power_usage = 2 KILO WATTS var/list/links = list() // list of machines this machine is linked to /* diff --git a/code/modules/cooking/machinery/cooking_machines/fryer.dm b/code/modules/cooking/machinery/cooking_machines/fryer.dm index 2a1ca3b9e50..1b16f9265f2 100644 --- a/code/modules/cooking/machinery/cooking_machines/fryer.dm +++ b/code/modules/cooking/machinery/cooking_machines/fryer.dm @@ -8,10 +8,10 @@ off_icon = "fryer_off" food_color = "#ffad33" appliancetype = FRYER - active_power_usage = 12 KILOWATTS + active_power_usage = 12 KILO WATTS heating_power = 12000 optimal_power = 1.35 - idle_power_usage = 3.6 KILOWATTS + idle_power_usage = 3.6 KILO WATTS //Power used to maintain temperature once it's heated. //Going with 25% of the active power. This is a somewhat arbitrary value resistance = 10000 // Approx. 4 minutes. diff --git a/code/modules/cooking/machinery/cooking_machines/oven.dm b/code/modules/cooking/machinery/cooking_machines/oven.dm index cbcaf65392e..b786c0cb855 100644 --- a/code/modules/cooking/machinery/cooking_machines/oven.dm +++ b/code/modules/cooking/machinery/cooking_machines/oven.dm @@ -7,11 +7,11 @@ appliancetype = OVEN food_color = "#a34719" can_burn_food = TRUE - active_power_usage = 6 KILOWATTS + active_power_usage = 6 KILO WATTS heating_power = 6000 //Based on a double deck electric convection oven resistance = 10000 // Approx. 4 minutes. - idle_power_usage = 2 KILOWATTS + idle_power_usage = 2 KILO WATTS //uses ~30% power to stay warm optimal_power = 1.2 light_x = 2 diff --git a/code/modules/cooking/machinery/cooking_machines/stove.dm b/code/modules/cooking/machinery/cooking_machines/stove.dm index ba9a88c20ff..73aa1560f30 100644 --- a/code/modules/cooking/machinery/cooking_machines/stove.dm +++ b/code/modules/cooking/machinery/cooking_machines/stove.dm @@ -6,14 +6,14 @@ appliancetype = SKILLET | SAUCEPAN | POT food_color = "#a34719" can_burn_food = TRUE - active_power_usage = 6 KILOWATTS + active_power_usage = 6 KILO WATTS heating_power = 6000 on_icon = "stove" off_icon = "stove" place_verb = "onto" resistance = 5000 // Approx. 2 minutes. - idle_power_usage = 1 KILOWATTS + idle_power_usage = 1 KILO WATTS //uses ~30% power to stay warm optimal_temp = T0C + 100 // can boil water! optimal_power = 1.2 diff --git a/code/modules/heavy_vehicle/equipment/_equipment.dm b/code/modules/heavy_vehicle/equipment/_equipment.dm index 69becc1c2c5..cc6a1f26e14 100644 --- a/code/modules/heavy_vehicle/equipment/_equipment.dm +++ b/code/modules/heavy_vehicle/equipment/_equipment.dm @@ -13,7 +13,7 @@ var/mech_layer = MECH_GEAR_LAYER var/equipment_delay = 0 var/passive_power_use = 0 - var/active_power_use = 1 KILOWATTS + var/active_power_use = 1 KILO WATTS var/require_adjacent = TRUE var/active = FALSE //For gear that has an active state (ie, floodlights) diff --git a/code/modules/heavy_vehicle/equipment/combat.dm b/code/modules/heavy_vehicle/equipment/combat.dm index cdd3ee67596..1e169c0e86b 100644 --- a/code/modules/heavy_vehicle/equipment/combat.dm +++ b/code/modules/heavy_vehicle/equipment/combat.dm @@ -335,7 +335,7 @@ else STOP_PROCESSING(SSprocessing, src) active = aura.active - passive_power_use = active ? 1 KILOWATTS : 0 + passive_power_use = active ? 1 KILO WATTS : 0 owner.update_icon() /obj/item/mecha_equipment/shield/deactivate() diff --git a/code/modules/heavy_vehicle/equipment/utility.dm b/code/modules/heavy_vehicle/equipment/utility.dm index 89a1588760d..0aa216955c6 100644 --- a/code/modules/heavy_vehicle/equipment/utility.dm +++ b/code/modules/heavy_vehicle/equipment/utility.dm @@ -209,7 +209,7 @@ update_icon() owner.update_icon() active = on - passive_power_use = on ? 0.1 KILOWATTS : 0 + passive_power_use = on ? 0.1 KILO WATTS : 0 /obj/item/mecha_equipment/light/deactivate() if(on) @@ -658,7 +658,7 @@ restricted_hardpoints = list(HARDPOINT_BACK) w_class = ITEMSIZE_HUGE origin_tech = list(TECH_MATERIAL = 6, TECH_ENGINEERING = 6, TECH_BLUESPACE = 6) - active_power_use = 88 KILOWATTS + active_power_use = 88 KILO WATTS var/obj/item/anomaly_core/AC var/image/anomaly_overlay diff --git a/code/modules/modular_computers/hardware/ai_slot.dm b/code/modules/modular_computers/hardware/ai_slot.dm index 9a9a091966f..d287fe345d8 100644 --- a/code/modules/modular_computers/hardware/ai_slot.dm +++ b/code/modules/modular_computers/hardware/ai_slot.dm @@ -9,7 +9,7 @@ origin_tech = list(TECH_POWER = 2, TECH_DATA = 3) var/obj/item/aicard/stored_card var/power_usage_idle = 100 - var/power_usage_occupied = 2 KILOWATTS + var/power_usage_occupied = 2 KILO WATTS /obj/item/computer_hardware/ai_slot/proc/update_power_usage() if(!stored_card?.carded_ai) diff --git a/code/modules/overmap/ship_weaponry/weaponry/leviathan.dm b/code/modules/overmap/ship_weaponry/weaponry/leviathan.dm index e64dc2fd9c1..0d17f6eee38 100644 --- a/code/modules/overmap/ship_weaponry/weaponry/leviathan.dm +++ b/code/modules/overmap/ship_weaponry/weaponry/leviathan.dm @@ -15,8 +15,8 @@ layer = ABOVE_HUMAN_LAYER use_power = POWER_USE_OFF //Start off. - idle_power_usage = 100 KILOWATTS - active_power_usage = 20 MEGAWATTS + idle_power_usage = 100 KILO WATTS + active_power_usage = 20 MEGA WATTS var/obj/machinery/power/smes/buildable/smes /obj/machinery/ship_weapon/leviathan/Destroy() diff --git a/html/changelogs/fluffyghost-implementsiprefixes.yml b/html/changelogs/fluffyghost-implementsiprefixes.yml new file mode 100644 index 00000000000..11359042c49 --- /dev/null +++ b/html/changelogs/fluffyghost-implementsiprefixes.yml @@ -0,0 +1,41 @@ +################################ +# Example Changelog File +# +# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb. +# +# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.) +# When it is, any changes listed below will disappear. +# +# Valid Prefixes: +# bugfix +# wip (For works in progress) +# tweak +# soundadd +# sounddel +# rscadd (general adding of nice things) +# rscdel (general deleting of nice things) +# imageadd +# imagedel +# maptweak +# spellcheck (typo fixes) +# experiment +# balance +# admin +# backend +# security +# refactor +################################# + +# Your name. +author: FluffyGhost + +# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again. +delete-after: True + +# Any changes you've made. See valid prefix list above. +# INDENT WITH TWO SPACES. NOT TABS. SPACES. +# SCREW THIS UP AND IT WON'T WORK. +# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries. +# Please surround your changes in double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog. +changes: + - refactor: "Implemented SI prefixes (KILO, MEGA, GIGA, TERA etc.)." From 7c113617f39001f2d0151420fa911d3d1a4bdc27 Mon Sep 17 00:00:00 2001 From: RustingWithYou <63625389+RustingWithYou@users.noreply.github.com> Date: Sat, 13 Apr 2024 10:22:19 +1200 Subject: [PATCH 6/7] Adds TTS accent vocal cords to loadout (#18881) The synthetic vocal cords loadout item is now a selection, which allows players to pick the normal ones or cheaper/less advanced ones which set their accent to TTS. IPCs can also no longer take synthetic vocal cords because they're robots and don't really have normal vocal cords for it to replace. --- .../loadout/items/augments.dm | 13 ++++-- html/changelogs/RustingWithYou - beepboop.yml | 42 +++++++++++++++++++ 2 files changed, 52 insertions(+), 3 deletions(-) create mode 100644 html/changelogs/RustingWithYou - beepboop.yml diff --git a/code/modules/client/preference_setup/loadout/items/augments.dm b/code/modules/client/preference_setup/loadout/items/augments.dm index b90690f09f2..0f6214b91b4 100644 --- a/code/modules/client/preference_setup/loadout/items/augments.dm +++ b/code/modules/client/preference_setup/loadout/items/augments.dm @@ -29,12 +29,19 @@ whitelisted = list(SPECIES_HUMAN, SPECIES_HUMAN_OFFWORLD, SPECIES_TAJARA, SPECIES_TAJARA_ZHAN, SPECIES_TAJARA_MSAI, SPECIES_IPC_SHELL) /datum/gear/augment/synthetic_cords - display_name = "synthetic vocal cords" - description = "Vocal cords of synthetic nature packed into an augment kit. This allows users who are mute due to structural damage of the throat to speak." + display_name = "synthetic vocal cords selection" + description = "Vocal cords of synthetic nature packed into an augment kit. This allows users who are mute due to structural damage of the throat to speak. The advanced model allows use of normal accents, while the cheaper basic model will set your accent to text-to-speech." path = /obj/item/organ/internal/augment/synthetic_cords - whitelisted = list(SPECIES_HUMAN, SPECIES_HUMAN_OFFWORLD, SPECIES_TAJARA, SPECIES_TAJARA_ZHAN, SPECIES_TAJARA_MSAI, SPECIES_SKRELL, SPECIES_SKRELL_AXIORI, SPECIES_IPC, SPECIES_IPC_G1, SPECIES_IPC_G2, SPECIES_IPC_XION, SPECIES_IPC_ZENGHU, SPECIES_IPC_BISHOP, SPECIES_IPC_SHELL, SPECIES_VAURCA_WORKER, SPECIES_VAURCA_WARRIOR, SPECIES_VAURCA_BULWARK, SPECIES_VAURCA_BREEDER, SPECIES_UNATHI) + whitelisted = list(SPECIES_HUMAN, SPECIES_HUMAN_OFFWORLD, SPECIES_TAJARA, SPECIES_TAJARA_ZHAN, SPECIES_TAJARA_MSAI, SPECIES_SKRELL, SPECIES_SKRELL_AXIORI, SPECIES_VAURCA_WORKER, SPECIES_VAURCA_WARRIOR, SPECIES_VAURCA_BULWARK, SPECIES_VAURCA_BREEDER, SPECIES_UNATHI) cost = 1 +/datum/gear/augment/synthetic_cords/New() + ..() + var/list/augs = list() + augs["synthetic vocal cords, basic"] = /obj/item/organ/internal/augment/synthetic_cords/voice + augs["synthetic vocal cords, advanced"] = /obj/item/organ/internal/augment/synthetic_cords + gear_tweaks += new /datum/gear_tweak/path(augs) + /datum/gear/augment/combitool display_name = "retractable combitool" description = "An augment that allows the user to deploy a robotic combitool." diff --git a/html/changelogs/RustingWithYou - beepboop.yml b/html/changelogs/RustingWithYou - beepboop.yml new file mode 100644 index 00000000000..91ccaa8f197 --- /dev/null +++ b/html/changelogs/RustingWithYou - beepboop.yml @@ -0,0 +1,42 @@ +################################ +# Example Changelog File +# +# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb. +# +# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.) +# When it is, any changes listed below will disappear. +# +# Valid Prefixes: +# bugfix +# wip (For works in progress) +# tweak +# soundadd +# sounddel +# rscadd (general adding of nice things) +# rscdel (general deleting of nice things) +# imageadd +# imagedel +# maptweak +# spellcheck (typo fixes) +# experiment +# balance +# admin +# backend +# security +# refactor +################################# + +# Your name. +author: RustingWithYou + +# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again. +delete-after: True + +# Any changes you've made. See valid prefix list above. +# INDENT WITH TWO SPACES. NOT TABS. SPACES. +# SCREW THIS UP AND IT WON'T WORK. +# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries. +# Please surround your changes in double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog. +changes: + - rscadd: "TTS accent synthetic vocal cords are now available in loadout." + - rscdel: "IPCs can no longer take synthetic vocal cords." From 4c7eb47229092106715594f0edc5a9c051a4c6be Mon Sep 17 00:00:00 2001 From: RustingWithYou <63625389+RustingWithYou@users.noreply.github.com> Date: Sat, 13 Apr 2024 10:22:23 +1200 Subject: [PATCH 7/7] Adds Camera MIU to uplink (#18887) Adds the camera MIU to the antag uplink. --- code/datums/uplink/devices_and_tools.dm | 6 +++ .../RustingWithYou - cameramask.yml | 41 +++++++++++++++++++ 2 files changed, 47 insertions(+) create mode 100644 html/changelogs/RustingWithYou - cameramask.yml diff --git a/code/datums/uplink/devices_and_tools.dm b/code/datums/uplink/devices_and_tools.dm index 4092d8854c5..4dfe8959ace 100644 --- a/code/datums/uplink/devices_and_tools.dm +++ b/code/datums/uplink/devices_and_tools.dm @@ -257,3 +257,9 @@ telecrystal_cost = 4 bluecrystal_cost = 4 path = /obj/item/recharger_backpack/high + +/datum/uplink_item/item/tools/camera_mask + name = "Camera MIU" + desc = "A mask which allows the wearer to view local camera feeds they have access to." + telecrystal_cost = 6 + path = /obj/item/clothing/mask/ai diff --git a/html/changelogs/RustingWithYou - cameramask.yml b/html/changelogs/RustingWithYou - cameramask.yml new file mode 100644 index 00000000000..1ae48731523 --- /dev/null +++ b/html/changelogs/RustingWithYou - cameramask.yml @@ -0,0 +1,41 @@ +################################ +# Example Changelog File +# +# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb. +# +# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.) +# When it is, any changes listed below will disappear. +# +# Valid Prefixes: +# bugfix +# wip (For works in progress) +# tweak +# soundadd +# sounddel +# rscadd (general adding of nice things) +# rscdel (general deleting of nice things) +# imageadd +# imagedel +# maptweak +# spellcheck (typo fixes) +# experiment +# balance +# admin +# backend +# security +# refactor +################################# + +# Your name. +author: RustingWithYou + +# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again. +delete-after: True + +# Any changes you've made. See valid prefix list above. +# INDENT WITH TWO SPACES. NOT TABS. SPACES. +# SCREW THIS UP AND IT WON'T WORK. +# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries. +# Please surround your changes in double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog. +changes: + - rscadd: "The camera MIU is now available in the uplink."