From ee2aae28ac1299097cfc2a38041eb024317489fd Mon Sep 17 00:00:00 2001 From: Constellado <64122807+Constellado@users.noreply.github.com> Date: Sat, 27 Jul 2024 17:46:17 +1200 Subject: [PATCH 01/12] Removes SolGov entirely. Yep. Entirely. Icon states not changed however. Will need a test merge. --- PentestModules/maps/v_outpost.dmm | 2 +- .../icemoon_underground_brazillianlab.dmm | 2 +- .../lavaland_surface_biodome_winter.dmm | 222 ++-- .../RockRuins/rockplanet_shippingdock.dmm | 2 +- _maps/RandomRuins/SpaceRuins/power_puzzle.dmm | 28 +- _maps/RandomRuins/SpaceRuins/spacemall.dmm | 68 +- .../WasteRuins/wasteplanet_lab.dmm | 2 +- _maps/configs/independent_bubble.json | 2 +- _maps/configs/solgov_chronicle.json | 22 +- _maps/configs/solgov_inkwell.json | 22 +- _maps/configs/solgov_paracelsus.json | 24 +- .../configs/syndicate_cybersun_kansatsu.json | 2 +- _maps/configs/terragov_chronicle.json | 47 + _maps/configs/terragov_inkwell.json | 49 + _maps/configs/terragov_paracelsus.json | 54 + _maps/map_files/generic/CentCom.dmm | 44 +- _maps/outpost/nanotrasen_asteroid.dmm | 2 +- _maps/ship_config_schema.json | 2 +- .../independent/independent_rigger.dmm | 4 +- .../independent/independent_schmiedeberg.dmm | 2 +- _maps/shuttles/inteq/inteq_colossus.dmm | 4 +- _maps/shuttles/inteq/inteq_hound.dmm | 4 +- _maps/shuttles/inteq/inteq_valor.dmm | 4 +- _maps/shuttles/inteq/inteq_vaquero.dmm | 4 +- .../shuttles/nanotrasen/nanotrasen_osprey.dmm | 2 +- _maps/shuttles/pirate/pirate_noderider.dmm | 2 +- _maps/shuttles/roumain/srm_elder.dmm | 4 +- _maps/shuttles/solgov/solgov_chronicle.dmm | 372 +++--- _maps/shuttles/solgov/solgov_inkwell.dmm | 1070 ++++++++--------- _maps/shuttles/solgov/solgov_paracelsus.dmm | 444 +++---- .../syndicate/syndicate_litieguai.dmm | 4 +- .../syndicate/syndicate_twinkleshine.dmm | 4 +- code/__DEFINES/access.dm | 2 +- code/__DEFINES/factions.dm | 2 +- code/__DEFINES/jobs.dm | 2 +- code/__DEFINES/radio.dm | 8 +- code/__HELPERS/names.dm | 6 +- code/_globalvars/lists/flavor_misc.dm | 2 +- code/controllers/subsystem/blackbox.dm | 4 +- code/datums/ert.dm | 26 +- code/datums/ruins/lavaland.dm | 4 +- code/game/MapData/shuttles/srm_elder.dm | 4 +- code/game/area/ship_areas.dm | 4 +- code/game/communications.dm | 6 +- code/game/gamemodes/changeling/changeling.dm | 2 +- code/game/gamemodes/cult/cult.dm | 2 +- .../dynamic/dynamic_rulesets_latejoin.dm | 2 +- .../dynamic/dynamic_rulesets_midround.dm | 4 +- .../dynamic/dynamic_rulesets_roundstart.dm | 8 +- code/game/gamemodes/traitor/traitor.dm | 2 +- code/game/machinery/computer/Operating.dm | 4 +- code/game/machinery/computer/atmos_alert.dm | 4 +- code/game/machinery/computer/atmos_control.dm | 28 +- .../game/machinery/computer/buildandrepair.dm | 2 +- code/game/machinery/computer/camera.dm | 4 +- code/game/machinery/computer/card.dm | 6 +- code/game/machinery/computer/crew.dm | 4 +- code/game/machinery/computer/station_alert.dm | 4 +- code/game/machinery/doors/airlock_types.dm | 4 +- .../machinery/porta_turret/portable_turret.dm | 4 +- code/game/machinery/suit_storage_unit.dm | 8 +- .../telecomms/computers/logbrowser.dm | 4 +- .../telecomms/computers/telemonitor.dm | 4 +- code/game/machinery/telecomms/machines/bus.dm | 6 +- .../machinery/telecomms/machines/processor.dm | 2 +- .../machinery/telecomms/machines/receiver.dm | 2 +- .../machinery/telecomms/machines/relay.dm | 8 +- .../machinery/telecomms/machines/server.dm | 8 +- code/game/mecha/mech_bay.dm | 4 +- code/game/objects/effects/contraband.dm | 76 +- .../decals/turfdecal/flooring_decals.dm | 62 +- code/game/objects/items/cards_ids.dm | 12 +- code/game/objects/items/desk_flags.dm | 4 +- .../objects/items/devices/PDA/PDA_types.dm | 6 +- .../items/devices/radio/encryptionkey.dm | 6 +- .../objects/items/devices/radio/headset.dm | 30 +- .../game/objects/items/devices/radio/radio.dm | 2 +- code/game/objects/items/documents.dm | 2 +- code/game/objects/items/melee/energy.dm | 2 +- code/game/objects/items/melee/misc.dm | 8 +- code/game/objects/items/plushes.dm | 4 +- .../items/stacks/sheets/sheet_types.dm | 2 +- code/game/objects/items/storage/belt.dm | 12 +- code/game/objects/items/storage/fancy.dm | 2 +- code/game/objects/structures/bedsheet_bin.dm | 10 +- .../objects/structures/door_assembly_types.dm | 8 +- .../structures/icemoon/cave_entrance.dm | 6 +- code/game/objects/structures/printer.dm | 4 +- code/game/objects/structures/signs/_signs.dm | 12 +- code/game/objects/structures/tables_racks.dm | 2 +- code/game/say.dm | 4 +- code/modules/admin/verbs/randomverbs.dm | 4 +- code/modules/antagonists/ert/solgov.dm | 20 +- code/modules/asset_cache/asset_list_items.dm | 2 +- .../blackmarket/blackmarket_items/misc.dm | 2 +- .../blackmarket/blackmarket_items/weapons.dm | 4 +- code/modules/cargo/expressconsole.dm | 4 +- code/modules/cargo/packs/ammo.dm | 2 +- code/modules/client/loadout/loadout_hat.dm | 2 +- code/modules/clothing/factions/srm.dm | 8 +- code/modules/clothing/factions/suns.dm | 8 +- code/modules/clothing/head/berets.dm | 18 +- code/modules/clothing/head/hardhat.dm | 2 +- code/modules/clothing/head/helmet.dm | 26 +- code/modules/clothing/head/misc.dm | 18 +- code/modules/clothing/neck/_neck.dm | 4 +- .../clothing/outfits/ert/solgov_ert.dm | 26 +- .../clothing/outfits/factions/solgov.dm | 148 +-- code/modules/clothing/outfits/plasmaman.dm | 8 +- code/modules/clothing/spacesuits/hardsuit.dm | 10 +- .../clothing/spacesuits/miscellaneous.dm | 10 +- code/modules/clothing/suits/armor.dm | 24 +- code/modules/clothing/suits/cloaks.dm | 18 +- code/modules/clothing/suits/jobs.dm | 52 +- code/modules/clothing/suits/wintercoats.dm | 14 +- code/modules/clothing/under/accessories.dm | 6 +- code/modules/clothing/under/solgov.dm | 42 +- code/modules/jobs/access.dm | 14 +- code/modules/jobs/job_types/solgov_rep.dm | 12 +- code/modules/jobs/jobs.dm | 4 +- .../carbon/human/species_types/plasmamen.dm | 4 +- code/modules/mob/living/living_say.dm | 2 +- .../mob/living/simple_animal/corpse.dm | 10 +- .../mob/living/simple_animal/parrot.dm | 4 +- code/modules/overmap/helm.dm | 4 +- .../overmap/missions/acquire_mission.dm | 2 +- code/modules/paperwork/fax.dm | 14 +- code/modules/paperwork/folders_premade.dm | 12 +- code/modules/paperwork/pen.dm | 14 +- code/modules/paperwork/stamps.dm | 4 +- code/modules/power/cell.dm | 4 +- code/modules/power/monitor.dm | 4 +- .../projectiles/boxes_magazines/ammo_boxes.dm | 2 +- .../boxes_magazines/external/rifle.dm | 2 +- .../boxes_magazines/internal/rifle.dm | 2 +- .../projectiles/guns/ballistic/gauss.dm | 18 +- .../projectiles/guns/ballistic/launchers.dm | 4 +- .../projectiles/guns/ballistic/pistol.dm | 6 +- .../projectiles/guns/ballistic/revolver.dm | 2 +- .../projectiles/guns/ballistic/rifle.dm | 6 +- .../research/designs/weapon_designs.dm | 2 +- code/modules/research/rdconsole.dm | 4 +- .../ruins/lavalandruin_code/biodome_winter.dm | 2 +- shiptest.dme | 10 +- strings/ship_names.json | 2 +- .../tgui-panel/styles/tgchat/chat-dark.scss | 2 +- .../tgui-panel/styles/tgchat/chat-light.scss | 2 +- .../packages/tgui/interfaces/PosterPrinter.js | 2 +- 148 files changed, 1907 insertions(+), 1747 deletions(-) create mode 100644 _maps/configs/terragov_chronicle.json create mode 100644 _maps/configs/terragov_inkwell.json create mode 100644 _maps/configs/terragov_paracelsus.json diff --git a/PentestModules/maps/v_outpost.dmm b/PentestModules/maps/v_outpost.dmm index 26e3ca88ceec..3bf55bc2d501 100644 --- a/PentestModules/maps/v_outpost.dmm +++ b/PentestModules/maps/v_outpost.dmm @@ -348,7 +348,7 @@ /obj/machinery/airalarm/directional/north, /obj/structure/table/reinforced, /obj/item/pen/solgov{ - desc = "Some say this is the legendary pen Moore picked up, once."; + desc = "Some say this is the legendary pen Late Moore picked up, once."; name = "Legendary SolGov pen" }, /turf/open/floor/plasteel/dark, diff --git a/_maps/RandomRuins/IceRuins/icemoon_underground_brazillianlab.dmm b/_maps/RandomRuins/IceRuins/icemoon_underground_brazillianlab.dmm index 4954a9a5aaf4..40d9fe80d0f7 100644 --- a/_maps/RandomRuins/IceRuins/icemoon_underground_brazillianlab.dmm +++ b/_maps/RandomRuins/IceRuins/icemoon_underground_brazillianlab.dmm @@ -371,7 +371,7 @@ /obj/structure/table/wood, /obj/item/nullrod{ block_chance = 50; - desc = "This massive chart appears to be the layout of a SolGov outpost. It's covered in marks, scribbles in a language you don't recognize, and several stains. It's unusually sturdy."; + desc = "This massive chart appears to be the layout of a TerraGov outpost. It's covered in marks, scribbles in a language you don't recognize, and several stains. It's unusually sturdy."; icon_state = "blueprints"; item_state = "blueprints"; lefthand_file = 'icons/mob/inhands/items_lefthand.dmi'; diff --git a/_maps/RandomRuins/LavaRuins/lavaland_surface_biodome_winter.dmm b/_maps/RandomRuins/LavaRuins/lavaland_surface_biodome_winter.dmm index 15c3d93cb826..d4025ce2b216 100644 --- a/_maps/RandomRuins/LavaRuins/lavaland_surface_biodome_winter.dmm +++ b/_maps/RandomRuins/LavaRuins/lavaland_surface_biodome_winter.dmm @@ -10,7 +10,7 @@ "ad" = ( /obj/structure/rack, /obj/item/clothing/shoes/winterboots, -/obj/item/clothing/suit/hooded/wintercoat/solgov, +/obj/item/clothing/suit/hooded/wintercoat/terragov, /obj/item/paper/pamphlet/biodomelore, /turf/open/floor/pod/dark, /area/ruin/unpowered/winter_biodome/entrance) @@ -23,7 +23,7 @@ /turf/open/floor/grass/snow, /area/ruin/unpowered/winter_biodome) "ag" = ( -/obj/machinery/door/airlock/solgov/glass{ +/obj/machinery/door/airlock/terragov/glass{ dir = 4 }, /obj/structure/cable{ @@ -65,7 +65,7 @@ /turf/open/floor/plating/ice, /area/ruin/unpowered/winter_biodome) "am" = ( -/obj/effect/turf_decal/corner/opaque/solgovgold/half, +/obj/effect/turf_decal/corner/opaque/terragovgold/half, /obj/effect/decal/cleanable/dirt/dust, /obj/structure/filingcabinet/chestdrawer, /turf/open/floor/plasteel/white, @@ -101,7 +101,7 @@ }, /area/ruin/unpowered/winter_biodome) "ar" = ( -/obj/effect/turf_decal/corner/opaque/solgovgold/diagonal, +/obj/effect/turf_decal/corner/opaque/terragovgold/diagonal, /obj/effect/decal/cleanable/dirt/dust, /obj/structure/chair/office{ dir = 1 @@ -119,7 +119,7 @@ /turf/open/floor/grass/snow, /area/ruin/unpowered/winter_biodome) "au" = ( -/obj/effect/turf_decal/corner/opaque/solgovgold/three_quarters, +/obj/effect/turf_decal/corner/opaque/terragovgold/three_quarters, /obj/effect/decal/cleanable/dirt/dust, /obj/structure/fluff/paper/stack{ dir = 4 @@ -156,7 +156,7 @@ /turf/open/floor/wood, /area/ruin/unpowered/winter_biodome/cabin) "az" = ( -/obj/effect/turf_decal/corner/opaque/solgovblue/diagonal, +/obj/effect/turf_decal/corner/opaque/terragovblue/diagonal, /turf/open/floor/plasteel/white, /area/ruin/unpowered/winter_biodome/entrance) "aA" = ( @@ -179,7 +179,7 @@ /area/ruin/unpowered/winter_biodome/engineering) "aB" = ( /obj/structure/table/wood, -/obj/effect/turf_decal/corner/opaque/solgovgold/diagonal, +/obj/effect/turf_decal/corner/opaque/terragovgold/diagonal, /obj/item/paper_bin/bundlenatural{ pixel_y = 7 }, @@ -191,7 +191,7 @@ /area/ruin/unpowered/winter_biodome/engineering) "aD" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/structure/sign/solgov_seal{ +/obj/structure/sign/terragov_seal{ pixel_y = 0; pixel_x = 28 }, @@ -201,7 +201,7 @@ /turf/open/floor/pod/light, /area/ruin/unpowered/winter_biodome/entrance) "aE" = ( -/obj/effect/turf_decal/corner/opaque/solgovgold/half, +/obj/effect/turf_decal/corner/opaque/terragovgold/half, /obj/effect/decal/cleanable/dirt/dust, /obj/effect/decal/cleanable/blood/tracks{ dir = 4 @@ -209,7 +209,7 @@ /turf/open/floor/plasteel/white, /area/ruin/unpowered/winter_biodome/living_quarters) "aF" = ( -/obj/effect/turf_decal/corner/opaque/solgovblue/three_quarters{ +/obj/effect/turf_decal/corner/opaque/terragovblue/three_quarters{ dir = 1 }, /obj/effect/decal/cleanable/blood/gibs/up, @@ -229,13 +229,13 @@ /area/ruin/unpowered/winter_biodome/cabin) "aH" = ( /obj/structure/table/wood, -/obj/effect/turf_decal/corner/opaque/solgovgold/diagonal, +/obj/effect/turf_decal/corner/opaque/terragovgold/diagonal, /obj/item/clipboard, -/obj/item/pen/solgov, +/obj/item/pen/terragov, /turf/open/floor/plasteel/white, /area/ruin/unpowered/winter_biodome/entrance) "aI" = ( -/obj/effect/turf_decal/corner/opaque/solgovgold/diagonal, +/obj/effect/turf_decal/corner/opaque/terragovgold/diagonal, /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/plasteel/white, /area/ruin/unpowered/winter_biodome/entrance) @@ -251,7 +251,7 @@ /turf/open/floor/grass/snow, /area/ruin/unpowered/winter_biodome) "aL" = ( -/obj/effect/turf_decal/corner/opaque/solgovgold/half{ +/obj/effect/turf_decal/corner/opaque/terragovgold/half{ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, @@ -327,7 +327,7 @@ /turf/open/floor/grass/snow, /area/ruin/unpowered/winter_biodome) "bs" = ( -/obj/effect/turf_decal/corner/opaque/solgovblue/three_quarters{ +/obj/effect/turf_decal/corner/opaque/terragovblue/three_quarters{ dir = 4 }, /obj/structure/filingcabinet/double, @@ -368,8 +368,8 @@ /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ dir = 1 }, -/obj/item/pen/solgov, -/obj/effect/turf_decal/corner/opaque/solgovgold/diagonal, +/obj/item/pen/terragov, +/obj/effect/turf_decal/corner/opaque/terragovgold/diagonal, /obj/machinery/airalarm/directional/east, /turf/open/floor/plasteel/white, /area/ruin/unpowered/winter_biodome/engineering) @@ -380,7 +380,7 @@ pixel_y = 10; pixel_x = 8 }, -/obj/item/desk_flag/solgov{ +/obj/item/desk_flag/terragov{ pixel_x = -6 }, /turf/open/floor/wood, @@ -440,7 +440,7 @@ /turf/open/floor/wood, /area/ruin/unpowered/winter_biodome/sauna) "cG" = ( -/obj/effect/turf_decal/solgov/wood/top, +/obj/effect/turf_decal/terragov/wood/top, /turf/open/floor/wood, /area/ruin/unpowered/winter_biodome/living_quarters) "cM" = ( @@ -465,7 +465,7 @@ /turf/open/floor/grass/snow, /area/ruin/unpowered/winter_biodome) "cU" = ( -/obj/effect/turf_decal/corner/opaque/solgovblue/half{ +/obj/effect/turf_decal/corner/opaque/terragovblue/half{ dir = 8 }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ @@ -493,7 +493,7 @@ "dl" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/effect/turf_decal/corner/opaque/solgovblue/diagonal, +/obj/effect/turf_decal/corner/opaque/terragovblue/diagonal, /obj/effect/decal/cleanable/dirt/dust, /obj/effect/decal/cleanable/blood/gibs/core, /turf/open/floor/plasteel/white, @@ -504,7 +504,7 @@ /turf/open/floor/pod/light, /area/ruin/unpowered/winter_biodome/entrance) "dq" = ( -/obj/machinery/door/airlock/solgov/glass, +/obj/machinery/door/airlock/terragov/glass, /obj/effect/turf_decal/siding/wood{ dir = 8 }, @@ -516,7 +516,7 @@ /turf/open/floor/plating, /area/ruin/unpowered/winter_biodome/engineering) "dE" = ( -/obj/effect/turf_decal/corner/opaque/solgovblue/three_quarters{ +/obj/effect/turf_decal/corner/opaque/terragovblue/three_quarters{ dir = 4 }, /obj/structure/fluff/hedge/opaque, @@ -575,9 +575,9 @@ /turf/open/floor/grass/snow, /area/ruin/unpowered/winter_biodome) "ek" = ( -/obj/effect/turf_decal/corner/opaque/solgovblue/diagonal, +/obj/effect/turf_decal/corner/opaque/terragovblue/diagonal, /obj/effect/decal/cleanable/dirt/dust, -/obj/item/gun/ballistic/automatic/pistol/solgov, +/obj/item/gun/ballistic/automatic/pistol/terragov, /obj/effect/decal/cleanable/blood/gibs/down, /turf/open/floor/plasteel/white, /area/ruin/unpowered/winter_biodome/living_quarters) @@ -600,7 +600,7 @@ /turf/open/floor/grass/snow, /area/ruin/unpowered/winter_biodome) "ff" = ( -/obj/effect/turf_decal/corner/opaque/solgovgold/three_quarters, +/obj/effect/turf_decal/corner/opaque/terragovgold/three_quarters, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 9 }, @@ -612,7 +612,7 @@ /turf/open/floor/plasteel/white, /area/ruin/unpowered/winter_biodome/living_quarters) "fs" = ( -/obj/structure/sign/solgov_seal{ +/obj/structure/sign/terragov_seal{ pixel_y = 32 }, /turf/open/floor/plating/asteroid/basalt/lava_land_surface/lit, @@ -627,7 +627,7 @@ /obj/structure/cable{ icon_state = "0-2" }, -/obj/effect/turf_decal/corner/opaque/solgovblue/diagonal, +/obj/effect/turf_decal/corner/opaque/terragovblue/diagonal, /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/plasteel/white, /area/ruin/unpowered/winter_biodome/engineering) @@ -645,7 +645,7 @@ /turf/open/floor/grass/snow, /area/ruin/unpowered/winter_biodome) "gz" = ( -/obj/effect/turf_decal/corner/opaque/solgovblue/half{ +/obj/effect/turf_decal/corner/opaque/terragovblue/half{ dir = 8 }, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ @@ -673,7 +673,7 @@ /turf/open/floor/pod/light, /area/ruin/unpowered/winter_biodome/engineering) "gT" = ( -/obj/effect/turf_decal/corner/opaque/solgovblue/half{ +/obj/effect/turf_decal/corner/opaque/terragovblue/half{ dir = 8 }, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ @@ -697,7 +697,7 @@ /area/ruin/unpowered/winter_biodome/sauna) "gZ" = ( /obj/machinery/power/apc/auto_name/directional/west, -/obj/effect/turf_decal/solgov/wood, +/obj/effect/turf_decal/terragov/wood, /obj/structure/cable{ icon_state = "0-2" }, @@ -706,7 +706,7 @@ /turf/open/floor/wood, /area/ruin/unpowered/winter_biodome/living_quarters) "hw" = ( -/obj/effect/turf_decal/corner/opaque/solgovgold, +/obj/effect/turf_decal/corner/opaque/terragovgold, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 4 }, @@ -727,20 +727,20 @@ dir = 4 }, /obj/effect/decal/cleanable/dirt/dust, -/obj/effect/mob_spawn/human/corpse/solgov{ - outfit = /datum/outfit/job/solgov/assistant +/obj/effect/mob_spawn/human/corpse/terragov{ + outfit = /datum/outfit/job/terragov/assistant }, /obj/effect/decal/cleanable/blood/gibs/down, /turf/open/floor/wood, /area/ruin/unpowered/winter_biodome/cabin) "hE" = ( -/obj/machinery/door/airlock/solgov{ +/obj/machinery/door/airlock/terragov{ dir = 4 }, /turf/open/floor/pod/dark, /area/ruin/unpowered/winter_biodome/entrance) "hI" = ( -/obj/effect/turf_decal/corner/opaque/solgovblue{ +/obj/effect/turf_decal/corner/opaque/terragovblue{ dir = 1 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, @@ -759,7 +759,7 @@ /turf/open/floor/pod/dark, /area/ruin/unpowered/winter_biodome/cabin) "iv" = ( -/obj/effect/turf_decal/corner/opaque/solgovgold, +/obj/effect/turf_decal/corner/opaque/terragovgold, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 9 }, @@ -783,7 +783,7 @@ /turf/open/floor/wood, /area/ruin/unpowered/winter_biodome/living_quarters) "iP" = ( -/obj/machinery/door/airlock/solgov/glass, +/obj/machinery/door/airlock/terragov/glass, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/effect/turf_decal/siding/wood{ @@ -805,7 +805,7 @@ /turf/open/floor/plating, /area/ruin/unpowered/winter_biodome/engineering) "jG" = ( -/obj/structure/sign/solgov_seal{ +/obj/structure/sign/terragov_seal{ pixel_y = 32 }, /obj/structure/flora/ash, @@ -847,7 +847,7 @@ /turf/open/floor/pod/dark, /area/ruin/unpowered/winter_biodome/engineering) "ks" = ( -/obj/effect/turf_decal/corner/opaque/solgovgold/half{ +/obj/effect/turf_decal/corner/opaque/terragovgold/half{ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, @@ -863,7 +863,7 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 10 }, -/obj/structure/sign/solgov_seal{ +/obj/structure/sign/terragov_seal{ pixel_y = 0; pixel_x = 28 }, @@ -871,7 +871,7 @@ /turf/open/floor/pod/dark, /area/ruin/unpowered/winter_biodome/engineering) "kQ" = ( -/obj/effect/turf_decal/corner/opaque/solgovgold/three_quarters{ +/obj/effect/turf_decal/corner/opaque/terragovgold/three_quarters{ dir = 4 }, /obj/structure/cable{ @@ -886,7 +886,7 @@ /turf/open/floor/wood, /area/ruin/unpowered/winter_biodome/cabin) "kX" = ( -/obj/effect/turf_decal/corner/opaque/solgovblue{ +/obj/effect/turf_decal/corner/opaque/terragovblue{ dir = 1 }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ @@ -900,7 +900,7 @@ /turf/open/floor/plasteel/white, /area/ruin/unpowered/winter_biodome/living_quarters) "lq" = ( -/obj/effect/turf_decal/corner/opaque/solgovgold/half{ +/obj/effect/turf_decal/corner/opaque/terragovgold/half{ dir = 4 }, /obj/effect/decal/cleanable/dirt/dust, @@ -915,7 +915,7 @@ /turf/open/floor/plating/grass/lava/orange, /area/overmap_encounter/planetoid/lava/explored) "lX" = ( -/obj/effect/turf_decal/corner/opaque/solgovgold/three_quarters{ +/obj/effect/turf_decal/corner/opaque/terragovgold/three_quarters{ dir = 1 }, /obj/structure/cable{ @@ -937,7 +937,7 @@ /turf/open/floor/wood, /area/ruin/unpowered/winter_biodome/cabin) "mb" = ( -/obj/machinery/door/airlock/solgov, +/obj/machinery/door/airlock/terragov, /turf/open/floor/pod/dark, /area/ruin/unpowered/winter_biodome/living_quarters) "mq" = ( @@ -950,7 +950,7 @@ /turf/open/floor/pod/light, /area/ruin/unpowered/winter_biodome/engineering) "mD" = ( -/obj/effect/turf_decal/solgov/wood/center, +/obj/effect/turf_decal/terragov/wood/center, /obj/effect/decal/cleanable/dirt/dust, /mob/living/simple_animal/hostile/asteroid/hivelord/legion/tendril, /turf/open/floor/wood, @@ -960,7 +960,7 @@ /turf/open/floor/plating/grass/lava, /area/overmap_encounter/planetoid/lava/explored) "nf" = ( -/obj/effect/turf_decal/corner/opaque/solgovblue/half{ +/obj/effect/turf_decal/corner/opaque/terragovblue/half{ dir = 1 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ @@ -979,7 +979,7 @@ /turf/open/floor/wood, /area/ruin/unpowered/winter_biodome/cabin) "nv" = ( -/obj/effect/turf_decal/solgov/wood/bottom_center, +/obj/effect/turf_decal/terragov/wood/bottom_center, /turf/open/floor/wood, /area/ruin/unpowered/winter_biodome/living_quarters) "nZ" = ( @@ -1004,7 +1004,7 @@ /turf/open/floor/pod/dark, /area/ruin/unpowered/winter_biodome/engineering) "oR" = ( -/obj/effect/turf_decal/corner/opaque/solgovblue/diagonal, +/obj/effect/turf_decal/corner/opaque/terragovblue/diagonal, /obj/structure/closet/secure_closet/freezer, /obj/item/reagent_containers/food/snacks/store/bread/plain, /obj/item/reagent_containers/food/snacks/store/bread/plain, @@ -1046,7 +1046,7 @@ /turf/open/floor/wood, /area/ruin/unpowered/winter_biodome/living_quarters) "pQ" = ( -/obj/effect/turf_decal/corner/opaque/solgovgold, +/obj/effect/turf_decal/corner/opaque/terragovgold, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/effect/decal/cleanable/dirt/dust, @@ -1056,7 +1056,7 @@ /turf/open/floor/plasteel/white, /area/ruin/unpowered/winter_biodome/living_quarters) "pW" = ( -/obj/effect/turf_decal/corner/opaque/solgovgold, +/obj/effect/turf_decal/corner/opaque/terragovgold, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 4 }, @@ -1070,7 +1070,7 @@ /turf/open/floor/plasteel/white, /area/ruin/unpowered/winter_biodome/living_quarters) "qj" = ( -/obj/effect/turf_decal/corner/opaque/solgovblue/diagonal, +/obj/effect/turf_decal/corner/opaque/terragovblue/diagonal, /obj/structure/table/wood, /obj/item/kitchen/knife, /turf/open/floor/plasteel/white, @@ -1079,7 +1079,7 @@ /obj/structure/cable{ icon_state = "1-2" }, -/obj/effect/turf_decal/corner/opaque/solgovgold/diagonal, +/obj/effect/turf_decal/corner/opaque/terragovgold/diagonal, /obj/effect/decal/cleanable/dirt/dust, /mob/living/simple_animal/hostile/asteroid/hivelord/legion/tendril, /turf/open/floor/plasteel/white, @@ -1101,7 +1101,7 @@ /turf/open/floor/pod/dark, /area/ruin/unpowered/winter_biodome/engineering) "qZ" = ( -/obj/effect/turf_decal/corner/opaque/solgovblue/three_quarters{ +/obj/effect/turf_decal/corner/opaque/terragovblue/three_quarters{ dir = 1 }, /obj/structure/table/wood, @@ -1120,7 +1120,7 @@ /turf/open/floor/pod/dark, /area/ruin/unpowered/winter_biodome/living_quarters) "rm" = ( -/obj/effect/turf_decal/corner/opaque/solgovblue/three_quarters{ +/obj/effect/turf_decal/corner/opaque/terragovblue/three_quarters{ dir = 4 }, /obj/effect/decal/cleanable/dirt/dust, @@ -1141,14 +1141,14 @@ }, /area/ruin/unpowered/winter_biodome) "rC" = ( -/obj/effect/turf_decal/solgov/wood/bottom_left, +/obj/effect/turf_decal/terragov/wood/bottom_left, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/effect/decal/cleanable/blood/drip, /turf/open/floor/wood, /area/ruin/unpowered/winter_biodome/living_quarters) "rD" = ( -/obj/effect/turf_decal/corner/opaque/solgovgold/three_quarters, +/obj/effect/turf_decal/corner/opaque/terragovgold/three_quarters, /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/plasteel/white, /area/ruin/unpowered/winter_biodome/engineering) @@ -1179,7 +1179,7 @@ /turf/open/floor/carpet/blue, /area/ruin/unpowered/winter_biodome/cabin) "sE" = ( -/obj/effect/turf_decal/corner/opaque/solgovblue{ +/obj/effect/turf_decal/corner/opaque/terragovblue{ dir = 1 }, /obj/effect/decal/cleanable/dirt/dust, @@ -1189,7 +1189,7 @@ /turf/open/floor/plasteel/white, /area/ruin/unpowered/winter_biodome/living_quarters) "sV" = ( -/obj/effect/turf_decal/corner/opaque/solgovblue/diagonal, +/obj/effect/turf_decal/corner/opaque/terragovblue/diagonal, /obj/effect/decal/cleanable/dirt/dust, /obj/effect/decal/cleanable/blood/splatter, /turf/open/floor/plasteel/white, @@ -1237,7 +1237,7 @@ /turf/open/floor/grass/snow, /area/ruin/unpowered/winter_biodome) "uH" = ( -/obj/machinery/door/airlock/solgov, +/obj/machinery/door/airlock/terragov, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /turf/open/floor/pod/dark, @@ -1254,7 +1254,7 @@ /obj/structure/cable{ icon_state = "0-8" }, -/obj/effect/turf_decal/corner/opaque/solgovgold/diagonal, +/obj/effect/turf_decal/corner/opaque/terragovgold/diagonal, /obj/effect/decal/cleanable/dirt/dust, /obj/structure/table/wood, /obj/item/paper/pamphlet/biodomelore, @@ -1274,7 +1274,7 @@ /turf/open/floor/grass/snow, /area/ruin/unpowered/winter_biodome) "uY" = ( -/obj/effect/turf_decal/corner/opaque/solgovgold/three_quarters, +/obj/effect/turf_decal/corner/opaque/terragovgold/three_quarters, /obj/structure/closet/crate/bin, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 9 @@ -1316,7 +1316,7 @@ /area/ruin/unpowered/winter_biodome/cabin) "vQ" = ( /obj/machinery/light/small/directional/north, -/obj/effect/turf_decal/corner/opaque/solgovblue/diagonal, +/obj/effect/turf_decal/corner/opaque/terragovblue/diagonal, /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/plasteel/white, /area/ruin/unpowered/winter_biodome/entrance) @@ -1340,7 +1340,7 @@ /turf/open/floor/plating/grass/lava, /area/overmap_encounter/planetoid/lava/explored) "xp" = ( -/obj/effect/turf_decal/corner/opaque/solgovblue/half{ +/obj/effect/turf_decal/corner/opaque/terragovblue/half{ dir = 1 }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ @@ -1405,7 +1405,7 @@ /area/ruin/unpowered/winter_biodome/living_quarters) "yf" = ( /obj/structure/table/wood, -/obj/effect/turf_decal/corner/opaque/solgovgold/diagonal, +/obj/effect/turf_decal/corner/opaque/terragovgold/diagonal, /obj/item/papercutter{ pixel_x = 3; pixel_y = 5 @@ -1422,7 +1422,7 @@ "yY" = ( /obj/structure/rack, /obj/item/clothing/shoes/winterboots, -/obj/item/clothing/suit/hooded/wintercoat/solgov, +/obj/item/clothing/suit/hooded/wintercoat/terragov, /turf/open/floor/pod/dark, /area/ruin/unpowered/winter_biodome/entrance) "zf" = ( @@ -1433,7 +1433,7 @@ /turf/open/floor/grass/snow, /area/ruin/unpowered/winter_biodome) "zm" = ( -/obj/effect/turf_decal/corner/opaque/solgovblue/three_quarters{ +/obj/effect/turf_decal/corner/opaque/terragovblue/three_quarters{ dir = 1 }, /obj/effect/decal/cleanable/dirt/dust, @@ -1497,12 +1497,12 @@ /area/overmap_encounter/planetoid/lava/explored) "AU" = ( /obj/structure/table/wood, -/obj/item/desk_flag/solgov, +/obj/item/desk_flag/terragov, /turf/open/floor/wood, /area/ruin/unpowered/winter_biodome/living_quarters) "Bk" = ( /obj/structure/chair/office, -/obj/effect/turf_decal/corner/opaque/solgovgold/diagonal, +/obj/effect/turf_decal/corner/opaque/terragovgold/diagonal, /obj/effect/decal/cleanable/blood/splatter, /turf/open/floor/plasteel/white, /area/ruin/unpowered/winter_biodome/engineering) @@ -1551,7 +1551,7 @@ }, /area/ruin/unpowered/winter_biodome) "BV" = ( -/obj/effect/turf_decal/corner/opaque/solgovblue{ +/obj/effect/turf_decal/corner/opaque/terragovblue{ dir = 1 }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ @@ -1656,7 +1656,7 @@ /obj/item/paper_bin/bundlenatural{ pixel_y = 7 }, -/obj/item/pen/solgov, +/obj/item/pen/terragov, /turf/open/floor/wood, /area/ruin/unpowered/winter_biodome/living_quarters) "Ez" = ( @@ -1703,7 +1703,7 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 9 }, -/obj/structure/sign/solgov_seal{ +/obj/structure/sign/terragov_seal{ pixel_y = 0; pixel_x = 28 }, @@ -1755,7 +1755,7 @@ /obj/effect/turf_decal/siding/wood{ dir = 5 }, -/obj/structure/sign/solgov_flag{ +/obj/structure/sign/terragov_flag{ pixel_y = 29 }, /turf/open/floor/wood, @@ -1781,7 +1781,7 @@ /turf/open/floor/pod/dark, /area/ruin/unpowered/winter_biodome/engineering) "Hd" = ( -/obj/effect/turf_decal/corner/opaque/solgovgold/three_quarters, +/obj/effect/turf_decal/corner/opaque/terragovgold/three_quarters, /obj/structure/fluff/paper/stack{ dir = 8 }, @@ -1808,7 +1808,7 @@ /turf/open/floor/pod/dark, /area/ruin/unpowered/winter_biodome/living_quarters) "HG" = ( -/obj/effect/turf_decal/corner/opaque/solgovblue/three_quarters{ +/obj/effect/turf_decal/corner/opaque/terragovblue/three_quarters{ dir = 4 }, /obj/structure/fluff/hedge/opaque, @@ -1832,8 +1832,8 @@ "IY" = ( /obj/structure/rack, /obj/item/clothing/shoes/winterboots, -/obj/item/clothing/suit/hooded/wintercoat/solgov, -/obj/effect/turf_decal/corner/opaque/solgovblue/diagonal, +/obj/item/clothing/suit/hooded/wintercoat/terragov, +/obj/effect/turf_decal/corner/opaque/terragovblue/diagonal, /turf/open/floor/plasteel/white, /area/ruin/unpowered/winter_biodome/engineering) "Jl" = ( @@ -1843,7 +1843,7 @@ /obj/structure/cable{ icon_state = "1-2" }, -/obj/effect/turf_decal/corner/opaque/solgovgold/diagonal, +/obj/effect/turf_decal/corner/opaque/terragovgold/diagonal, /obj/effect/decal/cleanable/dirt/dust, /obj/effect/decal/cleanable/blood/gibs/down, /turf/open/floor/plasteel/white, @@ -1856,7 +1856,7 @@ /turf/open/floor/grass/snow, /area/ruin/unpowered/winter_biodome) "JH" = ( -/obj/effect/turf_decal/corner/opaque/solgovblue/diagonal, +/obj/effect/turf_decal/corner/opaque/terragovblue/diagonal, /obj/structure/table/wood, /obj/item/cutting_board, /obj/effect/decal/cleanable/dirt/dust, @@ -1892,7 +1892,7 @@ /turf/open/floor/plating, /area/ruin/unpowered/winter_biodome/engineering) "Kn" = ( -/obj/effect/turf_decal/corner/opaque/solgovgold, +/obj/effect/turf_decal/corner/opaque/terragovgold, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/effect/decal/cleanable/dirt/dust, @@ -1929,13 +1929,13 @@ /turf/open/floor/grass/snow, /area/ruin/unpowered/winter_biodome) "Lt" = ( -/obj/effect/turf_decal/solgov/wood/bottom_right, +/obj/effect/turf_decal/terragov/wood/bottom_right, /obj/structure/chair/office, /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/wood, /area/ruin/unpowered/winter_biodome/living_quarters) "LM" = ( -/obj/machinery/door/airlock/solgov/glass{ +/obj/machinery/door/airlock/terragov/glass{ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ @@ -1961,7 +1961,7 @@ /turf/open/floor/grass/snow, /area/ruin/unpowered/winter_biodome) "Ml" = ( -/obj/effect/turf_decal/solgov/wood/top_right, +/obj/effect/turf_decal/terragov/wood/top_right, /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/wood, /area/ruin/unpowered/winter_biodome/living_quarters) @@ -1977,7 +1977,7 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/door/airlock/solgov/glass{ +/obj/machinery/door/airlock/terragov/glass{ dir = 4 }, /obj/structure/cable{ @@ -1989,12 +1989,12 @@ /turf/open/floor/wood, /area/ruin/unpowered/winter_biodome/engineering) "MB" = ( -/obj/effect/turf_decal/corner/opaque/solgovgold/diagonal, +/obj/effect/turf_decal/corner/opaque/terragovgold/diagonal, /obj/structure/closet/emcloset/wall/directional/south, /turf/open/floor/plasteel/white, /area/ruin/unpowered/winter_biodome/entrance) "MJ" = ( -/obj/effect/turf_decal/corner/opaque/solgovblue/half{ +/obj/effect/turf_decal/corner/opaque/terragovblue/half{ dir = 8 }, /obj/effect/decal/cleanable/dirt/dust, @@ -2010,7 +2010,7 @@ /turf/open/floor/grass/snow, /area/ruin/unpowered/winter_biodome) "Nc" = ( -/obj/effect/turf_decal/solgov/wood/center_right, +/obj/effect/turf_decal/terragov/wood/center_right, /obj/effect/decal/cleanable/dirt/dust, /obj/machinery/light/broken/directional/east, /turf/open/floor/wood, @@ -2052,7 +2052,7 @@ "NF" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/effect/turf_decal/corner/opaque/solgovblue/diagonal, +/obj/effect/turf_decal/corner/opaque/terragovblue/diagonal, /obj/effect/decal/cleanable/dirt/dust, /obj/machinery/light/small/broken/directional/west, /obj/effect/decal/cleanable/blood/drip, @@ -2067,7 +2067,7 @@ /turf/open/floor/wood, /area/ruin/unpowered/winter_biodome/living_quarters) "Os" = ( -/obj/effect/turf_decal/corner/opaque/solgovblue/diagonal, +/obj/effect/turf_decal/corner/opaque/terragovblue/diagonal, /obj/machinery/airalarm/directional/north, /obj/effect/decal/cleanable/dirt/dust, /obj/effect/decal/cleanable/blood/splatter, @@ -2075,7 +2075,7 @@ /turf/open/floor/plasteel/white, /area/ruin/unpowered/winter_biodome/entrance) "Oz" = ( -/obj/structure/sign/solgov_flag{ +/obj/structure/sign/terragov_flag{ pixel_y = 29 }, /obj/structure/filingcabinet/chestdrawer, @@ -2088,7 +2088,7 @@ /turf/open/floor/wood, /area/ruin/unpowered/winter_biodome/cabin) "OL" = ( -/obj/effect/turf_decal/corner/opaque/solgovgold/three_quarters{ +/obj/effect/turf_decal/corner/opaque/terragovgold/three_quarters{ dir = 8 }, /obj/structure/cable{ @@ -2107,7 +2107,7 @@ /area/ruin/unpowered/winter_biodome/living_quarters) "OS" = ( /obj/machinery/light/small/directional/south, -/obj/effect/turf_decal/corner/opaque/solgovgold/diagonal, +/obj/effect/turf_decal/corner/opaque/terragovgold/diagonal, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 4 }, @@ -2121,7 +2121,7 @@ /turf/open/floor/wood, /area/ruin/unpowered/winter_biodome/living_quarters) "Pa" = ( -/obj/effect/turf_decal/corner/opaque/solgovblue/three_quarters{ +/obj/effect/turf_decal/corner/opaque/terragovblue/three_quarters{ dir = 1 }, /obj/structure/sink/kitchen{ @@ -2131,10 +2131,10 @@ /turf/open/floor/plasteel/white, /area/ruin/unpowered/winter_biodome/living_quarters) "Po" = ( -/obj/machinery/computer/monitor/solgov{ +/obj/machinery/computer/monitor/terragov{ dir = 1 }, -/obj/effect/turf_decal/corner/opaque/solgovgold/diagonal, +/obj/effect/turf_decal/corner/opaque/terragovgold/diagonal, /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/plasteel/white, /area/ruin/unpowered/winter_biodome/engineering) @@ -2162,7 +2162,7 @@ /turf/closed/wall/mineral/titanium/nodiagonal, /area/ruin/unpowered/winter_biodome/engineering) "PU" = ( -/obj/effect/turf_decal/corner/opaque/solgovblue/half{ +/obj/effect/turf_decal/corner/opaque/terragovblue/half{ dir = 1 }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ @@ -2174,7 +2174,7 @@ /turf/open/floor/plasteel/white, /area/ruin/unpowered/winter_biodome/living_quarters) "Qa" = ( -/obj/effect/turf_decal/corner/opaque/solgovgold/three_quarters, +/obj/effect/turf_decal/corner/opaque/terragovgold/three_quarters, /obj/machinery/vending/coffee, /turf/open/floor/plasteel/white, /area/ruin/unpowered/winter_biodome/living_quarters) @@ -2207,7 +2207,7 @@ /turf/open/floor/pod/dark, /area/ruin/unpowered/winter_biodome/living_quarters) "QJ" = ( -/obj/effect/turf_decal/corner/opaque/solgovblue/half{ +/obj/effect/turf_decal/corner/opaque/terragovblue/half{ dir = 1 }, /obj/effect/decal/cleanable/dirt/dust, @@ -2268,13 +2268,13 @@ /turf/open/floor/grass/snow, /area/ruin/unpowered/winter_biodome) "Rs" = ( -/obj/effect/turf_decal/corner/opaque/solgovgold/half, +/obj/effect/turf_decal/corner/opaque/terragovgold/half, /obj/structure/fluff/hedge/opaque, /obj/machinery/light/broken/directional/south, /turf/open/floor/plasteel/white, /area/ruin/unpowered/winter_biodome/living_quarters) "Rt" = ( -/obj/effect/turf_decal/corner/opaque/solgovgold/three_quarters, +/obj/effect/turf_decal/corner/opaque/terragovgold/three_quarters, /obj/structure/fluff/hedge/opaque, /turf/open/floor/plasteel/white, /area/ruin/unpowered/winter_biodome/living_quarters) @@ -2306,7 +2306,7 @@ /turf/open/floor/wood, /area/ruin/unpowered/winter_biodome/engineering) "RR" = ( -/obj/effect/turf_decal/corner/opaque/solgovblue/diagonal, +/obj/effect/turf_decal/corner/opaque/terragovblue/diagonal, /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/plasteel/white, /area/ruin/unpowered/winter_biodome/entrance) @@ -2326,7 +2326,7 @@ /turf/open/floor/grass/snow, /area/ruin/unpowered/winter_biodome) "ST" = ( -/obj/effect/turf_decal/corner/opaque/solgovblue{ +/obj/effect/turf_decal/corner/opaque/terragovblue{ dir = 1 }, /obj/effect/decal/cleanable/dirt/dust, @@ -2336,14 +2336,14 @@ /turf/open/floor/plasteel/white, /area/ruin/unpowered/winter_biodome/living_quarters) "SY" = ( -/obj/effect/turf_decal/corner/opaque/solgovgold/three_quarters, +/obj/effect/turf_decal/corner/opaque/terragovgold/three_quarters, /turf/open/floor/plasteel/white, /area/ruin/unpowered/winter_biodome/living_quarters) "Tf" = ( /turf/open/floor/plating/grass/lava/orange, /area/overmap_encounter/planetoid/lava/explored) "Tj" = ( -/obj/effect/turf_decal/corner/opaque/solgovgold/diagonal, +/obj/effect/turf_decal/corner/opaque/terragovgold/diagonal, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 4 }, @@ -2389,7 +2389,7 @@ /turf/open/floor/wood, /area/ruin/unpowered/winter_biodome/living_quarters) "Uv" = ( -/obj/effect/turf_decal/solgov/wood/center_left, +/obj/effect/turf_decal/terragov/wood/center_left, /obj/structure/cable{ icon_state = "1-8" }, @@ -2419,7 +2419,7 @@ /turf/closed/wall/r_wall, /area/ruin/unpowered/winter_biodome/engineering) "UM" = ( -/obj/machinery/door/airlock/solgov{ +/obj/machinery/door/airlock/terragov{ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ @@ -2431,7 +2431,7 @@ /turf/open/floor/pod/dark, /area/ruin/unpowered/winter_biodome/entrance) "UT" = ( -/obj/effect/turf_decal/corner/opaque/solgovgold, +/obj/effect/turf_decal/corner/opaque/terragovgold, /obj/effect/decal/cleanable/dirt/dust, /obj/effect/decal/cleanable/blood/tracks{ dir = 4 @@ -2477,7 +2477,7 @@ }, /area/ruin/unpowered/winter_biodome) "VP" = ( -/obj/effect/turf_decal/corner/opaque/solgovblue/diagonal, +/obj/effect/turf_decal/corner/opaque/terragovblue/diagonal, /obj/machinery/light/directional/west, /obj/item/ammo_box/magazine/pistol556mm{ pixel_x = 7 @@ -2565,7 +2565,7 @@ /turf/open/floor/wood, /area/ruin/unpowered/winter_biodome/sauna) "Yi" = ( -/obj/effect/turf_decal/corner/opaque/solgovgold/half{ +/obj/effect/turf_decal/corner/opaque/terragovgold/half{ dir = 4 }, /obj/effect/decal/cleanable/blood/drip, @@ -2597,7 +2597,7 @@ /turf/open/floor/wood, /area/ruin/unpowered/winter_biodome/cabin) "Zw" = ( -/obj/effect/turf_decal/corner/opaque/solgovgold/half, +/obj/effect/turf_decal/corner/opaque/terragovgold/half, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ dir = 1 }, diff --git a/_maps/RandomRuins/RockRuins/rockplanet_shippingdock.dmm b/_maps/RandomRuins/RockRuins/rockplanet_shippingdock.dmm index 6bb4f2e48c99..0b69862d6c16 100644 --- a/_maps/RandomRuins/RockRuins/rockplanet_shippingdock.dmm +++ b/_maps/RandomRuins/RockRuins/rockplanet_shippingdock.dmm @@ -535,7 +535,7 @@ /obj/structure/window/reinforced{ dir = 1 }, -/obj/effect/turf_decal/trimline/opaque/solgovgold, +/obj/effect/turf_decal/trimline/opaque/terragovgold, /turf/open/floor/plasteel/mono/white, /area/ruin/rockplanet/shippingdockwarehouse) "fx" = ( diff --git a/_maps/RandomRuins/SpaceRuins/power_puzzle.dmm b/_maps/RandomRuins/SpaceRuins/power_puzzle.dmm index b76ae63a86e7..586c37670a51 100644 --- a/_maps/RandomRuins/SpaceRuins/power_puzzle.dmm +++ b/_maps/RandomRuins/SpaceRuins/power_puzzle.dmm @@ -477,7 +477,7 @@ /obj/item/flashlight/lamp{ pixel_y = 6 }, -/obj/effect/turf_decal/trimline/transparent/solgovgold/filled/line{ +/obj/effect/turf_decal/trimline/transparent/terragovgold/filled/line{ dir = 1 }, /turf/open/floor/plasteel, @@ -622,7 +622,7 @@ /area/ruin/space/has_grav/powerpuzzle/secure) "cm" = ( /obj/machinery/computer/monitor, -/obj/effect/turf_decal/trimline/transparent/solgovgold/filled/line{ +/obj/effect/turf_decal/trimline/transparent/terragovgold/filled/line{ dir = 1 }, /obj/structure/cable{ @@ -655,7 +655,7 @@ /obj/structure/sign/poster/contraband/power{ pixel_y = -30 }, -/obj/effect/turf_decal/trimline/transparent/solgovgold/filled/line, +/obj/effect/turf_decal/trimline/transparent/terragovgold/filled/line, /obj/item/multitool{ pixel_y = 5 }, @@ -819,7 +819,7 @@ "cQ" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, -/obj/effect/turf_decal/corner/transparent/solgovgold/diagonal, +/obj/effect/turf_decal/corner/transparent/terragovgold/diagonal, /obj/structure/cable{ icon_state = "1-2" }, @@ -848,7 +848,7 @@ icon_state = "1-2" }, /obj/effect/decal/cleanable/dirt, -/obj/effect/turf_decal/corner/transparent/solgovgold/diagonal, +/obj/effect/turf_decal/corner/transparent/terragovgold/diagonal, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{ dir = 6 }, @@ -915,7 +915,7 @@ /obj/structure/cable{ icon_state = "1-8" }, -/obj/effect/turf_decal/trimline/transparent/solgovgold/filled/warning{ +/obj/effect/turf_decal/trimline/transparent/terragovgold/filled/warning{ dir = 4 }, /obj/structure/cable{ @@ -973,7 +973,7 @@ /obj/structure/cable{ icon_state = "1-2" }, -/obj/effect/turf_decal/trimline/transparent/solgovgold/filled/warning{ +/obj/effect/turf_decal/trimline/transparent/terragovgold/filled/warning{ dir = 5 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2, @@ -1241,7 +1241,7 @@ /area/ruin/space/has_grav/powerpuzzle/engineering) "jQ" = ( /obj/machinery/vending/engivend, -/obj/effect/turf_decal/trimline/transparent/solgovgold/filled/warning{ +/obj/effect/turf_decal/trimline/transparent/terragovgold/filled/warning{ dir = 6 }, /turf/open/floor/plasteel, @@ -1267,7 +1267,7 @@ /area/ruin/space/has_grav/powerpuzzle) "kz" = ( /obj/structure/closet/toolcloset, -/obj/effect/turf_decal/trimline/transparent/solgovgold/filled/line{ +/obj/effect/turf_decal/trimline/transparent/terragovgold/filled/line{ dir = 10 }, /turf/open/floor/plasteel, @@ -1362,7 +1362,7 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{ dir = 4 }, -/obj/effect/turf_decal/corner/transparent/solgovgold/diagonal, +/obj/effect/turf_decal/corner/transparent/terragovgold/diagonal, /obj/effect/turf_decal/industrial/warning, /turf/open/floor/plasteel, /area/ruin/space/has_grav/powerpuzzle/engineering) @@ -2492,7 +2492,7 @@ /obj/item/wirecutters{ pixel_y = 15 }, -/obj/effect/turf_decal/corner/transparent/solgovgold/diagonal, +/obj/effect/turf_decal/corner/transparent/terragovgold/diagonal, /obj/effect/turf_decal/industrial/warning, /turf/open/floor/plasteel, /area/ruin/space/has_grav/powerpuzzle/engineering) @@ -2930,7 +2930,7 @@ pixel_x = 15; pixel_y = 5 }, -/obj/effect/turf_decal/trimline/transparent/solgovgold/filled/line{ +/obj/effect/turf_decal/trimline/transparent/terragovgold/filled/line{ dir = 9 }, /turf/open/floor/plasteel, @@ -3751,7 +3751,7 @@ /area/template_noop) "YN" = ( /obj/effect/decal/cleanable/dirt, -/obj/effect/turf_decal/trimline/transparent/solgovgold/filled/line{ +/obj/effect/turf_decal/trimline/transparent/terragovgold/filled/line{ dir = 8 }, /obj/machinery/power/apc/auto_name/directional/west{ @@ -3778,7 +3778,7 @@ pixel_y = 5 }, /obj/item/storage/toolbox/mechanical, -/obj/effect/turf_decal/trimline/transparent/solgovgold/filled/line, +/obj/effect/turf_decal/trimline/transparent/terragovgold/filled/line, /obj/machinery/light/dim/directional/south, /turf/open/floor/plasteel, /area/ruin/space/has_grav/powerpuzzle/engineering) diff --git a/_maps/RandomRuins/SpaceRuins/spacemall.dmm b/_maps/RandomRuins/SpaceRuins/spacemall.dmm index fe4d604dd785..3010d828b041 100644 --- a/_maps/RandomRuins/SpaceRuins/spacemall.dmm +++ b/_maps/RandomRuins/SpaceRuins/spacemall.dmm @@ -131,7 +131,7 @@ /area/ruin/space/has_grav/spacemall/maint) "aC" = ( /obj/effect/turf_decal/corner/transparent/black/diagonal, -/obj/effect/turf_decal/road/line/transparent/solgovblue, +/obj/effect/turf_decal/road/line/transparent/terragovblue, /obj/structure/cable{ icon_state = "2-8" }, @@ -598,7 +598,7 @@ /obj/machinery/door/window/brigdoor{ dir = 8 }, -/obj/effect/turf_decal/corner/transparent/solgovgold/three_quarters{ +/obj/effect/turf_decal/corner/transparent/terragovgold/three_quarters{ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{ @@ -1089,7 +1089,7 @@ /turf/open/floor/plasteel/dark, /area/ruin/space/has_grav/spacemall) "eg" = ( -/obj/effect/turf_decal/corner/transparent/solgovgold{ +/obj/effect/turf_decal/corner/transparent/terragovgold{ dir = 10 }, /obj/machinery/disposal/bin, @@ -1320,7 +1320,7 @@ /obj/structure/window/reinforced/spawner{ dir = 8 }, -/obj/effect/turf_decal/corner/transparent/solgovgold{ +/obj/effect/turf_decal/corner/transparent/terragovgold{ dir = 9 }, /turf/open/floor/plasteel, @@ -1390,7 +1390,7 @@ /area/ruin/space/has_grav/spacemall/shop) "fh" = ( /obj/structure/rack, -/obj/effect/turf_decal/corner/transparent/solgovgold/full, +/obj/effect/turf_decal/corner/transparent/terragovgold/full, /obj/effect/decal/cleanable/cobweb/cobweb2, /obj/effect/decal/cleanable/dirt/dust, /obj/item/stack/cable_coil/random/five, @@ -1966,7 +1966,7 @@ /area/ruin/space/has_grav/spacemall/shop) "hE" = ( /obj/structure/rack, -/obj/effect/turf_decal/corner/transparent/solgovgold/full, +/obj/effect/turf_decal/corner/transparent/terragovgold/full, /obj/effect/decal/cleanable/dirt/dust, /obj/item/storage/part_replacer/bluespace, /turf/open/floor/plasteel, @@ -2243,9 +2243,9 @@ /turf/open/floor/plating, /area/ruin/space/has_grav/spacemall/maint) "iJ" = ( -/obj/effect/turf_decal/trimline/opaque/solgovblue/arrow_cw, +/obj/effect/turf_decal/trimline/opaque/terragovblue/arrow_cw, /obj/effect/turf_decal/corner/transparent/black/diagonal, -/obj/effect/turf_decal/road/line/transparent/solgovblue, +/obj/effect/turf_decal/road/line/transparent/terragovblue, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{ dir = 4 }, @@ -2454,7 +2454,7 @@ /turf/open/floor/carpet/green, /area/ruin/space/has_grav/spacemall/maint) "jp" = ( -/obj/effect/turf_decal/road/line/transparent/solgovblue, +/obj/effect/turf_decal/road/line/transparent/terragovblue, /obj/structure/rack, /obj/effect/turf_decal/corner/transparent/black/diagonal, /obj/item/toy/braintoy, @@ -2528,7 +2528,7 @@ /obj/structure/window/reinforced/spawner{ dir = 1 }, -/obj/effect/turf_decal/corner/transparent/solgovgold{ +/obj/effect/turf_decal/corner/transparent/terragovgold{ dir = 5 }, /turf/open/floor/plasteel, @@ -2955,7 +2955,7 @@ /turf/open/floor/plasteel/showroomfloor, /area/ruin/space/has_grav/spacemall/shop2) "lp" = ( -/obj/effect/turf_decal/corner/transparent/solgovgold/three_quarters{ +/obj/effect/turf_decal/corner/transparent/terragovgold/three_quarters{ dir = 8 }, /obj/structure/cable{ @@ -4001,7 +4001,7 @@ /area/ruin/space/has_grav/spacemall) "pl" = ( /obj/item/banner/engineering, -/obj/effect/turf_decal/corner/transparent/solgovgold/diagonal, +/obj/effect/turf_decal/corner/transparent/terragovgold/diagonal, /turf/open/floor/plasteel, /area/ruin/space/has_grav/spacemall/shop) "pm" = ( @@ -4739,7 +4739,7 @@ /turf/open/floor/plating, /area/ruin/space/has_grav/spacemall/maint) "rM" = ( -/obj/effect/turf_decal/corner/transparent/solgovgold{ +/obj/effect/turf_decal/corner/transparent/terragovgold{ dir = 6 }, /obj/structure/cable{ @@ -4882,7 +4882,7 @@ /obj/machinery/door/window/brigdoor{ dir = 1 }, -/obj/effect/turf_decal/corner/transparent/solgovgold{ +/obj/effect/turf_decal/corner/transparent/terragovgold{ dir = 5 }, /turf/open/floor/plasteel, @@ -5893,7 +5893,7 @@ /turf/open/floor/plasteel, /area/ruin/space/has_grav/spacemall/shuttle) "vU" = ( -/obj/effect/turf_decal/corner/transparent/solgovgold{ +/obj/effect/turf_decal/corner/transparent/terragovgold{ dir = 9 }, /obj/structure/cable{ @@ -6400,7 +6400,7 @@ /obj/structure/window/reinforced/spawner{ dir = 1 }, -/obj/effect/turf_decal/corner/transparent/solgovgold/three_quarters{ +/obj/effect/turf_decal/corner/transparent/terragovgold/three_quarters{ dir = 4 }, /turf/open/floor/plasteel, @@ -6521,7 +6521,7 @@ /turf/open/floor/plasteel/white, /area/ruin/space/has_grav/spacemall/shop2) "yz" = ( -/obj/effect/turf_decal/corner/transparent/solgovgold/three_quarters{ +/obj/effect/turf_decal/corner/transparent/terragovgold/three_quarters{ dir = 1 }, /obj/structure/cable{ @@ -6554,9 +6554,9 @@ /turf/open/floor/wood, /area/ruin/space/has_grav/spacemall/maint) "yG" = ( -/obj/effect/turf_decal/trimline/opaque/solgovblue/arrow_cw, +/obj/effect/turf_decal/trimline/opaque/terragovblue/arrow_cw, /obj/effect/turf_decal/corner/transparent/black/diagonal, -/obj/effect/turf_decal/road/line/transparent/solgovblue, +/obj/effect/turf_decal/road/line/transparent/terragovblue, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ dir = 4 }, @@ -6893,7 +6893,7 @@ /turf/open/floor/plasteel, /area/ruin/space/has_grav/spacemall/shop) "zS" = ( -/obj/effect/turf_decal/corner/transparent/solgovgold/diagonal, +/obj/effect/turf_decal/corner/transparent/terragovgold/diagonal, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{ dir = 4 }, @@ -7364,7 +7364,7 @@ /turf/open/floor/plasteel/white, /area/ruin/space/has_grav/spacemall) "BT" = ( -/obj/effect/turf_decal/road/line/transparent/solgovblue, +/obj/effect/turf_decal/road/line/transparent/terragovblue, /obj/structure/rack, /obj/effect/turf_decal/corner/transparent/black/diagonal, /obj/item/toy/plush/moth, @@ -7402,7 +7402,7 @@ /turf/open/floor/plating, /area/ruin/space/has_grav/spacemall/maint) "Ca" = ( -/obj/effect/turf_decal/corner/transparent/solgovgold/diagonal, +/obj/effect/turf_decal/corner/transparent/terragovgold/diagonal, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{ dir = 4 }, @@ -7627,7 +7627,7 @@ /turf/open/floor/plasteel, /area/ruin/space/has_grav/spacemall/dorms) "CO" = ( -/obj/effect/turf_decal/corner/transparent/solgovgold/diagonal, +/obj/effect/turf_decal/corner/transparent/terragovgold/diagonal, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ dir = 4 }, @@ -9010,10 +9010,10 @@ /area/ruin/space/has_grav/spacemall/dorms) "HM" = ( /obj/effect/turf_decal/corner/transparent/black/diagonal, -/obj/effect/turf_decal/trimline/opaque/solgovblue/arrow_cw{ +/obj/effect/turf_decal/trimline/opaque/terragovblue/arrow_cw{ dir = 10 }, -/obj/effect/turf_decal/road/line/transparent/solgovblue, +/obj/effect/turf_decal/road/line/transparent/terragovblue, /turf/open/floor/plasteel, /area/ruin/space/has_grav/spacemall/shop2) "HO" = ( @@ -9196,7 +9196,7 @@ /area/ruin/space/has_grav/spacemall/maint) "Iw" = ( /obj/effect/turf_decal/corner/transparent/black/diagonal, -/obj/effect/turf_decal/road/line/transparent/solgovblue, +/obj/effect/turf_decal/road/line/transparent/terragovblue, /obj/machinery/camera/autoname{ dir = 5; network = list("mall") @@ -9948,7 +9948,7 @@ /turf/open/floor/plasteel, /area/ruin/space/has_grav/spacemall/dorms) "LF" = ( -/obj/effect/turf_decal/road/line/transparent/solgovblue, +/obj/effect/turf_decal/road/line/transparent/terragovblue, /obj/effect/turf_decal/corner/transparent/black/diagonal, /obj/structure/rack, /obj/item/hot_potato/harmless/toy, @@ -9996,7 +9996,7 @@ /turf/open/floor/plasteel, /area/ruin/space/has_grav/spacemall/shop) "LP" = ( -/obj/effect/turf_decal/corner/transparent/solgovgold{ +/obj/effect/turf_decal/corner/transparent/terragovgold{ dir = 1 }, /turf/open/floor/plasteel, @@ -11227,7 +11227,7 @@ /area/ruin/space/has_grav/spacemall/maint) "PQ" = ( /obj/effect/turf_decal/corner/transparent/black/diagonal, -/obj/effect/turf_decal/road/line/transparent/solgovblue, +/obj/effect/turf_decal/road/line/transparent/terragovblue, /obj/structure/cable{ icon_state = "1-4" }, @@ -11342,7 +11342,7 @@ /turf/open/floor/plasteel, /area/ruin/space/has_grav/spacemall/dorms) "Qx" = ( -/obj/effect/turf_decal/corner/transparent/solgovgold/diagonal, +/obj/effect/turf_decal/corner/transparent/terragovgold/diagonal, /turf/open/floor/plasteel, /area/ruin/space/has_grav/spacemall/shop) "Qy" = ( @@ -11681,7 +11681,7 @@ /turf/open/floor/plating/grass, /area/ruin/space/has_grav/spacemall) "RL" = ( -/obj/effect/turf_decal/corner/transparent/solgovgold/three_quarters, +/obj/effect/turf_decal/corner/transparent/terragovgold/three_quarters, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ dir = 1 }, @@ -12343,9 +12343,9 @@ /turf/open/floor/plating/grass, /area/ruin/space/has_grav/spacemall/dorms) "Us" = ( -/obj/effect/turf_decal/trimline/opaque/solgovblue/arrow_cw, +/obj/effect/turf_decal/trimline/opaque/terragovblue/arrow_cw, /obj/effect/turf_decal/corner/transparent/black/diagonal, -/obj/effect/turf_decal/road/line/transparent/solgovblue, +/obj/effect/turf_decal/road/line/transparent/terragovblue, /turf/open/floor/plasteel, /area/ruin/space/has_grav/spacemall/shop2) "Ut" = ( @@ -13195,7 +13195,7 @@ /turf/open/floor/plating, /area/ruin/space/has_grav/spacemall/maint) "XL" = ( -/obj/effect/turf_decal/corner/transparent/solgovgold{ +/obj/effect/turf_decal/corner/transparent/terragovgold{ dir = 6 }, /obj/structure/cable{ diff --git a/_maps/RandomRuins/WasteRuins/wasteplanet_lab.dmm b/_maps/RandomRuins/WasteRuins/wasteplanet_lab.dmm index b90bfbe776bd..dec5500fcd2c 100644 --- a/_maps/RandomRuins/WasteRuins/wasteplanet_lab.dmm +++ b/_maps/RandomRuins/WasteRuins/wasteplanet_lab.dmm @@ -356,7 +356,7 @@ /area/ruin/powered) "rw" = ( /obj/structure/table/wood/reinforced, -/obj/item/desk_flag/solgov, +/obj/item/desk_flag/terragov, /obj/effect/turf_decal/corner/transparent/neutral/diagonal, /obj/effect/turf_decal/corner/opaque/blue/diagonal{ dir = 4 diff --git a/_maps/configs/independent_bubble.json b/_maps/configs/independent_bubble.json index f63aca854e8b..16a915c726b3 100644 --- a/_maps/configs/independent_bubble.json +++ b/_maps/configs/independent_bubble.json @@ -3,7 +3,7 @@ "map_name": "Bubble-class Colonial Ship", "map_short_name": "Bubble-class", "map_path": "_maps/shuttles/independent/independent_bubble.dmm", - "description": "While the most famous colony ships were hulking, highly-advanced affairs designed to ferry hundreds-if-not-thousands of settlers to far-off worlds and create cities in a matter of months – the Kalixcian Moonlight, the Candor, the First Train to Fort Sol – the Bubble-class is designed to cater to homesteaders aiming to establish a small ranch or village out in the great vastness of space. The Bubble-class is highly compact but complete with all the necessities for colony creation – extensive R&D equipment, robust mining gear, and a small selection of personal arms for fending off hostile fauna. While the Bubble-class has been historically utilized by the Solarian Federation for colony efforts, their proprietary version has recently been phased out of operation.", + "description": "While the most famous colony ships were hulking, highly-advanced affairs designed to ferry hundreds-if-not-thousands of settlers to far-off worlds and create cities in a matter of months – the Kalixcian Moonlight, the Candor, the First Train to Fort Sol – the Bubble-class is designed to cater to homesteaders aiming to establish a small ranch or village out in the great vastness of space. The Bubble-class is highly compact but complete with all the necessities for colony creation – extensive R&D equipment, robust mining gear, and a small selection of personal arms for fending off hostile fauna. While the Bubble-class has been historically utilized by the Terran Federation for colony efforts, their proprietary version has recently been phased out of operation.", "tags": [ "Generalist", "Construction" diff --git a/_maps/configs/solgov_chronicle.json b/_maps/configs/solgov_chronicle.json index 9fe11023e376..63a118c4434d 100644 --- a/_maps/configs/solgov_chronicle.json +++ b/_maps/configs/solgov_chronicle.json @@ -1,45 +1,45 @@ { - "$schema": "https://raw.githubusercontent.com/shiptest-ss13/Shiptest/master/_maps/ship_config_schema.json", + "$schema": "https://raw.githubusercontent.com/Constellado/Pentest/master/_maps/ship_config_schema.json", "map_name": "Chronicle-class Sensor Frigate", - "prefix": "SCSV", + "prefix": "TGSV", "namelists": [ - "SOLGOV", + "TERRAGOV", "SPACE", "BRITISH_NAVY", "NATURAL" ], "map_short_name": "Chronicle-class", - "map_path": "_maps/shuttles/solgov/solgov_chronicle.dmm", - "description": "Equipped with a sophisticated sensors suite and powerful data utilities, the Chronicle is a clerical workhorse, able to collect and process vast amounts of information. Often employed for census duties and interstellar exploration, the Chronicle is also a favorite of Evidenzkompanien, employed often for intelligence operations. With this fact in mind, Chronicle-class vessels are often placed under increased scrutiny by patrols, somewhat mitigating their effectiveness as a spymaster's tool.", + "map_path": "_maps/shuttles/terragov/terragov_chronicle.dmm", + "description": "Equipped with a sophisticated sensors suite and powerful data utilities, the Chronicle is a clerical workhorse, able to collect and process vast amounts of information. Often employed for census duties and interstellar exploration, the Chronicle is also a favorite for intelligence operations. With this fact in mind, Chronicle-class vessels are often placed under increased scrutiny by patrols, somewhat mitigating their effectiveness as a spymaster's tool.", "tags": [ "Specialist" ], "limit": 1, "job_slots": { "Captain": { - "outfit": "/datum/outfit/job/solgov/captain", + "outfit": "/datum/outfit/job/terragov/captain", "officer": true, "slots": 1 }, "Overseer": { - "outfit": "/datum/outfit/job/solgov/overseer", + "outfit": "/datum/outfit/job/terragov/overseer", "officer": true, "slots": 1 }, "Sonnensöldner": { - "outfit": "/datum/outfit/job/solgov/sonnensoldner", + "outfit": "/datum/outfit/job/terragov/sonnensoldner", "slots": 1 }, "Ship Engineer": { - "outfit": "/datum/outfit/job/solgov/engineer", + "outfit": "/datum/outfit/job/terragov/engineer", "slots": 2 }, "Field Engineer": { - "outfit": "/datum/outfit/job/solgov/miner", + "outfit": "/datum/outfit/job/terragov/miner", "slots": 2 }, "Scribe": { - "outfit": "/datum/outfit/job/solgov/assistant", + "outfit": "/datum/outfit/job/terragov/assistant", "slots" : 2 } }, diff --git a/_maps/configs/solgov_inkwell.json b/_maps/configs/solgov_inkwell.json index b7ae54a1b6b9..f765f8411912 100644 --- a/_maps/configs/solgov_inkwell.json +++ b/_maps/configs/solgov_inkwell.json @@ -1,47 +1,47 @@ { "$schema": "https://raw.githubusercontent.com/shiptest-ss13/Shiptest/master/_maps/ship_config_schema.json", "map_name": "Inkwell-class Supply Freighter", - "prefix": "SCSV", + "prefix": "TGSV", "namelists": [ - "SOLGOV", + "TERRAGOV", "SPACE", "BRITISH_NAVY", "NATURAL" ], "map_short_name": "Inkwell-class", - "map_path": "_maps/shuttles/solgov/solgov_inkwell.dmm", - "description": "One of the few Sol-designed hulls used outside of official contexts by non-Confederation parties, the Inkwell is a freighter respected for its engineering and loved for its lavish crew accommodations. \n The Inkwell-class seen in numerous contexts, perhaps most notably among the Verwaltungskompanien, where they are essential in solving the logistic concerns of any proper military-administration-for-hire. Additionally, they are often commissioned and sold to non-Solarian parties for use in interstellar shipping. \n The usage of the Inkwell-class to move illicit or untracked cargo is known by any seasoned (or even half-cooked) port authority; \"...such regrettable actions by an outlier minority are mere part-and-parcel of the realities of interstellar shipping,\" goes the official reply.", + "map_path": "_maps/shuttles/terragov/terragov_inkwell.dmm", + "description": "One of the few Sol-designed hulls used outside of official contexts by non-Confederation parties, the Inkwell is a freighter respected for its engineering and loved for its lavish crew accommodations. \n The Inkwell-class seen in numerous contexts, perhaps most notably among the Verwaltungskompanien, where they are essential in solving the logistic concerns of any proper military-administration-for-hire. Additionally, they are often commissioned and sold to non-Terran parties for use in interstellar shipping. \n The usage of the Inkwell-class to move illicit or untracked cargo is known by any seasoned (or even half-cooked) port authority; \"...such regrettable actions by an outlier minority are mere part-and-parcel of the realities of interstellar shipping,\" goes the official reply.", "tags": ["RP Focus", "Combat", "Cargo", "Mining"], "limit": 1, "job_slots": { "Captain": { - "outfit": "/datum/outfit/job/solgov/captain", + "outfit": "/datum/outfit/job/terragov/captain", "officer": true, "slots": 1 }, "Logistics Deck Officer": { - "outfit": "/datum/outfit/job/solgov/quartermaster", + "outfit": "/datum/outfit/job/terragov/quartermaster", "officer": true, "slots": 1 }, "Sonnensöldner": { - "outfit": "/datum/outfit/job/solgov/sonnensoldner", + "outfit": "/datum/outfit/job/terragov/sonnensoldner", "slots": 3 }, "Ship Engineer": { - "outfit": "/datum/outfit/job/solgov/engineer", + "outfit": "/datum/outfit/job/terragov/engineer", "slots": 2 }, "Field Engineer": { - "outfit": "/datum/outfit/job/solgov/miner", + "outfit": "/datum/outfit/job/terragov/miner", "slots": 3 }, "Bureaucrat": { - "outfit": "/datum/outfit/job/solgov/bureaucrat", + "outfit": "/datum/outfit/job/terragov/bureaucrat", "slots": 2 }, "Scribe": { - "outfit": "/datum/outfit/job/solgov/assistant", + "outfit": "/datum/outfit/job/terragov/assistant", "slots" : 6 } }, diff --git a/_maps/configs/solgov_paracelsus.json b/_maps/configs/solgov_paracelsus.json index a5eefc5296df..bdc6779fc1e0 100644 --- a/_maps/configs/solgov_paracelsus.json +++ b/_maps/configs/solgov_paracelsus.json @@ -1,51 +1,51 @@ { "$schema": "https://raw.githubusercontent.com/shiptest-ss13/Shiptest/master/_maps/ship_config_schema.json", "map_name": "Paracelsus-class Medical Corvette", - "prefix": "SCSV", + "prefix": "TGSV", "namelists": [ - "SOLGOV", + "TERRAGOV", "SPACE", "BRITISH_NAVY", "NATURAL" ], "map_short_name": "Paracelsus-class", - "description": "Fulfilling its role as a medicinal powerhouse of the Solarian Navy, the Paracelsus-class is a specially designed corvette to assist solarian fleets in medical troubles, as well as supplying such vessels with medication. Scribes pursuing a medical degree often work in these ships to shadow trained medical doctors to complete their residency.", + "description": "Fulfilling its role as a medicinal powerhouse of the Terran Navy, the Paracelsus-class is a specially designed corvette to assist terran fleets in medical troubles, as well as supplying such vessels with medication. Scribes pursuing a medical degree often work in these ships to shadow trained medical doctors to complete their residency.", "tags": ["RP Focus", "Medical", "Chemistry"], - "map_path": "_maps/shuttles/solgov/solgov_paracelsus.dmm", + "map_path": "_maps/shuttles/terragov/terragov_paracelsus.dmm", "limit": 1, "job_slots": { "Captain": { - "outfit": "/datum/outfit/job/solgov/captain", + "outfit": "/datum/outfit/job/terragov/captain", "officer": true, "slots": 1 }, "Overseer": { - "outfit": "/datum/outfit/job/solgov/overseer", + "outfit": "/datum/outfit/job/terragov/overseer", "officer": true, "slots": 1 }, "Medical Doctor": { - "outfit": "/datum/outfit/job/solgov/doctor", + "outfit": "/datum/outfit/job/terragov/doctor", "slots": 3 }, "Ship Engineer": { - "outfit": "/datum/outfit/job/solgov/engineer", + "outfit": "/datum/outfit/job/terragov/engineer", "slots": 1 }, "Psychologist": { - "outfit": "/datum/outfit/job/solgov/psychologist", + "outfit": "/datum/outfit/job/terragov/psychologist", "slots": 1 }, "Field Engineer": { - "outfit": "/datum/outfit/job/solgov/miner", + "outfit": "/datum/outfit/job/terragov/miner", "slots": 2 }, "Scribe": { - "outfit": "/datum/outfit/job/solgov/assistant", + "outfit": "/datum/outfit/job/terragov/assistant", "slots" : 3 }, "Attentive Care Patient": { - "outfit": "/datum/outfit/job/solgov/patient", + "outfit": "/datum/outfit/job/terragov/patient", "slots" : 3 } diff --git a/_maps/configs/syndicate_cybersun_kansatsu.json b/_maps/configs/syndicate_cybersun_kansatsu.json index a9c9fcb94349..8eb306ac3b78 100644 --- a/_maps/configs/syndicate_cybersun_kansatsu.json +++ b/_maps/configs/syndicate_cybersun_kansatsu.json @@ -7,7 +7,7 @@ "NATURAL_AGGRESSIVE" ], "map_name": "Kansatsu-class Scout Courier", - "description": "The Kansatsu-class is a Cybersun remodel of the old Type-S SolGov Courier, rebuilt for rapid package ferrying and light surveillance operations in the Frontier. While fairly cramped, it excels at its design goals, with rapid surveys, scouting, and espionage flowing from its presence. Syndicate deployments typically include a deployment of 5, with a recommended max of 7. This is broken down into 1 captain, an intelligence officer for coordinating the field agents, an engineer, and 2 field agents. The simplicity of the hull has led to the ship becoming a widespread indicator of Syndicate interest in locations, and some models have found their way into private purchasers' hands.", + "description": "The Kansatsu-class is a Cybersun remodel of the old Type-S TerraGov Courier, rebuilt for rapid package ferrying and light surveillance operations in the Frontier. While fairly cramped, it excels at its design goals, with rapid surveys, scouting, and espionage flowing from its presence. Syndicate deployments typically include a deployment of 5, with a recommended max of 7. This is broken down into 1 captain, an intelligence officer for coordinating the field agents, an engineer, and 2 field agents. The simplicity of the hull has led to the ship becoming a widespread indicator of Syndicate interest in locations, and some models have found their way into private purchasers' hands.", "tags": [ "Specialist" ], diff --git a/_maps/configs/terragov_chronicle.json b/_maps/configs/terragov_chronicle.json new file mode 100644 index 000000000000..497c19f2f6bb --- /dev/null +++ b/_maps/configs/terragov_chronicle.json @@ -0,0 +1,47 @@ +{ + "$schema": "https://raw.githubusercontent.com/shiptest-ss13/Shiptest/master/_maps/ship_config_schema.json", + "map_name": "Chronicle-class Sensor Frigate", + "prefix": "SCSV", + "namelists": [ + "TERRAGOV", + "SPACE", + "BRITISH_NAVY", + "NATURAL" + ], + "map_short_name": "Chronicle-class", + "map_path": "_maps/shuttles/terragov/terragov_chronicle.dmm", + "description": "Equipped with a sophisticated sensors suite and powerful data utilities, the Chronicle is a clerical workhorse, able to collect and process vast amounts of information. Often employed for census duties and interstellar exploration, the Chronicle is also a favorite of Evidenzkompanien, employed often for intelligence operations. With this fact in mind, Chronicle-class vessels are often placed under increased scrutiny by patrols, somewhat mitigating their effectiveness as a spymaster's tool.", + "tags": [ + "Specialist" + ], + "limit": 1, + "job_slots": { + "Captain": { + "outfit": "/datum/outfit/job/terragov/captain", + "officer": true, + "slots": 1 + }, + "Overseer": { + "outfit": "/datum/outfit/job/terragov/overseer", + "officer": true, + "slots": 1 + }, + "Sonnensöldner": { + "outfit": "/datum/outfit/job/terragov/sonnensoldner", + "slots": 1 + }, + "Ship Engineer": { + "outfit": "/datum/outfit/job/terragov/engineer", + "slots": 2 + }, + "Field Engineer": { + "outfit": "/datum/outfit/job/terragov/miner", + "slots": 2 + }, + "Scribe": { + "outfit": "/datum/outfit/job/terragov/assistant", + "slots" : 2 + } + }, + "enabled": true +} diff --git a/_maps/configs/terragov_inkwell.json b/_maps/configs/terragov_inkwell.json new file mode 100644 index 000000000000..f1a611ad76ac --- /dev/null +++ b/_maps/configs/terragov_inkwell.json @@ -0,0 +1,49 @@ +{ + "$schema": "https://raw.githubusercontent.com/shiptest-ss13/Shiptest/master/_maps/ship_config_schema.json", + "map_name": "Inkwell-class Supply Freighter", + "prefix": "SCSV", + "namelists": [ + "TERRAGOV", + "SPACE", + "BRITISH_NAVY", + "NATURAL" + ], + "map_short_name": "Inkwell-class", + "map_path": "_maps/shuttles/terragov/terragov_inkwell.dmm", + "description": "One of the few Sol-designed hulls used outside of official contexts by non-Confederation parties, the Inkwell is a freighter respected for its engineering and loved for its lavish crew accommodations. \n The Inkwell-class seen in numerous contexts, perhaps most notably among the Verwaltungskompanien, where they are essential in solving the logistic concerns of any proper military-administration-for-hire. Additionally, they are often commissioned and sold to non-Terran parties for use in interstellar shipping. \n The usage of the Inkwell-class to move illicit or untracked cargo is known by any seasoned (or even half-cooked) port authority; \"...such regrettable actions by an outlier minority are mere part-and-parcel of the realities of interstellar shipping,\" goes the official reply.", + "tags": ["RP Focus", "Combat", "Cargo", "Mining"], + "limit": 1, + "job_slots": { + "Captain": { + "outfit": "/datum/outfit/job/terragov/captain", + "officer": true, + "slots": 1 + }, + "Logistics Deck Officer": { + "outfit": "/datum/outfit/job/terragov/quartermaster", + "officer": true, + "slots": 1 + }, + "Sonnensöldner": { + "outfit": "/datum/outfit/job/terragov/sonnensoldner", + "slots": 3 + }, + "Ship Engineer": { + "outfit": "/datum/outfit/job/terragov/engineer", + "slots": 2 + }, + "Field Engineer": { + "outfit": "/datum/outfit/job/terragov/miner", + "slots": 3 + }, + "Bureaucrat": { + "outfit": "/datum/outfit/job/terragov/bureaucrat", + "slots": 2 + }, + "Scribe": { + "outfit": "/datum/outfit/job/terragov/assistant", + "slots" : 6 + } + }, + "enabled": true +} diff --git a/_maps/configs/terragov_paracelsus.json b/_maps/configs/terragov_paracelsus.json new file mode 100644 index 000000000000..cf4628efc04e --- /dev/null +++ b/_maps/configs/terragov_paracelsus.json @@ -0,0 +1,54 @@ +{ + "$schema": "https://raw.githubusercontent.com/shiptest-ss13/Shiptest/master/_maps/ship_config_schema.json", + "map_name": "Paracelsus-class Medical Corvette", + "prefix": "SCSV", + "namelists": [ + "TERRAGOV", + "SPACE", + "BRITISH_NAVY", + "NATURAL" + ], + "map_short_name": "Paracelsus-class", + "description": "Fulfilling its role as a medicinal powerhouse of the Terran Navy, the Paracelsus-class is a specially designed corvette to assist terran fleets in medical troubles, as well as supplying such vessels with medication. Scribes pursuing a medical degree often work in these ships to shadow trained medical doctors to complete their residency.", + "tags": ["RP Focus", "Medical", "Chemistry"], + "map_path": "_maps/shuttles/terragov/terragov_paracelsus.dmm", + "limit": 1, + "job_slots": { + "Captain": { + "outfit": "/datum/outfit/job/terragov/captain", + "officer": true, + "slots": 1 + }, + "Overseer": { + "outfit": "/datum/outfit/job/terragov/overseer", + "officer": true, + "slots": 1 + }, + "Medical Doctor": { + "outfit": "/datum/outfit/job/terragov/doctor", + "slots": 3 + }, + "Ship Engineer": { + "outfit": "/datum/outfit/job/terragov/engineer", + "slots": 1 + }, + "Psychologist": { + "outfit": "/datum/outfit/job/terragov/psychologist", + "slots": 1 + }, + "Field Engineer": { + "outfit": "/datum/outfit/job/terragov/miner", + "slots": 2 + }, + "Scribe": { + "outfit": "/datum/outfit/job/terragov/assistant", + "slots" : 3 + }, + "Attentive Care Patient": { + "outfit": "/datum/outfit/job/terragov/patient", + "slots" : 3 + } + + }, + "enabled": true +} diff --git a/_maps/map_files/generic/CentCom.dmm b/_maps/map_files/generic/CentCom.dmm index 0f8565b7ecec..3fb9c52f2af1 100644 --- a/_maps/map_files/generic/CentCom.dmm +++ b/_maps/map_files/generic/CentCom.dmm @@ -6546,10 +6546,10 @@ /area/centcom/ferry) "bSy" = ( /obj/structure/table/wood/fancy/blue, -/obj/structure/sign/solgov_seal{ +/obj/structure/sign/terragov_seal{ pixel_y = 28 }, -/obj/item/clothing/head/beret/solgov{ +/obj/item/clothing/head/beret/terragov{ pixel_x = 11; pixel_y = -1 }, @@ -7190,7 +7190,7 @@ /turf/open/floor/plasteel, /area/centcom/supply) "dom" = ( -/obj/structure/sign/solgov_seal{ +/obj/structure/sign/terragov_seal{ pixel_y = 28 }, /obj/structure/table/wood/fancy/blue, @@ -7737,7 +7737,7 @@ /turf/open/floor/plasteel/white, /area/centcom/holding) "eqM" = ( -/obj/effect/turf_decal/solgov/wood/bottom_left, +/obj/effect/turf_decal/terragov/wood/bottom_left, /obj/effect/turf_decal/siding/wood{ color = "#543C30" }, @@ -8779,7 +8779,7 @@ /obj/effect/turf_decal/siding/wood{ dir = 6 }, -/obj/structure/sign/solgov_seal{ +/obj/structure/sign/terragov_seal{ pixel_y = -28 }, /obj/structure/closet/crate/bin, @@ -9004,7 +9004,7 @@ "gTo" = ( /obj/structure/table/wood/fancy/blue, /obj/machinery/light/directional/north, -/obj/machinery/fax/admin/solgov, +/obj/machinery/fax/admin/terragov, /turf/open/floor/carpet/royalblue, /area/centcom) "gUp" = ( @@ -9915,7 +9915,7 @@ /turf/open/floor/plasteel/patterned/grid, /area/centcom) "iSo" = ( -/obj/machinery/door/airlock/solgov{ +/obj/machinery/door/airlock/terragov{ req_access_txt = "109" }, /turf/open/floor/wood/walnut, @@ -10052,7 +10052,7 @@ dir = 9; color = "#543C30" }, -/obj/effect/turf_decal/solgov/wood/center_left, +/obj/effect/turf_decal/terragov/wood/center_left, /turf/open/floor/wood/walnut, /area/centcom) "jjE" = ( @@ -12419,12 +12419,12 @@ "nYl" = ( /obj/structure/table/wood/fancy/blue, /obj/item/paper_bin/carbon, -/obj/item/pen/solgov, +/obj/item/pen/terragov, /obj/item/pen/fourcolor{ pixel_x = -9; pixel_y = -3 }, -/obj/item/desk_flag/solgov{ +/obj/item/desk_flag/terragov{ pixel_y = 12; pixel_x = -8 }, @@ -12980,7 +12980,7 @@ /area/centcom/control) "phf" = ( /obj/structure/table/wood/fancy/blue, -/obj/structure/sign/poster/solgov/paperwork{ +/obj/structure/sign/poster/terragov/paperwork{ pixel_y = 32 }, /obj/item/radio/intercom/wideband/table{ @@ -13094,10 +13094,10 @@ dir = 10; color = "#543C30" }, -/obj/structure/sign/solgov_seal{ +/obj/structure/sign/terragov_seal{ pixel_y = -28 }, -/obj/machinery/telecomms/relay/preset/solgov{ +/obj/machinery/telecomms/relay/preset/terragov{ autolinkers = list("relay") }, /turf/open/floor/wood/walnut, @@ -13180,7 +13180,7 @@ /turf/open/floor/mineral/plastitanium, /area/centcom) "pwr" = ( -/obj/effect/turf_decal/solgov/wood/top_right, +/obj/effect/turf_decal/terragov/wood/top_right, /obj/effect/turf_decal/siding/wood{ color = "#543C30"; dir = 1 @@ -13414,7 +13414,7 @@ /obj/effect/turf_decal/siding/wood{ color = "#543C30" }, -/obj/effect/turf_decal/solgov/wood/bottom_right, +/obj/effect/turf_decal/terragov/wood/bottom_right, /turf/open/floor/wood/walnut, /area/centcom) "pOL" = ( @@ -13626,7 +13626,7 @@ /turf/open/floor/plasteel/dark, /area/centcom/ferry) "qkP" = ( -/obj/effect/turf_decal/solgov/wood/bottom_left{ +/obj/effect/turf_decal/terragov/wood/bottom_left{ dir = 8 }, /obj/effect/turf_decal/siding/wood{ @@ -15323,7 +15323,7 @@ /turf/open/floor/plasteel, /area/centcom/evac) "tOf" = ( -/obj/effect/turf_decal/solgov/wood/center, +/obj/effect/turf_decal/terragov/wood/center, /obj/machinery/light/floor, /turf/open/floor/wood/walnut, /area/centcom) @@ -15498,7 +15498,7 @@ /obj/effect/turf_decal/siding/wood{ color = "#543C30" }, -/obj/effect/turf_decal/solgov/wood/bottom_center, +/obj/effect/turf_decal/terragov/wood/bottom_center, /obj/effect/turf_decal/siding/wood{ color = "#543C30" }, @@ -16107,7 +16107,7 @@ dir = 9; color = "#543C30" }, -/obj/effect/turf_decal/solgov/wood/top, +/obj/effect/turf_decal/terragov/wood/top, /obj/effect/turf_decal/siding/wood{ color = "#543C30"; dir = 1 @@ -16425,10 +16425,10 @@ /area/centcom) "wCp" = ( /obj/structure/table/wood/fancy/blue, -/obj/item/folder/documents/solgov{ +/obj/item/folder/documents/terragov{ pixel_x = -3 }, -/obj/item/folder/solgov{ +/obj/item/folder/terragov{ pixel_y = 5; pixel_x = 2 }, @@ -16820,7 +16820,7 @@ /turf/open/floor/plasteel/dark, /area/centcom/ferry) "xTt" = ( -/obj/effect/turf_decal/solgov/wood/center_right, +/obj/effect/turf_decal/terragov/wood/center_right, /turf/open/floor/wood/walnut, /area/centcom) "xWv" = ( diff --git a/_maps/outpost/nanotrasen_asteroid.dmm b/_maps/outpost/nanotrasen_asteroid.dmm index a55df014f4f9..7621ebb412f2 100644 --- a/_maps/outpost/nanotrasen_asteroid.dmm +++ b/_maps/outpost/nanotrasen_asteroid.dmm @@ -6428,7 +6428,7 @@ /obj/item/modular_computer/laptop/preset/civilian{ pixel_y = 5 }, -/obj/structure/sign/poster/solgov/paperwork{ +/obj/structure/sign/poster/terragov/paperwork{ pixel_y = 32 }, /turf/open/floor/plasteel, diff --git a/_maps/ship_config_schema.json b/_maps/ship_config_schema.json index 2afd8e065170..70ae4a11108d 100644 --- a/_maps/ship_config_schema.json +++ b/_maps/ship_config_schema.json @@ -74,7 +74,7 @@ "CLIP MINUTEMEN", "SAINT-ROUMAIN", "INSTALLATION", - "SOLGOV", + "TERRAGOV", "CMM-GOLD", "CMM-BARD", "PGF" diff --git a/_maps/shuttles/independent/independent_rigger.dmm b/_maps/shuttles/independent/independent_rigger.dmm index daf3cf9ecdb3..c1eae2d71988 100644 --- a/_maps/shuttles/independent/independent_rigger.dmm +++ b/_maps/shuttles/independent/independent_rigger.dmm @@ -3584,7 +3584,7 @@ /obj/item/ammo_box/c38, /obj/item/ammo_box/c38, /obj/structure/closet/secure_closet/wall/directional/west{ - icon_state = "solgov_wall"; + icon_state = "terragov_wall"; name = "first mate's closet"; req_access_txt = "57" }, @@ -3747,7 +3747,7 @@ /obj/item/clothing/head/caphat/cowboy, /obj/item/gun/ballistic/automatic/pistol/candor, /obj/structure/closet/secure_closet/wall/directional/east{ - icon_state = "solgov_wall"; + icon_state = "terragov_wall"; name = "captain's closet"; req_access_txt = "20" }, diff --git a/_maps/shuttles/independent/independent_schmiedeberg.dmm b/_maps/shuttles/independent/independent_schmiedeberg.dmm index 454e7503cb52..4f4f9a25f19d 100644 --- a/_maps/shuttles/independent/independent_schmiedeberg.dmm +++ b/_maps/shuttles/independent/independent_schmiedeberg.dmm @@ -3498,7 +3498,7 @@ dir = 1 }, /obj/structure/closet/secure_closet/wall/directional/east{ - icon_state = "solgov_wall"; + icon_state = "terragov_wall"; name = "Chief Pharmacist's Locker"; req_access_txt = "40" }, diff --git a/_maps/shuttles/inteq/inteq_colossus.dmm b/_maps/shuttles/inteq/inteq_colossus.dmm index d5ed70873819..eb175c4bca61 100644 --- a/_maps/shuttles/inteq/inteq_colossus.dmm +++ b/_maps/shuttles/inteq/inteq_colossus.dmm @@ -2618,8 +2618,8 @@ /area/ship/security/armory) "Da" = ( /obj/structure/closet/secure_closet/wall/directional/west{ - icon_door = "solgov_wall"; - icon_state = "solgov_wall"; + icon_door = "terragov_wall"; + icon_state = "terragov_wall"; name = "vanguard's locker"; req_access_txt = "58" }, diff --git a/_maps/shuttles/inteq/inteq_hound.dmm b/_maps/shuttles/inteq/inteq_hound.dmm index 5616d1d2d4b0..313f0344d908 100644 --- a/_maps/shuttles/inteq/inteq_hound.dmm +++ b/_maps/shuttles/inteq/inteq_hound.dmm @@ -965,8 +965,8 @@ /area/ship/cargo) "va" = ( /obj/structure/closet/secure_closet/wall/directional/west{ - icon_door = "solgov_wall"; - icon_state = "solgov_wall"; + icon_door = "terragov_wall"; + icon_state = "terragov_wall"; name = "vanguard's locker"; req_access_txt = "58" }, diff --git a/_maps/shuttles/inteq/inteq_valor.dmm b/_maps/shuttles/inteq/inteq_valor.dmm index b98d0f2f13cd..645562f02a31 100644 --- a/_maps/shuttles/inteq/inteq_valor.dmm +++ b/_maps/shuttles/inteq/inteq_valor.dmm @@ -4337,8 +4337,8 @@ /obj/item/clothing/suit/armor/hos/inteq, /obj/item/clothing/head/beret/sec/hos/inteq, /obj/structure/closet/secure_closet/wall/directional/west{ - icon_door = "solgov_wall"; - icon_state = "solgov_wall"; + icon_door = "terragov_wall"; + icon_state = "terragov_wall"; name = "vanguard's locker"; req_access = list(58) }, diff --git a/_maps/shuttles/inteq/inteq_vaquero.dmm b/_maps/shuttles/inteq/inteq_vaquero.dmm index 23a80717b42f..69cc84305a2c 100644 --- a/_maps/shuttles/inteq/inteq_vaquero.dmm +++ b/_maps/shuttles/inteq/inteq_vaquero.dmm @@ -906,8 +906,8 @@ /area/ship/maintenance/starboard) "mu" = ( /obj/structure/closet/secure_closet/wall/directional/west{ - icon_door = "solgov_wall"; - icon_state = "solgov_wall"; + icon_door = "terragov_wall"; + icon_state = "terragov_wall"; name = "vanguard's locker"; req_access_txt = "20" }, diff --git a/_maps/shuttles/nanotrasen/nanotrasen_osprey.dmm b/_maps/shuttles/nanotrasen/nanotrasen_osprey.dmm index 774f1d57cc40..341cb1224936 100644 --- a/_maps/shuttles/nanotrasen/nanotrasen_osprey.dmm +++ b/_maps/shuttles/nanotrasen/nanotrasen_osprey.dmm @@ -575,7 +575,7 @@ /obj/structure/cable{ icon_state = "1-2" }, -/obj/effect/turf_decal/corner/opaque/solgovgold{ +/obj/effect/turf_decal/corner/opaque/terragovgold{ dir = 9 }, /turf/open/floor/plasteel/dark, diff --git a/_maps/shuttles/pirate/pirate_noderider.dmm b/_maps/shuttles/pirate/pirate_noderider.dmm index 2e0352c54a58..abd98c806155 100644 --- a/_maps/shuttles/pirate/pirate_noderider.dmm +++ b/_maps/shuttles/pirate/pirate_noderider.dmm @@ -2402,7 +2402,7 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/effect/turf_decal/spline/fancy/transparent/solgovgold, +/obj/effect/turf_decal/spline/fancy/transparent/terragovgold, /turf/open/floor/plating, /area/ship/cargo) "Kn" = ( diff --git a/_maps/shuttles/roumain/srm_elder.dmm b/_maps/shuttles/roumain/srm_elder.dmm index d8d7b6714d6e..81a53975e097 100644 --- a/_maps/shuttles/roumain/srm_elder.dmm +++ b/_maps/shuttles/roumain/srm_elder.dmm @@ -1059,7 +1059,7 @@ /obj/effect/turf_decal/spline/fancy/wood{ dir = 6 }, -/obj/item/clothing/suit/space/hardsuit/solgov/roumain, +/obj/item/clothing/suit/space/hardsuit/terragov/roumain, /obj/item/clothing/mask/breath, /obj/item/tank/internals/emergency_oxygen/double, /turf/open/floor/wood/mahogany, @@ -3299,7 +3299,7 @@ /turf/open/floor/wood/mahogany, /area/ship/bridge) "Od" = ( -/obj/item/clothing/head/hardhat/solgov, +/obj/item/clothing/head/hardhat/terragov, /obj/item/storage/toolbox/mechanical, /obj/item/clothing/glasses/welding, /obj/item/clothing/head/welding, diff --git a/_maps/shuttles/solgov/solgov_chronicle.dmm b/_maps/shuttles/solgov/solgov_chronicle.dmm index d0359b5ca240..3dc858afe272 100644 --- a/_maps/shuttles/solgov/solgov_chronicle.dmm +++ b/_maps/shuttles/solgov/solgov_chronicle.dmm @@ -10,13 +10,13 @@ /turf/open/floor/wood, /area/ship/bridge) "ac" = ( -/obj/machinery/computer/security/solgov{ +/obj/machinery/computer/security/terragov{ dir = 8 }, /turf/open/floor/wood/walnut, /area/ship/bridge) "ah" = ( -/obj/effect/turf_decal/corner/opaque/solgovgold/three_quarters{ +/obj/effect/turf_decal/corner/opaque/terragovgold/three_quarters{ dir = 4 }, /obj/effect/turf_decal/techfloor/corner{ @@ -86,7 +86,7 @@ /obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ dir = 1 }, -/obj/effect/turf_decal/corner/opaque/solgovblue{ +/obj/effect/turf_decal/corner/opaque/terragovblue{ dir = 10 }, /turf/open/floor/plasteel/white, @@ -100,7 +100,7 @@ /turf/open/floor/wood/walnut, /area/ship/crew/crewtwo) "aU" = ( -/obj/effect/turf_decal/corner/opaque/solgovgold{ +/obj/effect/turf_decal/corner/opaque/terragovgold{ dir = 10 }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, @@ -159,7 +159,7 @@ /turf/open/floor/wood, /area/ship/crew/crewtwo) "bm" = ( -/obj/effect/turf_decal/solgov/center_left, +/obj/effect/turf_decal/terragov/center_left, /obj/effect/turf_decal/spline/fancy/opaque/grey{ dir = 8 }, @@ -232,7 +232,7 @@ dir = 8 }, /obj/structure/bed, -/obj/item/bedsheet/solgov, +/obj/item/bedsheet/terragov, /obj/structure/curtain/cloth, /obj/machinery/light/small/directional/south, /turf/open/floor/wood, @@ -254,27 +254,27 @@ populate = 0; anchored = 1 }, -/obj/item/clothing/under/solgov/formal/captain, +/obj/item/clothing/under/terragov/formal/captain, /obj/item/clothing/shoes/laceup, -/obj/item/clothing/head/solgov/captain, -/obj/item/folder/solgov, -/obj/item/folder/solgov, -/obj/item/folder/documents/solgov, -/obj/item/folder/documents/solgov, -/obj/item/clothing/under/solgov/formal, +/obj/item/clothing/head/terragov/captain, +/obj/item/folder/terragov, +/obj/item/folder/terragov, +/obj/item/folder/documents/terragov, +/obj/item/folder/documents/terragov, +/obj/item/clothing/under/terragov/formal, /obj/item/clothing/gloves/combat, /obj/item/storage/backpack/captain, /obj/item/door_remote/captain, -/obj/item/storage/belt/sabre/solgov, -/obj/item/clothing/under/solgov/dress, -/obj/item/clothing/suit/armor/vest/bulletproof/solgov/captain, -/obj/item/stamp/solgov, -/obj/item/clothing/suit/armor/solgov_trenchcoat, +/obj/item/storage/belt/sabre/terragov, +/obj/item/clothing/under/terragov/dress, +/obj/item/clothing/suit/armor/vest/bulletproof/terragov/captain, +/obj/item/stamp/terragov, +/obj/item/clothing/suit/armor/terragov_trenchcoat, /obj/item/spacecash/bundle/loadsamoney, /obj/item/gun/ballistic/automatic/powered/gauss/modelh, /obj/item/ammo_box/magazine/modelh, /obj/item/ammo_box/magazine/modelh, -/obj/item/clothing/neck/cloak/solgovcap, +/obj/item/clothing/neck/cloak/terragovcap, /turf/open/floor/carpet/royalblue, /area/ship/crew/office) "cg" = ( @@ -344,14 +344,14 @@ pixel_x = -5; pixel_y = -1 }, -/obj/item/pen/solgov{ +/obj/item/pen/terragov{ pixel_x = -5 }, /obj/item/radio/intercom/directional/south, /turf/open/floor/wood, /area/ship/crew) "da" = ( -/obj/machinery/computer/cargo/express/solgov{ +/obj/machinery/computer/cargo/express/terragov{ dir = 4 }, /obj/item/radio/intercom/directional/west, @@ -469,7 +469,7 @@ /obj/structure/cable{ icon_state = "1-8" }, -/obj/effect/turf_decal/corner/opaque/solgovblue{ +/obj/effect/turf_decal/corner/opaque/terragovblue{ dir = 9 }, /turf/open/floor/plasteel/white, @@ -477,11 +477,11 @@ "eQ" = ( /obj/structure/table/wood/fancy/purple, /obj/item/paper_bin, -/obj/item/desk_flag/solgov{ +/obj/item/desk_flag/terragov{ pixel_y = 12; pixel_x = -7 }, -/obj/item/pen/solgov, +/obj/item/pen/terragov, /obj/effect/turf_decal/spline/fancy/wood{ dir = 9 }, @@ -547,7 +547,7 @@ dir = 8 }, /obj/machinery/light/small/directional/east, -/obj/structure/sign/poster/solgov/random{ +/obj/structure/sign/poster/terragov/random{ pixel_y = 30 }, /turf/open/floor/plasteel/tech/grid, @@ -560,14 +560,14 @@ }, /obj/item/pickaxe/drill/jackhammer, /obj/item/storage/toolbox/mechanical, -/obj/item/clothing/head/hardhat/solgov, +/obj/item/clothing/head/hardhat/terragov, /obj/item/radio{ icon_state = "sec_radio" }, -/obj/item/clothing/under/solgov/formal, -/obj/item/clothing/under/solgov/dress, -/obj/item/clothing/under/solgov, -/obj/item/clothing/suit/hazardvest/solgov, +/obj/item/clothing/under/terragov/formal, +/obj/item/clothing/under/terragov/dress, +/obj/item/clothing/under/terragov, +/obj/item/clothing/suit/hazardvest/terragov, /obj/item/clothing/accessory/armband/cargo, /obj/item/clothing/shoes/workboots, /obj/item/kitchen/knife/combat/survival, @@ -618,7 +618,7 @@ /turf/open/floor/wood, /area/ship/crew/crewtwo) "fA" = ( -/obj/effect/turf_decal/solgov/center_right, +/obj/effect/turf_decal/terragov/center_right, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 4 }, @@ -655,7 +655,7 @@ /area/ship/engineering) "fW" = ( /obj/machinery/atmospherics/pipe/simple/green/visible, -/obj/effect/turf_decal/corner/opaque/solgovblue{ +/obj/effect/turf_decal/corner/opaque/terragovblue{ dir = 6 }, /obj/machinery/atmospherics/pipe/simple/supply/visible/layer2{ @@ -719,7 +719,7 @@ /obj/structure/cable/yellow{ icon_state = "2-5" }, -/obj/effect/turf_decal/corner/opaque/solgovblue{ +/obj/effect/turf_decal/corner/opaque/terragovblue{ dir = 9 }, /obj/structure/noticeboard/staff{ @@ -752,7 +752,7 @@ /obj/machinery/atmospherics/components/unary/passive_vent/layer4{ dir = 4 }, -/obj/structure/sign/solgov_seal{ +/obj/structure/sign/terragov_seal{ pixel_y = -27 }, /turf/open/floor/engine/hull/reinforced, @@ -774,8 +774,8 @@ /area/ship/crew) "hr" = ( /obj/structure/table/wood/fancy/purple, -/obj/machinery/fax/solgov, -/obj/item/desk_flag/solgov{ +/obj/machinery/fax/terragov, +/obj/item/desk_flag/terragov{ pixel_x = 8; pixel_y = 13 }, @@ -857,7 +857,7 @@ /turf/open/floor/wood, /area/ship/crew/crewtwo) "hA" = ( -/obj/machinery/door/airlock/solgov{ +/obj/machinery/door/airlock/terragov{ dir = 4; name = "Bridge"; req_access = list(19) @@ -941,22 +941,22 @@ name = "sonnensöldners's locker"; anchored = 1 }, -/obj/item/clothing/head/solgov/sonnensoldner, -/obj/structure/sign/poster/solgov/sonnensoldner{ +/obj/item/clothing/head/terragov/sonnensoldner, +/obj/structure/sign/poster/terragov/sonnensoldner{ pixel_y = 30 }, /obj/item/radio{ icon_state = "sec_radio" }, -/obj/item/clothing/under/solgov/formal, -/obj/item/clothing/under/solgov/dress, -/obj/item/clothing/under/solgov, +/obj/item/clothing/under/terragov/formal, +/obj/item/clothing/under/terragov/dress, +/obj/item/clothing/under/terragov, /obj/item/clothing/shoes/workboots, -/obj/item/storage/belt/sabre/solgov, +/obj/item/storage/belt/sabre/terragov, /obj/item/clothing/gloves/combat, -/obj/item/radio/headset/solgov/alt, +/obj/item/radio/headset/terragov/alt, /obj/item/storage/backpack, -/obj/item/clothing/suit/armor/vest/bulletproof/solgov, +/obj/item/clothing/suit/armor/vest/bulletproof/terragov, /obj/effect/turf_decal/techfloor{ dir = 1 }, @@ -1113,7 +1113,7 @@ /area/ship/crew) "ke" = ( /obj/machinery/power/apc/auto_name/directional/south, -/obj/effect/turf_decal/corner/opaque/solgovblue/three_quarters{ +/obj/effect/turf_decal/corner/opaque/terragovblue/three_quarters{ dir = 1 }, /obj/structure/cable{ @@ -1163,9 +1163,9 @@ /area/ship/bridge) "kz" = ( /obj/machinery/telecomms/hub{ - autolinkers = list("solgov","broadcasterA","receiverA","solgovPDA","SolHub"); + autolinkers = list("terragov","broadcasterA","receiverA","terragovPDA","SolHub"); network = "SolNet"; - id = "Solgov Hub" + id = "terragov Hub" }, /obj/structure/window/reinforced{ dir = 8 @@ -1190,7 +1190,7 @@ /turf/closed/wall/mineral/titanium/nodiagonal, /area/ship/crew/dorm) "kT" = ( -/obj/effect/turf_decal/corner/opaque/solgovblue/three_quarters{ +/obj/effect/turf_decal/corner/opaque/terragovblue/three_quarters{ dir = 8 }, /turf/open/floor/plasteel/white, @@ -1300,7 +1300,7 @@ /turf/open/floor/engine/hull, /area/ship/external) "mz" = ( -/obj/effect/turf_decal/corner/opaque/solgovblue/three_quarters, +/obj/effect/turf_decal/corner/opaque/terragovblue/three_quarters, /obj/structure/chair/office, /obj/effect/landmark/start/station_engineer, /turf/open/floor/plasteel/white, @@ -1358,7 +1358,7 @@ /area/ship/crew) "mP" = ( /obj/structure/filingcabinet/double, -/obj/item/documents/solgov, +/obj/item/documents/terragov, /obj/effect/turf_decal/spline/fancy/wood{ dir = 1 }, @@ -1410,9 +1410,9 @@ /area/ship/engineering/engine) "nj" = ( /obj/structure/bed, -/obj/item/bedsheet/solgov, +/obj/item/bedsheet/terragov, /obj/structure/curtain/cloth, -/obj/structure/sign/solgov_flag{ +/obj/structure/sign/terragov_flag{ dir = 1; pixel_y = -27 }, @@ -1444,7 +1444,7 @@ /obj/structure/cable{ icon_state = "1-4" }, -/obj/effect/turf_decal/solgov/center, +/obj/effect/turf_decal/terragov/center, /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ dir = 8 }, @@ -1463,10 +1463,10 @@ pixel_x = -5; pixel_y = -1 }, -/obj/item/pen/solgov{ +/obj/item/pen/terragov{ pixel_x = -4 }, -/obj/effect/turf_decal/corner/opaque/solgovblue/three_quarters{ +/obj/effect/turf_decal/corner/opaque/terragovblue/three_quarters{ dir = 8 }, /obj/structure/cable{ @@ -1485,7 +1485,7 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/door/airlock/solgov{ +/obj/machinery/door/airlock/terragov{ dir = 4 }, /obj/effect/turf_decal/industrial/warning{ @@ -1526,7 +1526,7 @@ /turf/open/floor/wood, /area/ship/crew/office) "oC" = ( -/obj/effect/turf_decal/corner/opaque/solgovgold/three_quarters{ +/obj/effect/turf_decal/corner/opaque/terragovgold/three_quarters{ dir = 1 }, /obj/structure/cable/yellow{ @@ -1548,7 +1548,7 @@ /obj/structure/window/reinforced{ dir = 4 }, -/obj/effect/turf_decal/corner/opaque/solgovblue{ +/obj/effect/turf_decal/corner/opaque/terragovblue{ dir = 10 }, /obj/effect/turf_decal/techfloor{ @@ -1561,7 +1561,7 @@ /obj/machinery/telecomms/bus{ id = "bus mainframe"; network = "SolNet"; - autolinkers = list("processor7","solgov") + autolinkers = list("processor7","terragov") }, /turf/open/floor/circuit, /area/ship/engineering) @@ -1581,7 +1581,7 @@ /obj/machinery/atmospherics/pipe/simple/orange/visible/layer2{ dir = 5 }, -/obj/effect/turf_decal/corner/opaque/solgovblue{ +/obj/effect/turf_decal/corner/opaque/terragovblue{ dir = 6 }, /obj/effect/decal/cleanable/dirt, @@ -1658,8 +1658,8 @@ /area/ship/crew/crewtwo) "qg" = ( /obj/structure/closet/cabinet, -/obj/item/clothing/suit/solgov/dress, -/obj/item/clothing/suit/solgov/jacket, +/obj/item/clothing/suit/terragov/dress, +/obj/item/clothing/suit/terragov/jacket, /obj/item/radio/headset, /obj/item/radio/headset, /obj/item/radio/headset, @@ -1668,10 +1668,10 @@ /obj/item/radio, /obj/item/radio/intercom/directional/north, /obj/machinery/light/small/directional/east, -/obj/item/clothing/under/solgov, -/obj/item/clothing/under/solgov, -/obj/item/clothing/under/solgov/dress, -/obj/item/clothing/under/solgov/dress, +/obj/item/clothing/under/terragov, +/obj/item/clothing/under/terragov, +/obj/item/clothing/under/terragov/dress, +/obj/item/clothing/under/terragov/dress, /turf/open/floor/wood, /area/ship/crew/dorm) "qz" = ( @@ -1741,7 +1741,7 @@ /turf/closed/wall/mineral/titanium, /area/ship/crew/office) "rJ" = ( -/obj/machinery/suit_storage_unit/solgov, +/obj/machinery/suit_storage_unit/terragov, /obj/item/radio/intercom/directional/south, /obj/effect/turf_decal/techfloor/corner{ dir = 8 @@ -1799,7 +1799,7 @@ /turf/open/floor/wood, /area/ship/crew) "sa" = ( -/obj/machinery/computer/telecomms/monitor/solgov{ +/obj/machinery/computer/telecomms/monitor/terragov{ dir = 1; network = "SolNet" }, @@ -1902,7 +1902,7 @@ /turf/open/floor/plasteel/tech, /area/ship/security/armory) "sL" = ( -/obj/effect/turf_decal/corner/opaque/solgovgold/three_quarters, +/obj/effect/turf_decal/corner/opaque/terragovgold/three_quarters, /obj/structure/cable{ icon_state = "1-2" }, @@ -1918,13 +1918,13 @@ "sM" = ( /obj/machinery/atmospherics/pipe/simple/orange/visible/layer2, /obj/machinery/atmospherics/pipe/simple/green/visible, -/obj/effect/turf_decal/corner/opaque/solgovblue{ +/obj/effect/turf_decal/corner/opaque/terragovblue{ dir = 6 }, /turf/open/floor/plasteel/tech, /area/ship/engineering/engine) "sS" = ( -/obj/effect/turf_decal/corner/opaque/solgovblue{ +/obj/effect/turf_decal/corner/opaque/terragovblue{ dir = 9 }, /obj/structure/cable{ @@ -1997,7 +1997,7 @@ req_one_access = list(61,11) }, /obj/machinery/telecomms/message_server{ - autolinkers = list("solgovPDA"); + autolinkers = list("terragovPDA"); network = "SolNet"; calibrating = 0 }, @@ -2017,7 +2017,7 @@ pixel_x = -5; pixel_y = -1 }, -/obj/item/pen/solgov{ +/obj/item/pen/terragov{ pixel_x = -5 }, /turf/open/floor/wood/walnut, @@ -2063,7 +2063,7 @@ /turf/open/floor/plating, /area/ship/bridge) "uD" = ( -/obj/effect/turf_decal/corner/opaque/solgovgold{ +/obj/effect/turf_decal/corner/opaque/terragovgold{ dir = 9 }, /obj/effect/turf_decal/techfloor/corner{ @@ -2129,7 +2129,7 @@ /turf/open/floor/plasteel/tech, /area/ship/crew/crewtwo) "vr" = ( -/obj/effect/turf_decal/corner/opaque/solgovgold/three_quarters, +/obj/effect/turf_decal/corner/opaque/terragovgold/three_quarters, /obj/structure/cable/yellow{ icon_state = "4-8" }, @@ -2181,7 +2181,7 @@ /obj/machinery/atmospherics/components/unary/outlet_injector/on/layer4{ dir = 4 }, -/obj/structure/sign/solgov_seal, +/obj/structure/sign/terragov_seal, /turf/open/floor/engine/hull/reinforced, /area/ship/engineering/engine) "wK" = ( @@ -2191,7 +2191,7 @@ /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ dir = 1 }, -/obj/effect/turf_decal/corner/opaque/solgovblue{ +/obj/effect/turf_decal/corner/opaque/terragovblue{ dir = 10 }, /turf/open/floor/plasteel/white, @@ -2201,7 +2201,7 @@ dir = 1 }, /obj/machinery/light/floor, -/obj/structure/sign/solgov_seal{ +/obj/structure/sign/terragov_seal{ pixel_y = 0; pixel_x = -29 }, @@ -2238,7 +2238,7 @@ }, /obj/structure/table/wood/fancy/purple, /obj/item/paper/crumpled, -/obj/item/pen/fountain/solgov, +/obj/item/pen/fountain/terragov, /obj/effect/turf_decal/spline/fancy/wood{ dir = 4 }, @@ -2311,7 +2311,7 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/door/airlock/solgov{ +/obj/machinery/door/airlock/terragov{ dir = 4; name = "Command Wing" }, @@ -2393,7 +2393,7 @@ dir = 5 }, /obj/machinery/atmospherics/pipe/simple/orange/visible/layer2, -/obj/effect/turf_decal/corner/opaque/solgovblue{ +/obj/effect/turf_decal/corner/opaque/terragovblue{ dir = 6 }, /turf/open/floor/plasteel/tech, @@ -2607,7 +2607,7 @@ /turf/open/floor/carpet/blue, /area/ship/crew) "zw" = ( -/obj/effect/turf_decal/solgov/bottom_right, +/obj/effect/turf_decal/terragov/bottom_right, /obj/effect/turf_decal/spline/fancy/opaque/grey{ dir = 4 }, @@ -2631,7 +2631,7 @@ /turf/open/floor/plasteel, /area/ship/cargo) "Ad" = ( -/obj/effect/turf_decal/corner/opaque/solgovblue{ +/obj/effect/turf_decal/corner/opaque/terragovblue{ dir = 9 }, /obj/structure/cable{ @@ -2650,7 +2650,7 @@ dir = 5 }, /obj/machinery/light/small/directional/south, -/obj/structure/sign/solgov_seal{ +/obj/structure/sign/terragov_seal{ pixel_y = 0; pixel_x = -29 }, @@ -2660,7 +2660,7 @@ /obj/structure/railing/corner/wood{ color = "#543C30" }, -/obj/machinery/computer/helm/solgov{ +/obj/machinery/computer/helm/terragov{ dir = 8 }, /turf/open/floor/wood/walnut, @@ -2675,29 +2675,29 @@ }, /obj/item/storage/backpack/industrial, /obj/effect/turf_decal/industrial/outline/orange, -/obj/item/clothing/head/hardhat/solgov, -/obj/item/folder/solgov, +/obj/item/clothing/head/hardhat/terragov, +/obj/item/folder/terragov, /obj/item/clipboard, -/obj/item/clothing/under/solgov/formal, -/obj/item/clothing/under/solgov, +/obj/item/clothing/under/terragov/formal, +/obj/item/clothing/under/terragov, /obj/item/clothing/accessory/armband/engine, /obj/item/storage/toolbox/mechanical, /obj/item/clothing/glasses/welding, /obj/item/clothing/head/welding, -/obj/item/pen/solgov, -/obj/item/clothing/suit/hazardvest/solgov, +/obj/item/pen/terragov, +/obj/item/clothing/suit/hazardvest/terragov, /obj/item/clothing/shoes/workboots, /obj/item/clothing/gloves/combat, /obj/machinery/light/directional/west, -/obj/structure/sign/poster/solgov/random{ +/obj/structure/sign/poster/terragov/random{ pixel_y = 30 }, /turf/open/floor/plasteel/tech/grid, /area/ship/engineering) "Au" = ( /obj/structure/closet/cabinet, -/obj/item/clothing/suit/solgov/dress, -/obj/item/clothing/suit/solgov/jacket, +/obj/item/clothing/suit/terragov/dress, +/obj/item/clothing/suit/terragov/jacket, /obj/item/radio/headset, /obj/item/radio/headset, /obj/item/radio/headset, @@ -2712,17 +2712,17 @@ pixel_y = 21; pixel_x = -12 }, -/obj/item/clothing/under/solgov, -/obj/item/clothing/under/solgov, -/obj/item/clothing/under/solgov/dress, -/obj/item/clothing/under/solgov/dress, +/obj/item/clothing/under/terragov, +/obj/item/clothing/under/terragov, +/obj/item/clothing/under/terragov/dress, +/obj/item/clothing/under/terragov/dress, /obj/machinery/camera/autoname{ dir = 6 }, /turf/open/floor/wood, /area/ship/crew/dorm) "Ax" = ( -/obj/effect/turf_decal/corner/opaque/solgovblue{ +/obj/effect/turf_decal/corner/opaque/terragovblue{ dir = 5 }, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, @@ -2775,7 +2775,7 @@ /area/ship/engineering/engine) "AQ" = ( /obj/effect/turf_decal/techfloor/corner, -/obj/effect/turf_decal/corner/opaque/solgovblue{ +/obj/effect/turf_decal/corner/opaque/terragovblue{ dir = 1 }, /turf/open/floor/plasteel/white, @@ -2853,7 +2853,7 @@ /turf/open/floor/engine/o2, /area/ship/engineering/engine) "BE" = ( -/obj/effect/turf_decal/corner/opaque/solgovblue{ +/obj/effect/turf_decal/corner/opaque/terragovblue{ dir = 4 }, /turf/open/floor/plasteel/white, @@ -2873,7 +2873,7 @@ /turf/open/floor/wood, /area/ship/bridge) "Cb" = ( -/obj/effect/turf_decal/corner/opaque/solgovblue{ +/obj/effect/turf_decal/corner/opaque/terragovblue{ dir = 9 }, /obj/structure/cable{ @@ -2910,7 +2910,7 @@ /turf/open/floor/wood, /area/ship/bridge) "Cm" = ( -/obj/machinery/door/airlock/solgov{ +/obj/machinery/door/airlock/terragov{ dir = 4; name = "Captain's Quarters"; req_access = list(20) @@ -2947,7 +2947,7 @@ /turf/open/floor/plasteel/tech/techmaint, /area/ship/engineering) "CC" = ( -/obj/machinery/door/airlock/solgov{ +/obj/machinery/door/airlock/terragov{ dir = 4; name = "Overseer's Quarters"; req_access = list(57) @@ -2996,7 +2996,7 @@ /turf/open/floor/plasteel/white, /area/ship/security/armory) "CU" = ( -/obj/machinery/fax/solgov, +/obj/machinery/fax/terragov, /obj/structure/table/wood, /obj/machinery/light/small/directional/south, /turf/open/floor/wood, @@ -3094,7 +3094,7 @@ /turf/open/floor/plasteel/tech, /area/ship/security/armory) "Ep" = ( -/obj/effect/turf_decal/corner/opaque/solgovgold/three_quarters{ +/obj/effect/turf_decal/corner/opaque/terragovgold/three_quarters{ dir = 1 }, /obj/effect/turf_decal/techfloor/corner{ @@ -3134,7 +3134,7 @@ /obj/item/gps{ gpstag = "SGSV Chronicle" }, -/obj/item/pen/fountain/solgov, +/obj/item/pen/fountain/terragov, /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/wood, /area/ship/bridge) @@ -3211,7 +3211,7 @@ /turf/open/floor/plasteel/white, /area/ship/security/armory) "Fh" = ( -/obj/structure/sign/solgov_seal{ +/obj/structure/sign/terragov_seal{ pixel_y = 0; pixel_x = 28 }, @@ -3241,8 +3241,8 @@ /area/ship/crew/crewtwo) "FC" = ( /obj/structure/bed, -/obj/item/bedsheet/solgov, -/obj/structure/sign/solgov_flag{ +/obj/item/bedsheet/terragov, +/obj/structure/sign/terragov_flag{ dir = 8; pixel_x = 28 }, @@ -3260,7 +3260,7 @@ /turf/open/floor/wood/walnut, /area/ship/bridge) "FM" = ( -/obj/effect/turf_decal/corner/opaque/solgovblue{ +/obj/effect/turf_decal/corner/opaque/terragovblue{ dir = 6 }, /obj/structure/cable{ @@ -3348,19 +3348,19 @@ /turf/open/floor/plasteel/tech/techmaint, /area/ship/engineering/engine) "Gw" = ( -/obj/effect/turf_decal/corner/opaque/solgovblue/three_quarters{ +/obj/effect/turf_decal/corner/opaque/terragovblue/three_quarters{ dir = 4 }, /turf/open/floor/plasteel/white, /area/ship/engineering) "GH" = ( -/obj/effect/turf_decal/corner/opaque/solgovgold{ +/obj/effect/turf_decal/corner/opaque/terragovgold{ dir = 6 }, /turf/template_noop, /area/template_noop) "GP" = ( -/obj/machinery/door/airlock/solgov{ +/obj/machinery/door/airlock/terragov{ dir = 4; name = "Armaments Wing"; req_one_access = list(1,48) @@ -3400,7 +3400,7 @@ dir = 8; color = "#543C30" }, -/obj/effect/turf_decal/corner/opaque/solgovblue{ +/obj/effect/turf_decal/corner/opaque/terragovblue{ dir = 5 }, /obj/machinery/light/small/directional/north, @@ -3432,7 +3432,7 @@ /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, /obj/structure/extinguisher_cabinet/directional/west, /obj/machinery/suit_storage_unit/inherit, -/obj/item/clothing/suit/space/hardsuit/solgov, +/obj/item/clothing/suit/space/hardsuit/terragov, /obj/item/tank/jetpack/oxygen, /turf/open/floor/wood, /area/ship/crew/office) @@ -3462,7 +3462,7 @@ /turf/open/floor/plating, /area/ship/crew/crewtwo) "Ii" = ( -/obj/effect/turf_decal/corner/opaque/solgovblue{ +/obj/effect/turf_decal/corner/opaque/terragovblue{ dir = 10 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ @@ -3496,7 +3496,7 @@ /turf/closed/wall/mineral/titanium/nodiagonal, /area/ship/crew/crewtwo) "Iv" = ( -/obj/effect/turf_decal/corner/opaque/solgovblue/three_quarters, +/obj/effect/turf_decal/corner/opaque/terragovblue/three_quarters, /obj/structure/cable{ icon_state = "1-8" }, @@ -3523,15 +3523,15 @@ /turf/open/floor/plasteel/tech/grid, /area/ship/engineering/engine) "IH" = ( -/obj/machinery/telecomms/server/presets/solgov{ - autolinkers = list("solgov","sproingle"); +/obj/machinery/telecomms/server/presets/terragov{ + autolinkers = list("terragov","sproingle"); network = "SolNet" }, /obj/machinery/door/window/brigdoor/northleft{ dir = 2; req_one_access = list(61,11) }, -/obj/structure/sign/poster/solgov/random{ +/obj/structure/sign/poster/terragov/random{ pixel_y = 30 }, /obj/structure/window/reinforced{ @@ -3549,7 +3549,7 @@ pixel_x = -5; pixel_y = -1 }, -/obj/item/pen/solgov{ +/obj/item/pen/terragov{ pixel_x = -5 }, /turf/open/floor/wood/walnut, @@ -3563,15 +3563,15 @@ /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ dir = 1 }, -/obj/effect/turf_decal/corner/opaque/solgovblue{ +/obj/effect/turf_decal/corner/opaque/terragovblue{ dir = 5 }, /turf/open/floor/plasteel/white, /area/ship/security/armory) "Jh" = ( /obj/structure/table/wood/fancy/blue, -/obj/machinery/fax/solgov, -/obj/item/desk_flag/solgov{ +/obj/machinery/fax/terragov, +/obj/item/desk_flag/terragov{ pixel_x = -9; pixel_y = 14 }, @@ -3579,14 +3579,14 @@ /turf/open/floor/wood/walnut, /area/ship/bridge) "Jn" = ( -/obj/item/bedsheet/double/solgov{ +/obj/item/bedsheet/double/terragov{ dir = 1 }, /obj/structure/bed/double{ dir = 1 }, /obj/machinery/light/small/directional/south, -/obj/structure/sign/solgov_flag{ +/obj/structure/sign/terragov_flag{ dir = 4; pixel_x = -27 }, @@ -3608,7 +3608,7 @@ /turf/open/floor/wood, /area/ship/crew) "JH" = ( -/obj/machinery/computer/telecomms/server/solgov{ +/obj/machinery/computer/telecomms/server/terragov{ dir = 1; network = "SolNet" }, @@ -3686,7 +3686,7 @@ /obj/structure/cable/yellow{ icon_state = "4-10" }, -/obj/effect/turf_decal/corner/opaque/solgovgold{ +/obj/effect/turf_decal/corner/opaque/terragovgold{ dir = 6 }, /obj/structure/cable{ @@ -3734,8 +3734,8 @@ desc = "A locker that holds weapons."; name = "weapon locker" }, -/obj/item/gun/ballistic/automatic/pistol/solgov, -/obj/item/gun/ballistic/automatic/pistol/solgov, +/obj/item/gun/ballistic/automatic/pistol/terragov, +/obj/item/gun/ballistic/automatic/pistol/terragov, /obj/machinery/light/directional/north, /obj/effect/turf_decal/techfloor{ dir = 1 @@ -3791,7 +3791,7 @@ }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/door/airlock/solgov, +/obj/machinery/door/airlock/terragov, /obj/machinery/door/firedoor/border_only, /obj/machinery/door/firedoor/border_only{ dir = 1 @@ -3809,7 +3809,7 @@ /obj/structure/cable{ icon_state = "4-8" }, -/obj/effect/turf_decal/corner/opaque/solgovblue/three_quarters{ +/obj/effect/turf_decal/corner/opaque/terragovblue/three_quarters{ dir = 4 }, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ @@ -3832,7 +3832,7 @@ dir = 8 }, /obj/item/radio/intercom/table, -/obj/effect/turf_decal/corner/opaque/solgovblue{ +/obj/effect/turf_decal/corner/opaque/terragovblue{ dir = 10 }, /obj/machinery/light/small/directional/south, @@ -3849,7 +3849,7 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 4 }, -/obj/effect/turf_decal/corner/opaque/solgovblue, +/obj/effect/turf_decal/corner/opaque/terragovblue, /turf/open/floor/plasteel/white, /area/ship/security/armory) "LB" = ( @@ -3899,7 +3899,7 @@ "Me" = ( /obj/machinery/cryopod, /obj/machinery/light/small/directional/north, -/obj/effect/turf_decal/corner/opaque/solgovblue{ +/obj/effect/turf_decal/corner/opaque/terragovblue{ dir = 5 }, /obj/machinery/camera/autoname{ @@ -3959,7 +3959,7 @@ /area/ship/crew/crewtwo) "Nb" = ( /obj/machinery/atmospherics/pipe/manifold/supply/visible/layer2, -/obj/effect/turf_decal/corner/opaque/solgovgold/three_quarters, +/obj/effect/turf_decal/corner/opaque/terragovgold/three_quarters, /obj/effect/turf_decal/techfloor/corner{ dir = 4 }, @@ -4037,7 +4037,7 @@ /turf/open/floor/plasteel/freezer, /area/ship/crew/dorm) "Ob" = ( -/obj/effect/turf_decal/corner/opaque/solgovgold/three_quarters{ +/obj/effect/turf_decal/corner/opaque/terragovgold/three_quarters{ dir = 8 }, /obj/effect/turf_decal/techfloor/corner, @@ -4093,10 +4093,10 @@ pixel_x = -5; pixel_y = -1 }, -/obj/item/folder/solgov{ +/obj/item/folder/terragov{ pixel_x = 4 }, -/obj/item/pen/solgov{ +/obj/item/pen/terragov{ pixel_x = 2 }, /obj/effect/turf_decal/spline/fancy/wood{ @@ -4106,25 +4106,25 @@ /area/ship/crew/office) "OU" = ( /obj/item/clothing/neck/cloak/overseer, -/obj/item/clothing/suit/armor/vest/bulletproof/solgov/overseer, +/obj/item/clothing/suit/armor/vest/bulletproof/terragov/overseer, /obj/structure/closet/secure_closet/head_of_personnel{ anchored = 1; name = "\proper overseer's locker"; populate = 0 }, /obj/item/clothing/gloves/combat, -/obj/item/folder/solgov, -/obj/item/folder/solgov, -/obj/item/folder/documents/solgov, -/obj/item/clothing/under/solgov/formal, -/obj/item/clothing/head/solgov, -/obj/item/storage/belt/sabre/solgov, +/obj/item/folder/terragov, +/obj/item/folder/terragov, +/obj/item/folder/documents/terragov, +/obj/item/clothing/under/terragov/formal, +/obj/item/clothing/head/terragov, +/obj/item/storage/belt/sabre/terragov, /obj/item/storage/backpack, -/obj/item/pen/solgov, -/obj/item/clothing/under/solgov/dress, -/obj/item/stamp/solgov, +/obj/item/pen/terragov, +/obj/item/clothing/under/terragov/dress, +/obj/item/stamp/terragov, /obj/machinery/light/directional/south, -/obj/item/clothing/suit/armor/solgov_trenchcoat, +/obj/item/clothing/suit/armor/terragov_trenchcoat, /turf/open/floor/carpet/royalblue, /area/ship/crew/crewtwo) "OX" = ( @@ -4147,7 +4147,7 @@ /turf/open/floor/wood, /area/ship/crew/crewtwo) "OZ" = ( -/obj/effect/turf_decal/corner/opaque/solgovblue/three_quarters{ +/obj/effect/turf_decal/corner/opaque/terragovblue/three_quarters{ dir = 8 }, /obj/machinery/button/door{ @@ -4178,7 +4178,7 @@ dir = 8 }, /obj/machinery/light/floor, -/obj/structure/sign/solgov_seal{ +/obj/structure/sign/terragov_seal{ pixel_y = 0; pixel_x = -29 }, @@ -4209,9 +4209,9 @@ /obj/item/storage/fancy/candle_box, /obj/item/storage/fancy/candle_box, /obj/item/storage/fancy/candle_box, -/obj/item/pen/solgov, -/obj/item/pen/solgov, -/obj/item/pen/solgov, +/obj/item/pen/terragov, +/obj/item/pen/terragov, +/obj/item/pen/terragov, /obj/item/paper_bin/bundlenatural, /obj/item/paper_bin/bundlenatural, /obj/item/paper_bin/bundlenatural, @@ -4227,7 +4227,7 @@ dir = 4 }, /obj/machinery/autolathe, -/obj/structure/sign/poster/solgov/random{ +/obj/structure/sign/poster/terragov/random{ pixel_x = 28 }, /turf/open/floor/plasteel/tech/grid, @@ -4269,7 +4269,7 @@ /area/ship/engineering) "Qi" = ( /obj/item/radio/intercom/wideband/table, -/obj/effect/turf_decal/corner/opaque/solgovblue/three_quarters, +/obj/effect/turf_decal/corner/opaque/terragovblue/three_quarters, /obj/structure/table/wood/fancy/blue, /turf/open/floor/wood, /area/ship/bridge) @@ -4450,7 +4450,7 @@ /obj/structure/cable{ icon_state = "1-8" }, -/obj/effect/turf_decal/corner/opaque/solgovgold/three_quarters{ +/obj/effect/turf_decal/corner/opaque/terragovgold/three_quarters{ dir = 8 }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, @@ -4510,27 +4510,27 @@ }, /obj/item/storage/backpack/industrial, /obj/effect/turf_decal/industrial/outline/orange, -/obj/item/clothing/head/hardhat/solgov, -/obj/item/folder/solgov, +/obj/item/clothing/head/hardhat/terragov, +/obj/item/folder/terragov, /obj/item/clipboard, -/obj/item/clothing/under/solgov/formal, -/obj/item/clothing/under/solgov, +/obj/item/clothing/under/terragov/formal, +/obj/item/clothing/under/terragov, /obj/item/clothing/accessory/armband/engine, /obj/item/storage/toolbox/mechanical, /obj/item/clothing/glasses/welding, /obj/item/clothing/head/welding, -/obj/item/pen/solgov, -/obj/item/clothing/suit/hazardvest/solgov, +/obj/item/pen/terragov, +/obj/item/clothing/suit/hazardvest/terragov, /obj/item/clothing/shoes/workboots, /obj/item/clothing/gloves/combat, /turf/open/floor/plasteel/tech/grid, /area/ship/engineering) "SH" = ( /obj/machinery/cryopod, -/obj/effect/turf_decal/corner/opaque/solgovblue{ +/obj/effect/turf_decal/corner/opaque/terragovblue{ dir = 5 }, -/obj/structure/sign/poster/solgov/random{ +/obj/structure/sign/poster/terragov/random{ pixel_y = 30 }, /turf/open/floor/plasteel, @@ -4561,10 +4561,10 @@ pixel_x = -5; pixel_y = -1 }, -/obj/item/folder/solgov{ +/obj/item/folder/terragov{ pixel_x = 4 }, -/obj/item/pen/solgov{ +/obj/item/pen/terragov{ pixel_x = 2 }, /obj/machinery/light/small/directional/north, @@ -4572,7 +4572,7 @@ /turf/open/floor/wood/walnut, /area/ship/bridge) "SQ" = ( -/obj/effect/turf_decal/solgov/bottom_center, +/obj/effect/turf_decal/terragov/bottom_center, /obj/structure/cable{ icon_state = "1-2" }, @@ -4584,7 +4584,7 @@ /turf/open/floor/wood/mahogany, /area/ship/crew) "Td" = ( -/obj/effect/turf_decal/solgov/top, +/obj/effect/turf_decal/terragov/top, /obj/structure/cable{ icon_state = "1-2" }, @@ -4596,7 +4596,7 @@ /turf/open/floor/plasteel, /area/ship/cargo) "Tk" = ( -/obj/effect/turf_decal/corner/opaque/solgovblue{ +/obj/effect/turf_decal/corner/opaque/terragovblue{ dir = 5 }, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2, @@ -4650,7 +4650,7 @@ /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ dir = 1 }, -/obj/effect/turf_decal/corner/opaque/solgovblue{ +/obj/effect/turf_decal/corner/opaque/terragovblue{ dir = 5 }, /turf/open/floor/plasteel/white, @@ -4706,7 +4706,7 @@ /turf/open/floor/wood, /area/ship/crew) "Ut" = ( -/obj/effect/turf_decal/solgov/top_right, +/obj/effect/turf_decal/terragov/top_right, /obj/effect/turf_decal/spline/fancy/opaque/grey{ dir = 4 }, @@ -4721,7 +4721,7 @@ pixel_y = 5 }, /obj/machinery/light/small/directional/north, -/obj/structure/sign/poster/solgov/random{ +/obj/structure/sign/poster/terragov/random{ pixel_x = -28 }, /turf/open/floor/wood/mahogany, @@ -4757,7 +4757,7 @@ /area/ship/crew/office) "US" = ( /obj/structure/table/wood, -/obj/item/desk_flag/solgov{ +/obj/item/desk_flag/terragov{ pixel_y = 2; pixel_x = 8 }, @@ -4855,7 +4855,7 @@ /turf/open/floor/plasteel/tech/grid, /area/ship/engineering/engine) "Wo" = ( -/obj/machinery/suit_storage_unit/solgov, +/obj/machinery/suit_storage_unit/terragov, /obj/machinery/firealarm/directional/south, /obj/effect/turf_decal/techfloor/corner, /obj/structure/window/reinforced{ @@ -4871,7 +4871,7 @@ /turf/closed/wall/mineral/titanium, /area/ship/engineering/engine) "WX" = ( -/obj/machinery/suit_storage_unit/solgov, +/obj/machinery/suit_storage_unit/terragov, /obj/machinery/light/directional/south, /obj/structure/window/reinforced{ dir = 4 @@ -4883,7 +4883,7 @@ /turf/open/floor/plasteel/tech/grid, /area/ship/security/armory) "WY" = ( -/obj/structure/sign/poster/solgov/random{ +/obj/structure/sign/poster/terragov/random{ pixel_y = 30 }, /obj/effect/turf_decal/spline/fancy/wood{ @@ -4914,7 +4914,7 @@ /turf/open/floor/wood, /area/ship/bridge) "Xg" = ( -/obj/effect/turf_decal/solgov/bottom_left, +/obj/effect/turf_decal/terragov/bottom_left, /obj/machinery/airalarm/directional/south, /obj/effect/turf_decal/spline/fancy/opaque/grey{ dir = 8 @@ -5008,7 +5008,7 @@ "XG" = ( /obj/machinery/vending/coffee, /obj/effect/turf_decal/siding/wood/corner, -/obj/structure/sign/poster/solgov/random{ +/obj/structure/sign/poster/terragov/random{ pixel_y = 30 }, /turf/open/floor/wood, @@ -5062,7 +5062,7 @@ /obj/effect/turf_decal/spline/fancy/wood, /obj/machinery/light/small/directional/south, /obj/item/paper/crumpled, -/obj/item/pen/solgov{ +/obj/item/pen/terragov{ pixel_x = -5 }, /turf/open/floor/wood, @@ -5077,7 +5077,7 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 4 }, -/obj/effect/turf_decal/corner/opaque/solgovblue{ +/obj/effect/turf_decal/corner/opaque/terragovblue{ dir = 8 }, /turf/open/floor/plasteel/white, @@ -5115,7 +5115,7 @@ /obj/structure/closet/crate/medical, /obj/item/storage/box/masks, /obj/item/storage/box/rxglasses, -/obj/structure/sign/poster/solgov/random{ +/obj/structure/sign/poster/terragov/random{ pixel_y = 30 }, /obj/item/storage/firstaid/regular, @@ -5124,7 +5124,7 @@ /turf/open/floor/plasteel/patterned/cargo_one, /area/ship/cargo) "Zx" = ( -/obj/effect/turf_decal/solgov, +/obj/effect/turf_decal/terragov, /obj/machinery/power/apc/auto_name/directional/north, /obj/structure/cable{ icon_state = "0-4" diff --git a/_maps/shuttles/solgov/solgov_inkwell.dmm b/_maps/shuttles/solgov/solgov_inkwell.dmm index 22f6c55e224a..2c1bcfdcc44a 100644 --- a/_maps/shuttles/solgov/solgov_inkwell.dmm +++ b/_maps/shuttles/solgov/solgov_inkwell.dmm @@ -14,7 +14,7 @@ /turf/open/floor/wood, /area/ship/crew/canteen/kitchen) "ao" = ( -/obj/effect/turf_decal/corner/opaque/solgovblue{ +/obj/effect/turf_decal/corner/opaque/terragovblue{ dir = 8 }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ @@ -75,7 +75,7 @@ /turf/open/floor/plasteel/mono, /area/ship/cargo) "bf" = ( -/obj/effect/turf_decal/corner/opaque/solgovgold/three_quarters, +/obj/effect/turf_decal/corner/opaque/terragovgold/three_quarters, /obj/effect/turf_decal/techfloor/corner{ dir = 4 }, @@ -91,19 +91,19 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 5 }, -/obj/effect/turf_decal/trimline/opaque/solgovblue/warning{ +/obj/effect/turf_decal/trimline/opaque/terragovblue/warning{ dir = 6 }, /turf/open/floor/plasteel/white, /area/ship/security/armory) "bh" = ( /obj/structure/bed, -/obj/item/bedsheet/solgov, -/obj/structure/sign/solgov_flag{ +/obj/item/bedsheet/terragov, +/obj/structure/sign/terragov_flag{ dir = 8; pixel_x = 28 }, -/obj/structure/sign/poster/solgov/random{ +/obj/structure/sign/poster/terragov/random{ pixel_y = 32 }, /turf/open/floor/carpet/royalblue, @@ -125,7 +125,7 @@ /turf/open/floor/wood/walnut, /area/ship/crew/dorm/dormtwo) "br" = ( -/obj/effect/turf_decal/corner/opaque/solgovblue{ +/obj/effect/turf_decal/corner/opaque/terragovblue{ dir = 8 }, /turf/open/floor/plasteel/patterned, @@ -140,17 +140,17 @@ populate = 0 }, /obj/item/storage/backpack/industrial, -/obj/item/clothing/head/hardhat/solgov, -/obj/item/folder/solgov, +/obj/item/clothing/head/hardhat/terragov, +/obj/item/folder/terragov, /obj/item/clipboard, -/obj/item/clothing/under/solgov/formal, -/obj/item/clothing/under/solgov, +/obj/item/clothing/under/terragov/formal, +/obj/item/clothing/under/terragov, /obj/item/clothing/accessory/armband/engine, /obj/item/storage/toolbox/mechanical, /obj/item/clothing/glasses/welding, /obj/item/clothing/head/welding, -/obj/item/pen/solgov, -/obj/item/clothing/suit/hazardvest/solgov, +/obj/item/pen/terragov, +/obj/item/clothing/suit/hazardvest/terragov, /obj/item/clothing/shoes/workboots, /obj/item/clothing/gloves/combat, /obj/effect/turf_decal/techfloor, @@ -165,19 +165,19 @@ name = "sonnensöldners's locker"; anchored = 1 }, -/obj/item/clothing/head/solgov/sonnensoldner, +/obj/item/clothing/head/terragov/sonnensoldner, /obj/item/radio{ icon_state = "sec_radio" }, -/obj/item/clothing/under/solgov/formal, -/obj/item/clothing/under/solgov/dress, -/obj/item/clothing/under/solgov, +/obj/item/clothing/under/terragov/formal, +/obj/item/clothing/under/terragov/dress, +/obj/item/clothing/under/terragov, /obj/item/clothing/shoes/workboots, -/obj/item/storage/belt/sabre/solgov, +/obj/item/storage/belt/sabre/terragov, /obj/item/clothing/gloves/combat, -/obj/item/radio/headset/solgov/alt, +/obj/item/radio/headset/terragov/alt, /obj/item/storage/backpack, -/obj/item/clothing/suit/armor/vest/bulletproof/solgov, +/obj/item/clothing/suit/armor/vest/bulletproof/terragov, /obj/effect/turf_decal/techfloor, /obj/effect/turf_decal/industrial/outline/red, /obj/structure/window/reinforced{ @@ -219,7 +219,7 @@ /turf/closed/wall/mineral/titanium, /area/ship/crew/library) "ce" = ( -/obj/structure/sign/solgov_seal{ +/obj/structure/sign/terragov_seal{ pixel_y = 0; pixel_x = 28 }, @@ -231,7 +231,7 @@ /turf/open/floor/wood/birch, /area/ship/hallway/starboard) "co" = ( -/obj/effect/turf_decal/corner/opaque/solgovblue/full, +/obj/effect/turf_decal/corner/opaque/terragovblue/full, /obj/structure/cable{ icon_state = "1-8" }, @@ -269,16 +269,16 @@ /turf/open/floor/plasteel/white, /area/ship/cargo/office) "cG" = ( -/obj/effect/turf_decal/spline/fancy/transparent/solgovblue{ +/obj/effect/turf_decal/spline/fancy/transparent/terragovblue{ dir = 8 }, -/obj/effect/turf_decal/spline/fancy/transparent/solgovblue{ +/obj/effect/turf_decal/spline/fancy/transparent/terragovblue{ dir = 4 }, -/obj/effect/turf_decal/trimline/opaque/solgovblue/warning{ +/obj/effect/turf_decal/trimline/opaque/terragovblue/warning{ dir = 4 }, -/obj/effect/turf_decal/trimline/opaque/solgovblue/warning{ +/obj/effect/turf_decal/trimline/opaque/terragovblue/warning{ dir = 8 }, /turf/open/floor/plasteel/patterned/cargo_one, @@ -296,19 +296,19 @@ name = "sonnensöldners's locker"; anchored = 1 }, -/obj/item/clothing/head/solgov/sonnensoldner, +/obj/item/clothing/head/terragov/sonnensoldner, /obj/item/radio{ icon_state = "sec_radio" }, -/obj/item/clothing/under/solgov/formal, -/obj/item/clothing/under/solgov/dress, -/obj/item/clothing/under/solgov, +/obj/item/clothing/under/terragov/formal, +/obj/item/clothing/under/terragov/dress, +/obj/item/clothing/under/terragov, /obj/item/clothing/shoes/workboots, -/obj/item/storage/belt/sabre/solgov, +/obj/item/storage/belt/sabre/terragov, /obj/item/clothing/gloves/combat, -/obj/item/radio/headset/solgov/alt, +/obj/item/radio/headset/terragov/alt, /obj/item/storage/backpack, -/obj/item/clothing/suit/armor/vest/bulletproof/solgov, +/obj/item/clothing/suit/armor/vest/bulletproof/terragov, /obj/effect/turf_decal/techfloor, /obj/effect/turf_decal/industrial/outline/red, /obj/structure/window/reinforced{ @@ -324,7 +324,7 @@ /turf/open/floor/wood/walnut, /area/ship/crew/dorm/dormtwo) "cO" = ( -/obj/effect/turf_decal/solgov/wood/center_right, +/obj/effect/turf_decal/terragov/wood/center_right, /obj/structure/cable{ icon_state = "1-8" }, @@ -381,7 +381,7 @@ /turf/open/floor/plasteel/mono, /area/ship/cargo) "df" = ( -/obj/effect/turf_decal/corner/opaque/solgovgold{ +/obj/effect/turf_decal/corner/opaque/terragovgold{ dir = 9 }, /obj/effect/turf_decal/techfloor/corner{ @@ -396,7 +396,7 @@ /obj/structure/cable{ icon_state = "2-8" }, -/obj/effect/turf_decal/trimline/opaque/solgovblue/warning{ +/obj/effect/turf_decal/trimline/opaque/terragovblue/warning{ dir = 8 }, /obj/effect/decal/cleanable/dirt/dust, @@ -431,7 +431,7 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/door/airlock/solgov{ +/obj/machinery/door/airlock/terragov{ dir = 4; req_one_access = list(20); name = "Captain's Quarters"; @@ -446,7 +446,7 @@ /turf/open/floor/plasteel/mono/dark, /area/ship/crew/dorm/dormtwo) "dp" = ( -/obj/effect/turf_decal/corner/opaque/solgovblue{ +/obj/effect/turf_decal/corner/opaque/terragovblue{ dir = 8 }, /obj/structure/cable{ @@ -492,14 +492,14 @@ /turf/open/floor/wood, /area/ship/crew/canteen/kitchen) "dH" = ( -/obj/effect/turf_decal/spline/fancy/transparent/solgovblue{ +/obj/effect/turf_decal/spline/fancy/transparent/terragovblue{ dir = 1 }, -/obj/effect/turf_decal/spline/fancy/transparent/solgovblue, -/obj/effect/turf_decal/trimline/opaque/solgovblue/warning{ +/obj/effect/turf_decal/spline/fancy/transparent/terragovblue, +/obj/effect/turf_decal/trimline/opaque/terragovblue/warning{ dir = 1 }, -/obj/effect/turf_decal/trimline/opaque/solgovblue/warning, +/obj/effect/turf_decal/trimline/opaque/terragovblue/warning, /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/plasteel/patterned/cargo_one, /area/ship/cargo) @@ -512,7 +512,7 @@ /turf/open/floor/plasteel/white, /area/ship/hallway/starboard) "dM" = ( -/obj/effect/turf_decal/spline/fancy/transparent/solgovblue{ +/obj/effect/turf_decal/spline/fancy/transparent/terragovblue{ dir = 8 }, /obj/structure/cable{ @@ -521,7 +521,7 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/effect/turf_decal/trimline/opaque/solgovblue/warning{ +/obj/effect/turf_decal/trimline/opaque/terragovblue/warning{ dir = 8 }, /obj/effect/decal/cleanable/dirt/dust, @@ -642,7 +642,7 @@ /turf/open/floor/plasteel/white, /area/ship/security/armory) "eA" = ( -/obj/effect/turf_decal/corner/opaque/solgovblue/full, +/obj/effect/turf_decal/corner/opaque/terragovblue/full, /obj/structure/cable{ icon_state = "2-4" }, @@ -702,7 +702,7 @@ /turf/open/floor/wood/birch, /area/ship/crew/canteen) "eX" = ( -/obj/effect/turf_decal/corner/opaque/solgovgold{ +/obj/effect/turf_decal/corner/opaque/terragovgold{ dir = 6 }, /obj/effect/turf_decal/techfloor/corner, @@ -721,7 +721,7 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/effect/turf_decal/trimline/opaque/solgovblue/warning{ +/obj/effect/turf_decal/trimline/opaque/terragovblue/warning{ dir = 4 }, /turf/open/floor/plasteel/white, @@ -736,14 +736,14 @@ /turf/open/floor/plasteel/mono/dark, /area/ship/hallway/starboard) "fi" = ( -/obj/effect/turf_decal/spline/fancy/transparent/solgovblue/corner{ +/obj/effect/turf_decal/spline/fancy/transparent/terragovblue/corner{ dir = 4 }, -/obj/effect/turf_decal/spline/fancy/transparent/solgovblue/corner, -/obj/effect/turf_decal/trimline/opaque/solgovblue/corner{ +/obj/effect/turf_decal/spline/fancy/transparent/terragovblue/corner, +/obj/effect/turf_decal/trimline/opaque/terragovblue/corner{ dir = 4 }, -/obj/effect/turf_decal/trimline/opaque/solgovblue/corner, +/obj/effect/turf_decal/trimline/opaque/terragovblue/corner, /obj/machinery/light/floor, /turf/open/floor/plasteel/patterned/cargo_one, /area/ship/cargo) @@ -761,7 +761,7 @@ /obj/effect/turf_decal/techfloor/orange{ dir = 9 }, -/obj/effect/turf_decal/corner/opaque/solgovblue, +/obj/effect/turf_decal/corner/opaque/terragovblue, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 1 }, @@ -776,26 +776,26 @@ /turf/closed/wall/mineral/titanium, /area/ship/crew/dorm) "fv" = ( -/obj/effect/turf_decal/spline/fancy/transparent/solgovblue{ +/obj/effect/turf_decal/spline/fancy/transparent/terragovblue{ dir = 4 }, -/obj/effect/turf_decal/spline/fancy/transparent/solgovblue/corner{ +/obj/effect/turf_decal/spline/fancy/transparent/terragovblue/corner{ dir = 8 }, -/obj/effect/turf_decal/trimline/opaque/solgovblue/warning{ +/obj/effect/turf_decal/trimline/opaque/terragovblue/warning{ dir = 4 }, -/obj/effect/turf_decal/trimline/opaque/solgovblue/corner{ +/obj/effect/turf_decal/trimline/opaque/terragovblue/corner{ dir = 8 }, /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/plasteel/patterned/cargo_one, /area/ship/cargo) "fB" = ( -/obj/effect/turf_decal/spline/fancy/transparent/solgovblue{ +/obj/effect/turf_decal/spline/fancy/transparent/terragovblue{ dir = 4 }, -/obj/effect/turf_decal/spline/fancy/transparent/solgovblue{ +/obj/effect/turf_decal/spline/fancy/transparent/terragovblue{ dir = 8 }, /obj/structure/cable{ @@ -807,10 +807,10 @@ /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ dir = 4 }, -/obj/effect/turf_decal/trimline/opaque/solgovblue/warning{ +/obj/effect/turf_decal/trimline/opaque/terragovblue/warning{ dir = 4 }, -/obj/effect/turf_decal/trimline/opaque/solgovblue/warning{ +/obj/effect/turf_decal/trimline/opaque/terragovblue/warning{ dir = 8 }, /turf/open/floor/plasteel/patterned/cargo_one, @@ -826,7 +826,7 @@ /turf/open/floor/wood, /area/ship/crew/canteen) "fG" = ( -/obj/effect/turf_decal/corner/opaque/solgovblue{ +/obj/effect/turf_decal/corner/opaque/terragovblue{ dir = 8 }, /obj/effect/turf_decal/techfloor/orange{ @@ -852,12 +852,12 @@ /turf/open/floor/plasteel/white, /area/ship/security/armory) "fO" = ( -/obj/effect/turf_decal/spline/fancy/transparent/solgovblue, -/obj/effect/turf_decal/spline/fancy/transparent/solgovblue/corner{ +/obj/effect/turf_decal/spline/fancy/transparent/terragovblue, +/obj/effect/turf_decal/spline/fancy/transparent/terragovblue/corner{ dir = 4 }, -/obj/effect/turf_decal/trimline/opaque/solgovblue/warning, -/obj/effect/turf_decal/trimline/opaque/solgovblue/corner{ +/obj/effect/turf_decal/trimline/opaque/terragovblue/warning, +/obj/effect/turf_decal/trimline/opaque/terragovblue/corner{ dir = 4 }, /obj/effect/decal/cleanable/dirt/dust, @@ -912,7 +912,7 @@ /obj/structure/cable{ icon_state = "1-4" }, -/obj/effect/turf_decal/corner/opaque/solgovgold{ +/obj/effect/turf_decal/corner/opaque/terragovgold{ dir = 5 }, /obj/effect/turf_decal/techfloor/corner{ @@ -921,7 +921,7 @@ /obj/effect/turf_decal/techfloor/corner{ dir = 4 }, -/obj/effect/turf_decal/trimline/opaque/solgovblue/warning{ +/obj/effect/turf_decal/trimline/opaque/terragovblue/warning{ dir = 1 }, /obj/effect/decal/cleanable/dirt/dust, @@ -952,32 +952,32 @@ /turf/open/floor/plasteel/white, /area/ship/crew/cryo) "gu" = ( -/obj/effect/turf_decal/spline/fancy/transparent/solgovblue{ +/obj/effect/turf_decal/spline/fancy/transparent/terragovblue{ dir = 4 }, -/obj/effect/turf_decal/spline/fancy/transparent/solgovblue/corner{ +/obj/effect/turf_decal/spline/fancy/transparent/terragovblue/corner{ dir = 1 }, -/obj/effect/turf_decal/spline/fancy/transparent/solgovblue{ +/obj/effect/turf_decal/spline/fancy/transparent/terragovblue{ dir = 8 }, -/obj/effect/turf_decal/trimline/opaque/solgovblue/warning{ +/obj/effect/turf_decal/trimline/opaque/terragovblue/warning{ dir = 8 }, -/obj/effect/turf_decal/trimline/opaque/solgovblue/warning{ +/obj/effect/turf_decal/trimline/opaque/terragovblue/warning{ dir = 4 }, /turf/open/floor/plasteel/patterned/cargo_one, /area/ship/cargo) "gw" = ( /obj/effect/turf_decal/siding/yellow, -/obj/effect/turf_decal/spline/fancy/transparent/solgovblue{ +/obj/effect/turf_decal/spline/fancy/transparent/terragovblue{ dir = 1 }, -/obj/effect/turf_decal/trimline/opaque/solgovblue/warning{ +/obj/effect/turf_decal/trimline/opaque/terragovblue/warning{ dir = 1 }, -/obj/effect/turf_decal/trimline/opaque/solgovblue/corner, +/obj/effect/turf_decal/trimline/opaque/terragovblue/corner, /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/plasteel/patterned/cargo_one, /area/ship/cargo) @@ -986,15 +986,15 @@ dir = 1 }, /obj/machinery/light/floor, -/obj/effect/turf_decal/spline/fancy/transparent/solgovblue/corner, -/obj/effect/turf_decal/trimline/opaque/solgovblue/corner, -/obj/effect/turf_decal/trimline/opaque/solgovblue/warning{ +/obj/effect/turf_decal/spline/fancy/transparent/terragovblue/corner, +/obj/effect/turf_decal/trimline/opaque/terragovblue/corner, +/obj/effect/turf_decal/trimline/opaque/terragovblue/warning{ dir = 1 }, /turf/open/floor/plasteel/patterned/cargo_one, /area/ship/cargo) "gP" = ( -/obj/effect/turf_decal/corner/opaque/solgovblue{ +/obj/effect/turf_decal/corner/opaque/terragovblue{ dir = 8 }, /obj/machinery/airalarm/directional/north, @@ -1002,7 +1002,7 @@ /turf/open/floor/plasteel/patterned, /area/ship/cargo) "gS" = ( -/obj/machinery/suit_storage_unit/solgov, +/obj/machinery/suit_storage_unit/terragov, /turf/open/floor/wood/walnut, /area/ship/crew/dorm/dormthree) "gV" = ( @@ -1016,7 +1016,7 @@ /turf/open/floor/wood/walnut, /area/ship/crew/canteen/kitchen) "gW" = ( -/obj/effect/turf_decal/corner/opaque/solgovblue/full, +/obj/effect/turf_decal/corner/opaque/terragovblue/full, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 8 }, @@ -1041,15 +1041,15 @@ /area/ship/cargo) "hg" = ( /obj/machinery/suit_storage_unit/inherit, -/obj/item/clothing/suit/space/hardsuit/solgov, +/obj/item/clothing/suit/space/hardsuit/terragov, /obj/item/tank/jetpack/oxygen, /turf/open/floor/wood/maple, /area/ship/crew/dorm/dormtwo) "hl" = ( -/obj/effect/turf_decal/corner/opaque/solgovblue{ +/obj/effect/turf_decal/corner/opaque/terragovblue{ dir = 1 }, -/obj/effect/turf_decal/spline/fancy/transparent/solgovblue{ +/obj/effect/turf_decal/spline/fancy/transparent/terragovblue{ dir = 8 }, /obj/structure/closet/emcloset/wall/directional/south, @@ -1063,13 +1063,13 @@ pixel_x = 16 }, /obj/item/paper_bin, -/obj/item/pen/solgov, +/obj/item/pen/terragov, /obj/machinery/light/directional/north, /turf/open/floor/carpet/blue, /area/ship/crew/office) "hw" = ( /obj/structure/bed, -/obj/item/bedsheet/solgov, +/obj/item/bedsheet/terragov, /obj/structure/curtain/cloth, /obj/machinery/light/directional/west, /turf/open/floor/carpet/blue, @@ -1082,13 +1082,13 @@ /obj/item/storage/fancy/candle_box, /obj/item/storage/fancy/candle_box, /obj/item/storage/fancy/candle_box, -/obj/item/folder/solgov, -/obj/item/folder/solgov, -/obj/item/folder/solgov, +/obj/item/folder/terragov, +/obj/item/folder/terragov, +/obj/item/folder/terragov, /turf/open/floor/plasteel/mono, /area/ship/cargo) "hE" = ( -/obj/machinery/porta_turret/ship/solgov, +/obj/machinery/porta_turret/ship/terragov, /turf/closed/wall/mineral/titanium, /area/ship/bridge) "hF" = ( @@ -1124,7 +1124,7 @@ /turf/open/floor/wood/birch, /area/ship/crew/canteen) "hR" = ( -/obj/effect/turf_decal/corner/opaque/solgovblue/full, +/obj/effect/turf_decal/corner/opaque/terragovblue/full, /obj/structure/cable{ icon_state = "4-8" }, @@ -1155,7 +1155,7 @@ /obj/effect/turf_decal/techfloor/orange{ dir = 8 }, -/obj/effect/turf_decal/corner/opaque/solgovblue{ +/obj/effect/turf_decal/corner/opaque/terragovblue{ dir = 6 }, /obj/structure/cable{ @@ -1204,7 +1204,7 @@ /turf/open/floor/plasteel/white, /area/ship/security/armory) "ij" = ( -/obj/effect/turf_decal/corner/opaque/solgovblue{ +/obj/effect/turf_decal/corner/opaque/terragovblue{ dir = 8 }, /obj/structure/cable{ @@ -1216,10 +1216,10 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/effect/turf_decal/corner/opaque/solgovgold{ +/obj/effect/turf_decal/corner/opaque/terragovgold{ dir = 6 }, -/obj/effect/turf_decal/trimline/opaque/solgovblue/warning{ +/obj/effect/turf_decal/trimline/opaque/terragovblue/warning{ dir = 4 }, /turf/open/floor/plasteel/patterned, @@ -1228,12 +1228,12 @@ /obj/structure/closet/crate{ name = "space suits crate" }, -/obj/item/clothing/suit/space/solgov, -/obj/item/clothing/suit/space/solgov, -/obj/item/clothing/suit/space/solgov, -/obj/item/clothing/head/helmet/space/solgov, -/obj/item/clothing/head/helmet/space/solgov, -/obj/item/clothing/head/helmet/space/solgov, +/obj/item/clothing/suit/space/terragov, +/obj/item/clothing/suit/space/terragov, +/obj/item/clothing/suit/space/terragov, +/obj/item/clothing/head/helmet/space/terragov, +/obj/item/clothing/head/helmet/space/terragov, +/obj/item/clothing/head/helmet/space/terragov, /turf/open/floor/plasteel/mono, /area/ship/cargo) "iu" = ( @@ -1277,7 +1277,7 @@ /turf/template_noop, /area/template_noop) "iI" = ( -/obj/effect/turf_decal/corner/opaque/solgovblue{ +/obj/effect/turf_decal/corner/opaque/terragovblue{ dir = 9 }, /obj/effect/turf_decal/borderfloorblack{ @@ -1289,22 +1289,22 @@ /turf/open/floor/plasteel/white, /area/ship/crew/cryo) "iJ" = ( -/obj/item/clothing/neck/stripedsolgovscarf, -/obj/item/clothing/neck/stripedsolgovscarf, -/obj/item/clothing/under/solgov, -/obj/item/clothing/under/solgov, -/obj/item/clothing/under/solgov/dress, -/obj/item/clothing/under/solgov/formal, -/obj/item/clothing/under/solgov/formal, +/obj/item/clothing/neck/stripedterragovscarf, +/obj/item/clothing/neck/stripedterragovscarf, +/obj/item/clothing/under/terragov, +/obj/item/clothing/under/terragov, +/obj/item/clothing/under/terragov/dress, +/obj/item/clothing/under/terragov/formal, +/obj/item/clothing/under/terragov/formal, /obj/item/clothing/shoes/laceup, /obj/item/clothing/shoes/laceup, -/obj/item/clothing/head/beret/solgov/plain, -/obj/item/clothing/head/beret/solgov/plain, -/obj/item/clothing/suit/solgov, -/obj/item/clothing/suit/solgov/dress, -/obj/item/clothing/suit/solgov/jacket, -/obj/item/clothing/under/solgov/formal/skirt, -/obj/item/clothing/suit/solgov/suit, +/obj/item/clothing/head/beret/terragov/plain, +/obj/item/clothing/head/beret/terragov/plain, +/obj/item/clothing/suit/terragov, +/obj/item/clothing/suit/terragov/dress, +/obj/item/clothing/suit/terragov/jacket, +/obj/item/clothing/under/terragov/formal/skirt, +/obj/item/clothing/suit/terragov/suit, /obj/structure/table/wood, /obj/structure/closet/wall/directional/east, /obj/machinery/button/door{ @@ -1314,8 +1314,8 @@ id = "sgi_dorms"; name = "dorms shutters control" }, -/obj/item/clothing/suit/hooded/wintercoat/solgov, -/obj/item/clothing/suit/hooded/wintercoat/solgov, +/obj/item/clothing/suit/hooded/wintercoat/terragov, +/obj/item/clothing/suit/hooded/wintercoat/terragov, /turf/open/floor/wood/walnut, /area/ship/crew/dorm) "iL" = ( @@ -1355,23 +1355,23 @@ /turf/open/floor/wood/walnut, /area/ship/crew/office) "je" = ( -/obj/effect/turf_decal/spline/fancy/transparent/solgovblue{ +/obj/effect/turf_decal/spline/fancy/transparent/terragovblue{ dir = 4 }, -/obj/effect/turf_decal/spline/fancy/transparent/solgovblue/corner{ +/obj/effect/turf_decal/spline/fancy/transparent/terragovblue/corner{ dir = 1 }, -/obj/effect/turf_decal/spline/fancy/transparent/solgovblue/corner{ +/obj/effect/turf_decal/spline/fancy/transparent/terragovblue/corner{ dir = 8 }, /obj/machinery/light/floor, -/obj/effect/turf_decal/trimline/opaque/solgovblue/corner{ +/obj/effect/turf_decal/trimline/opaque/terragovblue/corner{ dir = 1 }, -/obj/effect/turf_decal/trimline/opaque/solgovblue/warning{ +/obj/effect/turf_decal/trimline/opaque/terragovblue/warning{ dir = 4 }, -/obj/effect/turf_decal/trimline/opaque/solgovblue/corner{ +/obj/effect/turf_decal/trimline/opaque/terragovblue/corner{ dir = 8 }, /turf/open/floor/plasteel/patterned/cargo_one, @@ -1385,7 +1385,7 @@ /turf/open/floor/wood, /area/ship/crew/canteen) "jh" = ( -/obj/effect/turf_decal/spline/fancy/transparent/solgovblue{ +/obj/effect/turf_decal/spline/fancy/transparent/terragovblue{ dir = 4 }, /obj/structure/cable{ @@ -1394,7 +1394,7 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/effect/turf_decal/trimline/opaque/solgovblue/warning{ +/obj/effect/turf_decal/trimline/opaque/terragovblue/warning{ dir = 4 }, /obj/effect/decal/cleanable/dirt/dust, @@ -1425,16 +1425,16 @@ /turf/open/floor/plasteel/white, /area/ship/cargo/office) "jE" = ( -/obj/effect/turf_decal/spline/fancy/transparent/solgovblue/corner{ +/obj/effect/turf_decal/spline/fancy/transparent/terragovblue/corner{ dir = 1 }, -/obj/effect/turf_decal/spline/fancy/transparent/solgovblue{ +/obj/effect/turf_decal/spline/fancy/transparent/terragovblue{ dir = 4 }, -/obj/effect/turf_decal/trimline/opaque/solgovblue/warning{ +/obj/effect/turf_decal/trimline/opaque/terragovblue/warning{ dir = 4 }, -/obj/effect/turf_decal/trimline/opaque/solgovblue/corner{ +/obj/effect/turf_decal/trimline/opaque/terragovblue/corner{ dir = 1 }, /turf/open/floor/plasteel/patterned/cargo_one, @@ -1473,16 +1473,16 @@ /turf/open/floor/plasteel/mono, /area/ship/cargo) "jP" = ( -/obj/effect/turf_decal/spline/fancy/transparent/solgovblue/corner{ +/obj/effect/turf_decal/spline/fancy/transparent/terragovblue/corner{ dir = 1 }, -/obj/effect/turf_decal/spline/fancy/transparent/solgovblue/corner{ +/obj/effect/turf_decal/spline/fancy/transparent/terragovblue/corner{ dir = 8 }, -/obj/effect/turf_decal/trimline/opaque/solgovblue/corner{ +/obj/effect/turf_decal/trimline/opaque/terragovblue/corner{ dir = 1 }, -/obj/effect/turf_decal/trimline/opaque/solgovblue/corner{ +/obj/effect/turf_decal/trimline/opaque/terragovblue/corner{ dir = 8 }, /obj/effect/decal/cleanable/dirt/dust, @@ -1498,11 +1498,11 @@ /obj/effect/turf_decal/techfloor{ dir = 9 }, -/obj/machinery/suit_storage_unit/solgov, +/obj/machinery/suit_storage_unit/terragov, /turf/open/floor/plasteel/white, /area/ship/security/armory) "ke" = ( -/obj/effect/turf_decal/spline/fancy/transparent/solgovblue{ +/obj/effect/turf_decal/spline/fancy/transparent/terragovblue{ dir = 8 }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ @@ -1511,7 +1511,7 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 1 }, -/obj/effect/turf_decal/trimline/opaque/solgovblue/warning{ +/obj/effect/turf_decal/trimline/opaque/terragovblue/warning{ dir = 8 }, /turf/open/floor/plasteel/patterned/cargo_one, @@ -1526,12 +1526,12 @@ /obj/structure/closet/cabinet{ name = "armor cabinet" }, -/obj/item/clothing/suit/armor/vest/bulletproof/solgov, -/obj/item/clothing/suit/armor/vest/bulletproof/solgov, -/obj/item/clothing/suit/armor/vest/bulletproof/solgov, -/obj/item/clothing/head/solgov/sonnensoldner, -/obj/item/clothing/head/solgov/sonnensoldner, -/obj/item/clothing/head/solgov/sonnensoldner, +/obj/item/clothing/suit/armor/vest/bulletproof/terragov, +/obj/item/clothing/suit/armor/vest/bulletproof/terragov, +/obj/item/clothing/suit/armor/vest/bulletproof/terragov, +/obj/item/clothing/head/terragov/sonnensoldner, +/obj/item/clothing/head/terragov/sonnensoldner, +/obj/item/clothing/head/terragov/sonnensoldner, /obj/item/clothing/gloves/combat, /obj/item/clothing/gloves/combat, /obj/item/clothing/gloves/combat, @@ -1547,7 +1547,7 @@ pixel_x = 7; pixel_y = 2 }, -/obj/effect/turf_decal/spline/fancy/transparent/solgovblue{ +/obj/effect/turf_decal/spline/fancy/transparent/terragovblue{ dir = 2 }, /turf/open/floor/plasteel/mono, @@ -1563,16 +1563,16 @@ dir = 4 }, /obj/effect/decal/cleanable/dirt/dust, -/obj/structure/sign/poster/solgov/random{ +/obj/structure/sign/poster/terragov/random{ pixel_y = 32 }, /turf/open/floor/wood, /area/ship/hallway/starboard) "ku" = ( -/obj/effect/turf_decal/spline/fancy/transparent/solgovblue{ +/obj/effect/turf_decal/spline/fancy/transparent/terragovblue{ dir = 10 }, -/obj/effect/turf_decal/trimline/opaque/solgovblue/warning{ +/obj/effect/turf_decal/trimline/opaque/terragovblue/warning{ dir = 10 }, /turf/open/floor/plasteel/patterned/cargo_one, @@ -1642,7 +1642,7 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/door/airlock/solgov/glass{ +/obj/machinery/door/airlock/terragov/glass{ dir = 4; name = "Offices" }, @@ -1655,7 +1655,7 @@ /turf/open/floor/plasteel/mono/dark, /area/ship/hallway/starboard) "kN" = ( -/obj/effect/turf_decal/corner/opaque/solgovblue{ +/obj/effect/turf_decal/corner/opaque/terragovblue{ dir = 9 }, /obj/effect/turf_decal/borderfloorblack{ @@ -1692,26 +1692,26 @@ /turf/open/floor/plasteel/white, /area/ship/cargo/office) "lh" = ( -/obj/item/clothing/neck/stripedsolgovscarf, -/obj/item/clothing/neck/stripedsolgovscarf, -/obj/item/clothing/under/solgov, -/obj/item/clothing/under/solgov, -/obj/item/clothing/under/solgov/dress, -/obj/item/clothing/under/solgov/formal, -/obj/item/clothing/under/solgov/formal, +/obj/item/clothing/neck/stripedterragovscarf, +/obj/item/clothing/neck/stripedterragovscarf, +/obj/item/clothing/under/terragov, +/obj/item/clothing/under/terragov, +/obj/item/clothing/under/terragov/dress, +/obj/item/clothing/under/terragov/formal, +/obj/item/clothing/under/terragov/formal, /obj/item/clothing/shoes/laceup, /obj/item/clothing/shoes/laceup, -/obj/item/clothing/head/beret/solgov/plain, -/obj/item/clothing/head/beret/solgov/plain, -/obj/item/clothing/suit/solgov, -/obj/item/clothing/suit/solgov/dress, -/obj/item/clothing/suit/solgov/jacket, -/obj/item/clothing/under/solgov/formal/skirt, -/obj/item/clothing/suit/solgov/suit, +/obj/item/clothing/head/beret/terragov/plain, +/obj/item/clothing/head/beret/terragov/plain, +/obj/item/clothing/suit/terragov, +/obj/item/clothing/suit/terragov/dress, +/obj/item/clothing/suit/terragov/jacket, +/obj/item/clothing/under/terragov/formal/skirt, +/obj/item/clothing/suit/terragov/suit, /obj/structure/table/wood, /obj/structure/closet/wall/directional/east, -/obj/item/clothing/suit/hooded/wintercoat/solgov, -/obj/item/clothing/suit/hooded/wintercoat/solgov, +/obj/item/clothing/suit/hooded/wintercoat/terragov, +/obj/item/clothing/suit/hooded/wintercoat/terragov, /turf/open/floor/wood/walnut, /area/ship/crew/dorm) "li" = ( @@ -1720,7 +1720,7 @@ pixel_y = 7; pixel_x = 16 }, -/obj/item/folder/solgov, +/obj/item/folder/terragov, /obj/machinery/light/directional/south, /turf/open/floor/carpet/blue, /area/ship/crew/office) @@ -1781,7 +1781,7 @@ /area/ship/crew/dorm/dormthree) "lD" = ( /obj/structure/bed, -/obj/item/bedsheet/solgov, +/obj/item/bedsheet/terragov, /obj/structure/curtain/cloth, /obj/machinery/firealarm/directional/south, /obj/machinery/airalarm/directional/west, @@ -1819,16 +1819,16 @@ /turf/open/floor/wood, /area/ship/crew/canteen/kitchen) "md" = ( -/obj/effect/turf_decal/spline/fancy/transparent/solgovblue{ +/obj/effect/turf_decal/spline/fancy/transparent/terragovblue{ dir = 4 }, -/obj/effect/turf_decal/spline/fancy/transparent/solgovblue/corner{ +/obj/effect/turf_decal/spline/fancy/transparent/terragovblue/corner{ dir = 1 }, -/obj/effect/turf_decal/trimline/opaque/solgovblue/warning{ +/obj/effect/turf_decal/trimline/opaque/terragovblue/warning{ dir = 4 }, -/obj/effect/turf_decal/trimline/opaque/solgovblue/corner{ +/obj/effect/turf_decal/trimline/opaque/terragovblue/corner{ dir = 1 }, /turf/open/floor/plasteel/patterned/cargo_one, @@ -1920,22 +1920,22 @@ dir = 4 }, /obj/machinery/firealarm/directional/north, -/obj/effect/turf_decal/corner/opaque/solgovblue{ +/obj/effect/turf_decal/corner/opaque/terragovblue{ dir = 5 }, /turf/open/floor/plasteel/white, /area/ship/crew/cryo) "nc" = ( -/obj/effect/turf_decal/spline/fancy/transparent/solgovblue{ +/obj/effect/turf_decal/spline/fancy/transparent/terragovblue{ dir = 8 }, -/obj/effect/turf_decal/spline/fancy/transparent/solgovblue{ +/obj/effect/turf_decal/spline/fancy/transparent/terragovblue{ dir = 4 }, -/obj/effect/turf_decal/trimline/opaque/solgovblue/warning{ +/obj/effect/turf_decal/trimline/opaque/terragovblue/warning{ dir = 8 }, -/obj/effect/turf_decal/trimline/opaque/solgovblue/warning{ +/obj/effect/turf_decal/trimline/opaque/terragovblue/warning{ dir = 4 }, /obj/effect/decal/cleanable/dirt/dust, @@ -1962,9 +1962,9 @@ /obj/effect/turf_decal/siding/yellow{ dir = 1 }, -/obj/effect/turf_decal/spline/fancy/transparent/solgovblue, -/obj/effect/turf_decal/trimline/opaque/solgovblue/warning, -/obj/effect/turf_decal/trimline/opaque/solgovblue/corner{ +/obj/effect/turf_decal/spline/fancy/transparent/terragovblue, +/obj/effect/turf_decal/trimline/opaque/terragovblue/warning, +/obj/effect/turf_decal/trimline/opaque/terragovblue/corner{ dir = 1 }, /turf/open/floor/plasteel/patterned/cargo_one, @@ -2070,7 +2070,7 @@ /turf/open/floor/wood/walnut, /area/ship/crew/canteen/kitchen) "nB" = ( -/obj/effect/turf_decal/corner/opaque/solgovblue{ +/obj/effect/turf_decal/corner/opaque/terragovblue{ dir = 8 }, /obj/structure/cable{ @@ -2117,13 +2117,13 @@ /obj/structure/cable{ icon_state = "1-8" }, -/obj/effect/turf_decal/corner/opaque/solgovblue{ +/obj/effect/turf_decal/corner/opaque/terragovblue{ dir = 9 }, -/obj/effect/turf_decal/corner/opaque/solgovgold{ +/obj/effect/turf_decal/corner/opaque/terragovgold{ dir = 6 }, -/obj/effect/turf_decal/trimline/opaque/solgovblue/warning{ +/obj/effect/turf_decal/trimline/opaque/terragovblue/warning{ dir = 4 }, /obj/effect/decal/cleanable/dirt/dust, @@ -2133,13 +2133,13 @@ /obj/structure/table/wood, /obj/machinery/cell_charger, /obj/item/stock_parts/cell/high/plus, -/obj/effect/turf_decal/spline/fancy/transparent/solgovblue{ +/obj/effect/turf_decal/spline/fancy/transparent/terragovblue{ dir = 1 }, /turf/open/floor/plasteel/mono, /area/ship/cargo) "nO" = ( -/obj/machinery/computer/cargo/express/solgov, +/obj/machinery/computer/cargo/express/terragov, /turf/open/floor/wood/maple, /area/ship/bridge) "nR" = ( @@ -2233,7 +2233,7 @@ dir = 1 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/door/airlock/solgov{ +/obj/machinery/door/airlock/terragov{ name = "Cryogenics" }, /obj/machinery/door/firedoor/border_only, @@ -2252,7 +2252,7 @@ pixel_x = 11; pixel_y = -14 }, -/obj/effect/turf_decal/corner/opaque/solgovblue{ +/obj/effect/turf_decal/corner/opaque/terragovblue{ dir = 10 }, /obj/structure/cable{ @@ -2262,14 +2262,14 @@ /turf/open/floor/plasteel/white, /area/ship/crew/cryo) "oC" = ( -/obj/effect/turf_decal/spline/fancy/transparent/solgovblue, -/obj/effect/turf_decal/spline/fancy/transparent/solgovblue{ +/obj/effect/turf_decal/spline/fancy/transparent/terragovblue, +/obj/effect/turf_decal/spline/fancy/transparent/terragovblue{ dir = 1 }, -/obj/effect/turf_decal/trimline/opaque/solgovblue/warning{ +/obj/effect/turf_decal/trimline/opaque/terragovblue/warning{ dir = 1 }, -/obj/effect/turf_decal/trimline/opaque/solgovblue/warning, +/obj/effect/turf_decal/trimline/opaque/terragovblue/warning, /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/plasteel/patterned, /area/ship/cargo) @@ -2300,7 +2300,7 @@ /area/ship/security/armory) "oN" = ( /obj/structure/bookcase/random, -/obj/structure/sign/poster/solgov/random{ +/obj/structure/sign/poster/terragov/random{ pixel_x = -32 }, /turf/open/floor/wood/walnut, @@ -2330,7 +2330,7 @@ /turf/open/floor/plasteel/freezer, /area/ship/crew/toilet) "pd" = ( -/obj/machinery/fax/solgov, +/obj/machinery/fax/terragov, /obj/structure/table/wood/fancy/purple, /turf/open/floor/wood/maple, /area/ship/crew/dorm/dormtwo) @@ -2338,7 +2338,7 @@ /obj/effect/turf_decal/siding/yellow{ dir = 4 }, -/obj/effect/turf_decal/corner/opaque/solgovblue{ +/obj/effect/turf_decal/corner/opaque/terragovblue{ dir = 10 }, /obj/machinery/newscaster/security_unit/directional/south, @@ -2346,15 +2346,15 @@ /turf/open/floor/plasteel/white, /area/ship/crew/cryo) "pr" = ( -/obj/effect/turf_decal/spline/fancy/transparent/solgovblue{ +/obj/effect/turf_decal/spline/fancy/transparent/terragovblue{ dir = 1 }, -/obj/effect/turf_decal/spline/fancy/transparent/solgovblue, +/obj/effect/turf_decal/spline/fancy/transparent/terragovblue, /obj/machinery/light/directional/west, -/obj/effect/turf_decal/trimline/opaque/solgovblue/warning{ +/obj/effect/turf_decal/trimline/opaque/terragovblue/warning{ dir = 1 }, -/obj/effect/turf_decal/trimline/opaque/solgovblue/warning, +/obj/effect/turf_decal/trimline/opaque/terragovblue/warning, /turf/open/floor/plasteel/patterned, /area/ship/cargo) "ps" = ( @@ -2389,7 +2389,7 @@ /area/ship/cargo) "py" = ( /obj/structure/filingcabinet/double, -/obj/item/documents/solgov, +/obj/item/documents/terragov, /obj/machinery/airalarm/directional/north, /turf/open/floor/wood/maple, /area/ship/crew/dorm/dormtwo) @@ -2415,13 +2415,13 @@ /area/ship/crew/dorm/dormthree) "pK" = ( /obj/effect/turf_decal/siding/yellow, -/obj/effect/turf_decal/spline/fancy/transparent/solgovblue/corner{ +/obj/effect/turf_decal/spline/fancy/transparent/terragovblue/corner{ dir = 1 }, -/obj/effect/turf_decal/trimline/opaque/solgovblue/corner{ +/obj/effect/turf_decal/trimline/opaque/terragovblue/corner{ dir = 1 }, -/obj/effect/turf_decal/trimline/opaque/solgovblue/warning, +/obj/effect/turf_decal/trimline/opaque/terragovblue/warning, /obj/machinery/light/floor, /turf/open/floor/plasteel/patterned/cargo_one, /area/ship/cargo) @@ -2480,7 +2480,7 @@ dir = 6 }, /obj/effect/turf_decal/industrial/outline/yellow, -/obj/effect/turf_decal/corner/opaque/solgovblue{ +/obj/effect/turf_decal/corner/opaque/terragovblue{ dir = 1 }, /obj/machinery/power/apc/auto_name/directional/south, @@ -2517,7 +2517,7 @@ /obj/effect/turf_decal/borderfloorblack{ dir = 8 }, -/obj/machinery/suit_storage_unit/solgov, +/obj/machinery/suit_storage_unit/terragov, /obj/machinery/light/small/directional/west, /turf/open/floor/plasteel/tech, /area/ship/hallway/starboard) @@ -2525,7 +2525,7 @@ /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ dir = 1 }, -/obj/structure/sign/poster/solgov/random{ +/obj/structure/sign/poster/terragov/random{ pixel_x = 32 }, /turf/open/floor/wood, @@ -2539,10 +2539,10 @@ name = "boxcutter" }, /obj/item/storage/box/shipping, -/obj/effect/turf_decal/spline/fancy/transparent/solgovblue{ +/obj/effect/turf_decal/spline/fancy/transparent/terragovblue{ dir = 2 }, -/obj/structure/sign/poster/solgov/random{ +/obj/structure/sign/poster/terragov/random{ pixel_y = 32 }, /turf/open/floor/plasteel/mono, @@ -2554,20 +2554,20 @@ /area/ship/storage) "qM" = ( /obj/machinery/light/floor, -/obj/structure/sign/solgov_seal{ +/obj/structure/sign/terragov_seal{ pixel_y = 0; pixel_x = 28 }, /turf/open/floor/engine/hull, /area/ship/external/dark) "qP" = ( -/obj/machinery/computer/crew/solgov{ +/obj/machinery/computer/crew/terragov{ dir = 1 }, /turf/open/floor/wood/maple, /area/ship/bridge) "qS" = ( -/obj/effect/turf_decal/corner/opaque/solgovblue{ +/obj/effect/turf_decal/corner/opaque/terragovblue{ dir = 6 }, /obj/effect/turf_decal/borderfloorblack{ @@ -2645,14 +2645,14 @@ }, /obj/item/pickaxe/drill/jackhammer, /obj/item/storage/toolbox/mechanical, -/obj/item/clothing/head/hardhat/solgov, +/obj/item/clothing/head/hardhat/terragov, /obj/item/radio{ icon_state = "sec_radio" }, -/obj/item/clothing/under/solgov/formal, -/obj/item/clothing/under/solgov/dress, -/obj/item/clothing/under/solgov, -/obj/item/clothing/suit/hazardvest/solgov, +/obj/item/clothing/under/terragov/formal, +/obj/item/clothing/under/terragov/dress, +/obj/item/clothing/under/terragov, +/obj/item/clothing/suit/hazardvest/terragov, /obj/item/clothing/accessory/armband/cargo, /obj/item/clothing/shoes/workboots, /obj/item/clothing/gloves/combat, @@ -2684,13 +2684,13 @@ /area/ship/engineering) "rR" = ( /obj/effect/turf_decal/siding/yellow, -/obj/effect/turf_decal/spline/fancy/transparent/solgovblue{ +/obj/effect/turf_decal/spline/fancy/transparent/terragovblue{ dir = 1 }, -/obj/effect/turf_decal/trimline/opaque/solgovblue/warning{ +/obj/effect/turf_decal/trimline/opaque/terragovblue/warning{ dir = 1 }, -/obj/effect/turf_decal/trimline/opaque/solgovblue/warning, +/obj/effect/turf_decal/trimline/opaque/terragovblue/warning, /turf/open/floor/plasteel/patterned/cargo_one, /area/ship/cargo) "rS" = ( @@ -2733,19 +2733,19 @@ /turf/open/floor/wood, /area/ship/crew/office) "rU" = ( -/obj/effect/turf_decal/spline/fancy/transparent/solgovblue, -/obj/effect/turf_decal/spline/fancy/transparent/solgovblue{ +/obj/effect/turf_decal/spline/fancy/transparent/terragovblue, +/obj/effect/turf_decal/spline/fancy/transparent/terragovblue{ dir = 1 }, -/obj/effect/turf_decal/trimline/opaque/solgovblue/warning, -/obj/effect/turf_decal/trimline/opaque/solgovblue/warning{ +/obj/effect/turf_decal/trimline/opaque/terragovblue/warning, +/obj/effect/turf_decal/trimline/opaque/terragovblue/warning{ dir = 1 }, /turf/open/floor/plasteel/patterned, /area/ship/cargo) "rZ" = ( /obj/structure/chair, -/obj/effect/turf_decal/spline/fancy/transparent/solgovblue{ +/obj/effect/turf_decal/spline/fancy/transparent/terragovblue{ dir = 10 }, /turf/open/floor/plasteel/mono, @@ -2755,7 +2755,7 @@ /obj/effect/turf_decal/techfloor/corner{ dir = 8 }, -/obj/effect/turf_decal/corner/opaque/solgovgold{ +/obj/effect/turf_decal/corner/opaque/terragovgold{ dir = 10 }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ @@ -2764,10 +2764,10 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 10 }, -/obj/effect/turf_decal/corner/opaque/solgovblue{ +/obj/effect/turf_decal/corner/opaque/terragovblue{ dir = 5 }, -/obj/effect/turf_decal/trimline/opaque/solgovblue/warning, +/obj/effect/turf_decal/trimline/opaque/terragovblue/warning, /turf/open/floor/plasteel/white, /area/ship/security/armory) "sd" = ( @@ -2776,25 +2776,25 @@ /area/ship/crew/canteen/kitchen) "sg" = ( /obj/structure/fluff/hedge, -/obj/structure/sign/poster/solgov/random{ +/obj/structure/sign/poster/terragov/random{ pixel_x = -32 }, /turf/open/floor/wood/walnut, /area/ship/crew/canteen/kitchen) "sh" = ( -/obj/effect/turf_decal/spline/fancy/transparent/solgovblue{ +/obj/effect/turf_decal/spline/fancy/transparent/terragovblue{ dir = 4 }, -/obj/effect/turf_decal/spline/fancy/transparent/solgovblue{ +/obj/effect/turf_decal/spline/fancy/transparent/terragovblue{ dir = 8 }, /obj/structure/cable{ icon_state = "2-8" }, -/obj/effect/turf_decal/trimline/opaque/solgovblue/warning{ +/obj/effect/turf_decal/trimline/opaque/terragovblue/warning{ dir = 4 }, -/obj/effect/turf_decal/trimline/opaque/solgovblue/warning{ +/obj/effect/turf_decal/trimline/opaque/terragovblue/warning{ dir = 8 }, /turf/open/floor/plasteel/patterned/cargo_one, @@ -2824,7 +2824,7 @@ /area/ship/crew/cryo) "so" = ( /obj/structure/bed, -/obj/item/bedsheet/solgov, +/obj/item/bedsheet/terragov, /obj/structure/curtain/cloth, /turf/open/floor/carpet/blue, /area/ship/crew/dorm) @@ -2887,9 +2887,9 @@ /area/ship/storage) "sQ" = ( /obj/structure/bed/double, -/obj/item/bedsheet/double/solgov, +/obj/item/bedsheet/double/terragov, /obj/item/toy/plush/blahaj, -/obj/structure/sign/solgov_flag{ +/obj/structure/sign/terragov_flag{ dir = 8; pixel_x = 28 }, @@ -2909,18 +2909,18 @@ /turf/open/floor/plating, /area/ship/external/dark) "sX" = ( -/obj/effect/turf_decal/spline/fancy/transparent/solgovblue{ +/obj/effect/turf_decal/spline/fancy/transparent/terragovblue{ dir = 8 }, -/obj/effect/turf_decal/spline/fancy/transparent/solgovblue/corner, +/obj/effect/turf_decal/spline/fancy/transparent/terragovblue/corner, /obj/structure/cable{ icon_state = "4-8" }, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ dir = 1 }, -/obj/effect/turf_decal/trimline/opaque/solgovblue/corner, -/obj/effect/turf_decal/trimline/opaque/solgovblue/warning{ +/obj/effect/turf_decal/trimline/opaque/terragovblue/corner, +/obj/effect/turf_decal/trimline/opaque/terragovblue/warning{ dir = 8 }, /turf/open/floor/plasteel/patterned/cargo_one, @@ -2991,14 +2991,14 @@ }, /obj/item/pickaxe/drill/jackhammer, /obj/item/storage/toolbox/mechanical, -/obj/item/clothing/head/hardhat/solgov, +/obj/item/clothing/head/hardhat/terragov, /obj/item/radio{ icon_state = "sec_radio" }, -/obj/item/clothing/under/solgov/formal, -/obj/item/clothing/under/solgov/dress, -/obj/item/clothing/under/solgov, -/obj/item/clothing/suit/hazardvest/solgov, +/obj/item/clothing/under/terragov/formal, +/obj/item/clothing/under/terragov/dress, +/obj/item/clothing/under/terragov, +/obj/item/clothing/suit/hazardvest/terragov, /obj/item/clothing/accessory/armband/cargo, /obj/item/clothing/shoes/workboots, /obj/item/clothing/gloves/combat, @@ -3013,7 +3013,7 @@ }, /obj/item/kitchen/knife/letter_opener, /obj/item/clothing/glasses/meson, -/obj/structure/sign/poster/solgov/random{ +/obj/structure/sign/poster/terragov/random{ pixel_y = 32 }, /obj/item/storage/bag/ore, @@ -3050,7 +3050,7 @@ /obj/effect/turf_decal/techfloor/corner{ dir = 4 }, -/obj/effect/turf_decal/corner/opaque/solgovgold{ +/obj/effect/turf_decal/corner/opaque/terragovgold{ dir = 6 }, /obj/structure/cable{ @@ -3062,7 +3062,7 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/effect/turf_decal/trimline/opaque/solgovblue/warning{ +/obj/effect/turf_decal/trimline/opaque/terragovblue/warning{ dir = 4 }, /turf/open/floor/plasteel/white, @@ -3083,7 +3083,7 @@ "tK" = ( /obj/structure/table/wood, /obj/item/radio/intercom/directional/east, -/obj/item/desk_flag/solgov{ +/obj/item/desk_flag/terragov{ pixel_y = 12; pixel_x = -8 }, @@ -3096,7 +3096,7 @@ /obj/effect/turf_decal/techfloor/orange{ dir = 10 }, -/obj/effect/turf_decal/corner/opaque/solgovblue{ +/obj/effect/turf_decal/corner/opaque/terragovblue{ dir = 4 }, /obj/structure/cable{ @@ -3109,13 +3109,13 @@ /obj/effect/turf_decal/siding/yellow{ dir = 1 }, -/obj/effect/turf_decal/spline/fancy/transparent/solgovblue/corner{ +/obj/effect/turf_decal/spline/fancy/transparent/terragovblue/corner{ dir = 8 }, -/obj/effect/turf_decal/trimline/opaque/solgovblue/corner{ +/obj/effect/turf_decal/trimline/opaque/terragovblue/corner{ dir = 8 }, -/obj/effect/turf_decal/trimline/opaque/solgovblue/warning{ +/obj/effect/turf_decal/trimline/opaque/terragovblue/warning{ dir = 1 }, /obj/machinery/light/floor, @@ -3185,7 +3185,7 @@ /obj/effect/turf_decal/techfloor/corner{ dir = 8 }, -/obj/effect/turf_decal/corner/opaque/solgovgold{ +/obj/effect/turf_decal/corner/opaque/terragovgold{ dir = 9 }, /obj/structure/cable{ @@ -3197,7 +3197,7 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 10 }, -/obj/effect/turf_decal/trimline/opaque/solgovblue/warning{ +/obj/effect/turf_decal/trimline/opaque/terragovblue/warning{ dir = 8 }, /obj/effect/decal/cleanable/dirt/dust, @@ -3215,17 +3215,17 @@ /obj/item/ammo_box/magazine/pistol556mm, /obj/item/ammo_box/magazine/pistol556mm, /obj/item/ammo_box/magazine/pistol556mm, -/obj/item/gun/ballistic/automatic/pistol/solgov{ +/obj/item/gun/ballistic/automatic/pistol/terragov{ pixel_x = -2 }, -/obj/item/gun/ballistic/automatic/pistol/solgov{ +/obj/item/gun/ballistic/automatic/pistol/terragov{ pixel_x = 1 }, -/obj/item/gun/ballistic/automatic/pistol/solgov{ +/obj/item/gun/ballistic/automatic/pistol/terragov{ pixel_x = 4 }, /obj/machinery/newscaster/security_unit/directional/north, -/obj/effect/turf_decal/corner/opaque/solgovblue{ +/obj/effect/turf_decal/corner/opaque/terragovblue{ dir = 10 }, /turf/open/floor/plasteel/white, @@ -3252,7 +3252,7 @@ /turf/open/floor/wood, /area/ship/crew/canteen) "uA" = ( -/obj/effect/turf_decal/spline/fancy/transparent/solgovblue{ +/obj/effect/turf_decal/spline/fancy/transparent/terragovblue{ dir = 8 }, /obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ @@ -3261,7 +3261,7 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 9 }, -/obj/effect/turf_decal/trimline/opaque/solgovblue/warning{ +/obj/effect/turf_decal/trimline/opaque/terragovblue/warning{ dir = 8 }, /turf/open/floor/plasteel/patterned/cargo_one, @@ -3275,7 +3275,7 @@ /area/ship/storage) "uE" = ( /obj/item/paper_bin, -/obj/item/pen/solgov, +/obj/item/pen/terragov, /obj/structure/table/wood/fancy/purple, /obj/item/binoculars{ pixel_y = 13 @@ -3308,10 +3308,10 @@ /area/ship/crew/canteen/kitchen) "uT" = ( /obj/effect/turf_decal/siding/yellow, -/obj/effect/turf_decal/spline/fancy/transparent/solgovblue{ +/obj/effect/turf_decal/spline/fancy/transparent/terragovblue{ dir = 1 }, -/obj/effect/turf_decal/trimline/opaque/solgovblue/warning{ +/obj/effect/turf_decal/trimline/opaque/terragovblue/warning{ dir = 1 }, /obj/effect/decal/cleanable/dirt/dust, @@ -3417,19 +3417,19 @@ /obj/effect/turf_decal/siding/yellow{ dir = 1 }, -/obj/effect/turf_decal/spline/fancy/transparent/solgovblue/corner{ +/obj/effect/turf_decal/spline/fancy/transparent/terragovblue/corner{ dir = 8 }, -/obj/effect/turf_decal/trimline/opaque/solgovblue/corner{ +/obj/effect/turf_decal/trimline/opaque/terragovblue/corner{ dir = 8 }, -/obj/effect/turf_decal/trimline/opaque/solgovblue/warning{ +/obj/effect/turf_decal/trimline/opaque/terragovblue/warning{ dir = 1 }, /turf/open/floor/plasteel/patterned/cargo_one, /area/ship/cargo) "vH" = ( -/obj/effect/turf_decal/solgov/wood/top_right, +/obj/effect/turf_decal/terragov/wood/top_right, /obj/effect/turf_decal/siding/wood{ dir = 1 }, @@ -3471,7 +3471,7 @@ /turf/open/floor/wood/walnut, /area/ship/crew/library) "vW" = ( -/obj/effect/turf_decal/solgov/wood/bottom_right, +/obj/effect/turf_decal/terragov/wood/bottom_right, /obj/effect/turf_decal/siding/wood, /obj/item/radio/intercom/directional/west, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ @@ -3542,10 +3542,10 @@ /turf/open/floor/wood, /area/ship/crew/library) "wj" = ( -/obj/effect/turf_decal/spline/fancy/transparent/solgovblue{ +/obj/effect/turf_decal/spline/fancy/transparent/terragovblue{ dir = 4 }, -/obj/effect/turf_decal/trimline/opaque/solgovblue/warning{ +/obj/effect/turf_decal/trimline/opaque/terragovblue/warning{ dir = 4 }, /turf/open/floor/plasteel/patterned/cargo_one, @@ -3573,13 +3573,13 @@ /area/ship/crew/dorm/dormthree) "wo" = ( /obj/item/clothing/gloves/combat, -/obj/item/folder/solgov, -/obj/item/folder/solgov, -/obj/item/clothing/under/solgov/formal, -/obj/item/pen/solgov, -/obj/item/clothing/under/solgov/dress, -/obj/item/stamp/solgov, -/obj/item/clothing/suit/armor/solgov_trenchcoat, +/obj/item/folder/terragov, +/obj/item/folder/terragov, +/obj/item/clothing/under/terragov/formal, +/obj/item/pen/terragov, +/obj/item/clothing/under/terragov/dress, +/obj/item/stamp/terragov, +/obj/item/clothing/suit/armor/terragov_trenchcoat, /obj/item/storage/backpack/satchel, /obj/item/kitchen/knife/letter_opener, /obj/structure/closet/secure_closet/quartermaster{ @@ -3587,8 +3587,8 @@ anchored = 1; name = "\proper logistics deck officer's locker" }, -/obj/item/clothing/suit/solgov/overcoat, -/obj/item/clothing/head/flatcap/solgov, +/obj/item/clothing/suit/terragov/overcoat, +/obj/item/clothing/head/flatcap/terragov, /obj/item/clothing/glasses/sunglasses, /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/wood/walnut, @@ -3614,16 +3614,16 @@ /turf/open/floor/plasteel/mono/dark, /area/ship/security/armory) "wt" = ( -/obj/effect/turf_decal/spline/fancy/transparent/solgovblue{ +/obj/effect/turf_decal/spline/fancy/transparent/terragovblue{ dir = 4 }, -/obj/effect/turf_decal/spline/fancy/transparent/solgovblue{ +/obj/effect/turf_decal/spline/fancy/transparent/terragovblue{ dir = 8 }, -/obj/effect/turf_decal/trimline/opaque/solgovblue/warning{ +/obj/effect/turf_decal/trimline/opaque/terragovblue/warning{ dir = 4 }, -/obj/effect/turf_decal/trimline/opaque/solgovblue/warning{ +/obj/effect/turf_decal/trimline/opaque/terragovblue/warning{ dir = 8 }, /turf/open/floor/plasteel/patterned/cargo_one, @@ -3634,19 +3634,19 @@ name = "sonnensöldners's locker"; anchored = 1 }, -/obj/item/clothing/head/solgov/sonnensoldner, +/obj/item/clothing/head/terragov/sonnensoldner, /obj/item/radio{ icon_state = "sec_radio" }, -/obj/item/clothing/under/solgov/formal, -/obj/item/clothing/under/solgov/dress, -/obj/item/clothing/under/solgov, +/obj/item/clothing/under/terragov/formal, +/obj/item/clothing/under/terragov/dress, +/obj/item/clothing/under/terragov, /obj/item/clothing/shoes/workboots, -/obj/item/storage/belt/sabre/solgov, +/obj/item/storage/belt/sabre/terragov, /obj/item/clothing/gloves/combat, -/obj/item/radio/headset/solgov/alt, +/obj/item/radio/headset/terragov/alt, /obj/item/storage/backpack, -/obj/item/clothing/suit/armor/vest/bulletproof/solgov, +/obj/item/clothing/suit/armor/vest/bulletproof/terragov, /obj/effect/turf_decal/techfloor, /obj/effect/turf_decal/industrial/outline/red, /turf/open/floor/plasteel/white, @@ -3656,7 +3656,7 @@ /turf/open/floor/wood/walnut, /area/ship/crew/canteen/kitchen) "wQ" = ( -/obj/effect/turf_decal/corner/opaque/solgovblue/full, +/obj/effect/turf_decal/corner/opaque/terragovblue/full, /obj/structure/cable{ icon_state = "4-8" }, @@ -3686,7 +3686,7 @@ /turf/open/floor/plasteel/tech, /area/ship/hallway/starboard) "xf" = ( -/obj/effect/turf_decal/corner/opaque/solgovblue{ +/obj/effect/turf_decal/corner/opaque/terragovblue{ dir = 10 }, /obj/structure/railing/corner{ @@ -3721,13 +3721,13 @@ dir = 4 }, /obj/effect/turf_decal/industrial/outline/yellow, -/obj/effect/turf_decal/corner/opaque/solgovblue{ +/obj/effect/turf_decal/corner/opaque/terragovblue{ dir = 9 }, /turf/open/floor/plasteel/tech, /area/ship/maintenance/port) "xt" = ( -/obj/effect/turf_decal/corner/opaque/solgovblue/full, +/obj/effect/turf_decal/corner/opaque/terragovblue/full, /obj/structure/cable{ icon_state = "4-8" }, @@ -3736,7 +3736,7 @@ /area/ship/cargo/office) "xA" = ( /obj/structure/fluff/hedge, -/obj/structure/sign/poster/solgov/random{ +/obj/structure/sign/poster/terragov/random{ pixel_y = 30 }, /turf/open/floor/wood/walnut, @@ -3745,7 +3745,7 @@ /obj/structure/chair{ dir = 1 }, -/obj/effect/turf_decal/spline/fancy/transparent/solgovblue{ +/obj/effect/turf_decal/spline/fancy/transparent/terragovblue{ dir = 5 }, /turf/open/floor/plasteel/mono, @@ -3790,7 +3790,7 @@ /obj/effect/turf_decal/techfloor/orange{ dir = 5 }, -/obj/effect/turf_decal/corner/opaque/solgovblue{ +/obj/effect/turf_decal/corner/opaque/terragovblue{ dir = 8 }, /obj/effect/turf_decal/industrial/outline/yellow, @@ -3824,7 +3824,7 @@ /turf/open/floor/wood/walnut, /area/ship/crew/dorm/dormthree) "yl" = ( -/obj/machinery/computer/helm/solgov{ +/obj/machinery/computer/helm/terragov{ dir = 8 }, /obj/effect/turf_decal/siding/wood, @@ -3848,19 +3848,19 @@ "yu" = ( /obj/structure/table/wood, /obj/item/paper_bin, -/obj/item/pen/solgov, +/obj/item/pen/terragov, /obj/machinery/newscaster/security_unit/directional/south, /turf/open/floor/carpet/blue, /area/ship/crew/office) "yw" = ( /obj/effect/turf_decal/siding/yellow, -/obj/effect/turf_decal/spline/fancy/transparent/solgovblue/corner{ +/obj/effect/turf_decal/spline/fancy/transparent/terragovblue/corner{ dir = 1 }, -/obj/effect/turf_decal/trimline/opaque/solgovblue/corner{ +/obj/effect/turf_decal/trimline/opaque/terragovblue/corner{ dir = 1 }, -/obj/effect/turf_decal/trimline/opaque/solgovblue/warning, +/obj/effect/turf_decal/trimline/opaque/terragovblue/warning, /turf/open/floor/plasteel/patterned/cargo_one, /area/ship/cargo) "yz" = ( @@ -3971,7 +3971,7 @@ dir = 1 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/door/airlock/solgov{ +/obj/machinery/door/airlock/terragov{ name = "Dormitories" }, /obj/machinery/door/firedoor/border_only, @@ -3998,7 +3998,7 @@ /turf/open/floor/wood, /area/ship/crew/canteen) "zu" = ( -/obj/effect/turf_decal/corner/opaque/solgovblue{ +/obj/effect/turf_decal/corner/opaque/terragovblue{ dir = 1 }, /turf/open/floor/plasteel/patterned, @@ -4081,13 +4081,13 @@ /area/ship/maintenance/port) "zK" = ( /obj/effect/turf_decal/siding/yellow, -/obj/effect/turf_decal/spline/fancy/transparent/solgovblue/corner{ +/obj/effect/turf_decal/spline/fancy/transparent/terragovblue/corner{ dir = 4 }, -/obj/effect/turf_decal/trimline/opaque/solgovblue/corner{ +/obj/effect/turf_decal/trimline/opaque/terragovblue/corner{ dir = 4 }, -/obj/effect/turf_decal/trimline/opaque/solgovblue/warning, +/obj/effect/turf_decal/trimline/opaque/terragovblue/warning, /obj/effect/decal/cleanable/dirt/dust, /obj/machinery/light/floor, /turf/open/floor/plasteel/patterned/cargo_one, @@ -4108,7 +4108,7 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/door/airlock/solgov{ +/obj/machinery/door/airlock/terragov{ dir = 4; name = "Bridge"; req_one_access = list(20,41) @@ -4122,10 +4122,10 @@ /turf/open/floor/plasteel/mono/dark, /area/ship/crew/library) "Aa" = ( -/obj/effect/turf_decal/corner/opaque/solgovblue{ +/obj/effect/turf_decal/corner/opaque/terragovblue{ dir = 5 }, -/obj/structure/sign/poster/solgov/random{ +/obj/structure/sign/poster/terragov/random{ pixel_y = 32 }, /turf/open/floor/plasteel/white, @@ -4185,11 +4185,11 @@ "AU" = ( /obj/structure/table/wood, /obj/item/paper_bin, -/obj/item/desk_flag/solgov{ +/obj/item/desk_flag/terragov{ pixel_y = 12; pixel_x = -8 }, -/obj/item/pen/solgov, +/obj/item/pen/terragov, /turf/open/floor/carpet/blue, /area/ship/crew/canteen/kitchen) "AZ" = ( @@ -4202,7 +4202,7 @@ pixel_x = -10 }, /obj/effect/decal/cleanable/dirt/dust, -/obj/structure/sign/poster/solgov/random{ +/obj/structure/sign/poster/terragov/random{ pixel_y = 32 }, /turf/open/floor/plasteel/white, @@ -4223,7 +4223,7 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/door/airlock/solgov{ +/obj/machinery/door/airlock/terragov{ dir = 4; name = "Logistics Deck Officer's Quarters"; req_one_access = list(41); @@ -4239,13 +4239,13 @@ /area/ship/crew/dorm/dormthree) "Bb" = ( /obj/effect/turf_decal/siding/yellow, -/obj/effect/turf_decal/spline/fancy/transparent/solgovblue{ +/obj/effect/turf_decal/spline/fancy/transparent/terragovblue{ dir = 1 }, -/obj/effect/turf_decal/trimline/opaque/solgovblue/warning{ +/obj/effect/turf_decal/trimline/opaque/terragovblue/warning{ dir = 1 }, -/obj/effect/turf_decal/trimline/opaque/solgovblue/warning, +/obj/effect/turf_decal/trimline/opaque/terragovblue/warning, /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/plasteel/patterned/cargo_one, /area/ship/cargo) @@ -4280,7 +4280,7 @@ /obj/structure/noticeboard{ pixel_y = 32 }, -/obj/effect/turf_decal/corner/opaque/solgovblue{ +/obj/effect/turf_decal/corner/opaque/terragovblue{ dir = 5 }, /obj/effect/decal/cleanable/dirt/dust, @@ -4321,15 +4321,15 @@ /obj/effect/turf_decal/siding/yellow{ dir = 1 }, -/obj/effect/turf_decal/spline/fancy/transparent/solgovblue, -/obj/effect/turf_decal/trimline/opaque/solgovblue/warning, -/obj/effect/turf_decal/trimline/opaque/solgovblue/warning{ +/obj/effect/turf_decal/spline/fancy/transparent/terragovblue, +/obj/effect/turf_decal/trimline/opaque/terragovblue/warning, +/obj/effect/turf_decal/trimline/opaque/terragovblue/warning{ dir = 1 }, /turf/open/floor/plasteel/patterned, /area/ship/cargo) "BM" = ( -/obj/effect/turf_decal/corner/opaque/solgovblue/full, +/obj/effect/turf_decal/corner/opaque/terragovblue/full, /obj/structure/cable{ icon_state = "1-8" }, @@ -4357,7 +4357,7 @@ dir = 1 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/door/airlock/solgov/glass{ +/obj/machinery/door/airlock/terragov/glass{ name = "Library" }, /obj/machinery/door/firedoor/border_only, @@ -4434,7 +4434,7 @@ /turf/open/floor/wood/walnut, /area/ship/crew/dorm) "Ci" = ( -/obj/effect/turf_decal/corner/opaque/solgovblue{ +/obj/effect/turf_decal/corner/opaque/terragovblue{ dir = 9 }, /obj/effect/turf_decal/borderfloorblack{ @@ -4480,11 +4480,11 @@ /obj/effect/turf_decal/siding/yellow{ dir = 1 }, -/obj/effect/turf_decal/spline/fancy/transparent/solgovblue, +/obj/effect/turf_decal/spline/fancy/transparent/terragovblue, /obj/structure/cable{ icon_state = "1-2" }, -/obj/effect/turf_decal/trimline/opaque/solgovblue/warning, +/obj/effect/turf_decal/trimline/opaque/terragovblue/warning, /turf/open/floor/plasteel/patterned/cargo_one, /area/ship/cargo) "CJ" = ( @@ -4503,7 +4503,7 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/door/airlock/solgov/glass{ +/obj/machinery/door/airlock/terragov/glass{ dir = 4; name = "Cafeteria" }, @@ -4536,7 +4536,7 @@ pixel_x = 5; pixel_y = 4 }, -/obj/item/stamp/solgov{ +/obj/item/stamp/terragov{ pixel_y = 11; pixel_x = -6 }, @@ -4544,28 +4544,28 @@ pixel_x = -5; pixel_y = -1 }, -/obj/item/pen/solgov{ +/obj/item/pen/terragov{ pixel_x = -5 }, /turf/open/floor/wood/maple, /area/ship/bridge) "CX" = ( -/obj/effect/turf_decal/spline/fancy/transparent/solgovblue/corner{ +/obj/effect/turf_decal/spline/fancy/transparent/terragovblue/corner{ dir = 8 }, -/obj/effect/turf_decal/spline/fancy/transparent/solgovblue/corner{ +/obj/effect/turf_decal/spline/fancy/transparent/terragovblue/corner{ dir = 1 }, -/obj/effect/turf_decal/trimline/opaque/solgovblue/corner{ +/obj/effect/turf_decal/trimline/opaque/terragovblue/corner{ dir = 1 }, -/obj/effect/turf_decal/trimline/opaque/solgovblue/corner{ +/obj/effect/turf_decal/trimline/opaque/terragovblue/corner{ dir = 8 }, /turf/open/floor/plasteel/patterned/cargo_one, /area/ship/cargo) "Dc" = ( -/obj/effect/turf_decal/corner/opaque/solgovblue/full, +/obj/effect/turf_decal/corner/opaque/terragovblue/full, /obj/structure/cable{ icon_state = "2-4" }, @@ -4602,7 +4602,7 @@ dir = 1 }, /obj/machinery/light/floor, -/obj/effect/turf_decal/spline/fancy/transparent/solgovblue/corner{ +/obj/effect/turf_decal/spline/fancy/transparent/terragovblue/corner{ dir = 8 }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ @@ -4611,13 +4611,13 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 1 }, -/obj/effect/turf_decal/trimline/opaque/solgovblue/corner{ +/obj/effect/turf_decal/trimline/opaque/terragovblue/corner{ dir = 8 }, /turf/open/floor/plasteel/patterned/cargo_one, /area/ship/cargo) "Dw" = ( -/obj/effect/turf_decal/solgov/all/top_right, +/obj/effect/turf_decal/terragov/all/top_right, /obj/effect/turf_decal/industrial/warning{ dir = 8 }, @@ -4663,7 +4663,7 @@ /obj/effect/turf_decal/techfloor{ dir = 8 }, -/obj/structure/sign/poster/solgov/random{ +/obj/structure/sign/poster/terragov/random{ pixel_y = 32 }, /obj/machinery/power/ship_gravity, @@ -4680,7 +4680,7 @@ /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ dir = 8 }, -/obj/effect/turf_decal/corner/opaque/solgovblue{ +/obj/effect/turf_decal/corner/opaque/terragovblue{ dir = 1 }, /obj/structure/extinguisher_cabinet/directional/south, @@ -4698,7 +4698,7 @@ /turf/open/floor/plasteel/patterned/cargo_one, /area/ship/cargo) "DL" = ( -/obj/structure/sign/poster/solgov/random{ +/obj/structure/sign/poster/terragov/random{ pixel_y = 32 }, /obj/effect/turf_decal/techfloor/orange{ @@ -4712,7 +4712,7 @@ /turf/open/floor/plasteel/tech, /area/ship/maintenance/port) "DP" = ( -/obj/effect/turf_decal/corner/opaque/solgovblue{ +/obj/effect/turf_decal/corner/opaque/terragovblue{ dir = 10 }, /obj/machinery/airalarm/directional/south, @@ -4722,7 +4722,7 @@ /turf/closed/wall/mineral/titanium, /area/ship/crew/toilet) "Ed" = ( -/obj/effect/turf_decal/spline/fancy/transparent/solgovblue{ +/obj/effect/turf_decal/spline/fancy/transparent/terragovblue{ dir = 8 }, /obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ @@ -4731,13 +4731,13 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 10 }, -/obj/effect/turf_decal/trimline/opaque/solgovblue/warning{ +/obj/effect/turf_decal/trimline/opaque/terragovblue/warning{ dir = 8 }, /turf/open/floor/plasteel/patterned/cargo_one, /area/ship/cargo) "Ee" = ( -/obj/effect/turf_decal/corner/opaque/solgovblue{ +/obj/effect/turf_decal/corner/opaque/terragovblue{ dir = 1 }, /obj/structure/cable{ @@ -4814,10 +4814,10 @@ /turf/open/floor/plasteel/white, /area/ship/engineering) "ED" = ( -/obj/effect/turf_decal/spline/fancy/transparent/solgovblue{ +/obj/effect/turf_decal/spline/fancy/transparent/terragovblue{ dir = 1 }, -/obj/effect/turf_decal/spline/fancy/transparent/solgovblue, +/obj/effect/turf_decal/spline/fancy/transparent/terragovblue, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 1 }, @@ -4827,10 +4827,10 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 1 }, -/obj/effect/turf_decal/trimline/opaque/solgovblue/warning{ +/obj/effect/turf_decal/trimline/opaque/terragovblue/warning{ dir = 1 }, -/obj/effect/turf_decal/trimline/opaque/solgovblue/warning, +/obj/effect/turf_decal/trimline/opaque/terragovblue/warning, /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/plasteel/patterned/cargo_one, /area/ship/cargo) @@ -4844,9 +4844,9 @@ /obj/effect/turf_decal/siding/yellow{ dir = 1 }, -/obj/effect/turf_decal/spline/fancy/transparent/solgovblue, -/obj/effect/turf_decal/trimline/opaque/solgovblue/warning, -/obj/effect/turf_decal/trimline/opaque/solgovblue/corner{ +/obj/effect/turf_decal/spline/fancy/transparent/terragovblue, +/obj/effect/turf_decal/trimline/opaque/terragovblue/warning, +/obj/effect/turf_decal/trimline/opaque/terragovblue/corner{ dir = 4 }, /turf/open/floor/plasteel/patterned/cargo_one, @@ -4943,16 +4943,16 @@ /turf/open/floor/wood/birch, /area/ship/crew/dorm/dormthree) "Fs" = ( -/obj/effect/turf_decal/spline/fancy/transparent/solgovblue/corner{ +/obj/effect/turf_decal/spline/fancy/transparent/terragovblue/corner{ dir = 8 }, -/obj/effect/turf_decal/spline/fancy/transparent/solgovblue{ +/obj/effect/turf_decal/spline/fancy/transparent/terragovblue{ dir = 4 }, -/obj/effect/turf_decal/trimline/opaque/solgovblue/warning{ +/obj/effect/turf_decal/trimline/opaque/terragovblue/warning{ dir = 4 }, -/obj/effect/turf_decal/trimline/opaque/solgovblue/corner{ +/obj/effect/turf_decal/trimline/opaque/terragovblue/corner{ dir = 8 }, /turf/open/floor/plasteel/patterned/cargo_one, @@ -4975,7 +4975,7 @@ /obj/effect/turf_decal/techfloor/orange{ dir = 8 }, -/obj/effect/turf_decal/corner/opaque/solgovblue{ +/obj/effect/turf_decal/corner/opaque/terragovblue{ dir = 6 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ @@ -4994,7 +4994,7 @@ /obj/effect/turf_decal/techfloor/orange{ dir = 8 }, -/obj/effect/turf_decal/corner/opaque/solgovblue{ +/obj/effect/turf_decal/corner/opaque/terragovblue{ dir = 6 }, /obj/structure/cable{ @@ -5036,7 +5036,7 @@ /turf/open/floor/wood/walnut, /area/ship/crew/library) "Gd" = ( -/obj/effect/turf_decal/corner/opaque/solgovgold{ +/obj/effect/turf_decal/corner/opaque/terragovgold{ dir = 5 }, /obj/effect/turf_decal/techfloor/corner{ @@ -5046,7 +5046,7 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, -/obj/effect/turf_decal/trimline/opaque/solgovblue/warning{ +/obj/effect/turf_decal/trimline/opaque/terragovblue/warning{ dir = 1 }, /obj/effect/decal/cleanable/dirt/dust, @@ -5074,11 +5074,11 @@ /area/ship/crew/canteen) "Gp" = ( /obj/effect/turf_decal/siding/yellow, -/obj/effect/turf_decal/spline/fancy/transparent/solgovblue{ +/obj/effect/turf_decal/spline/fancy/transparent/terragovblue{ dir = 1 }, -/obj/effect/turf_decal/trimline/opaque/solgovblue/warning, -/obj/effect/turf_decal/trimline/opaque/solgovblue/warning{ +/obj/effect/turf_decal/trimline/opaque/terragovblue/warning, +/obj/effect/turf_decal/trimline/opaque/terragovblue/warning{ dir = 1 }, /turf/open/floor/plasteel/patterned, @@ -5108,21 +5108,21 @@ dir = 1 }, /obj/machinery/light/directional/north, -/obj/effect/turf_decal/corner/opaque/solgovblue{ +/obj/effect/turf_decal/corner/opaque/terragovblue{ dir = 10 }, -/obj/machinery/suit_storage_unit/solgov, +/obj/machinery/suit_storage_unit/terragov, /turf/open/floor/plasteel/white, /area/ship/security/armory) "GF" = ( /obj/structure/bookcase/random, -/obj/structure/sign/poster/solgov/random{ +/obj/structure/sign/poster/terragov/random{ pixel_x = 32 }, /turf/open/floor/wood/walnut, /area/ship/crew/library) "GH" = ( -/obj/effect/turf_decal/spline/fancy/transparent/solgovblue{ +/obj/effect/turf_decal/spline/fancy/transparent/terragovblue{ dir = 8 }, /obj/structure/cable{ @@ -5131,7 +5131,7 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/effect/turf_decal/trimline/opaque/solgovblue/warning{ +/obj/effect/turf_decal/trimline/opaque/terragovblue/warning{ dir = 8 }, /obj/machinery/light/floor, @@ -5157,7 +5157,7 @@ /turf/open/floor/plasteel/mono, /area/ship/cargo) "GO" = ( -/obj/effect/turf_decal/corner/opaque/solgovblue{ +/obj/effect/turf_decal/corner/opaque/terragovblue{ dir = 1 }, /obj/structure/cable{ @@ -5169,10 +5169,10 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/effect/turf_decal/corner/opaque/solgovgold{ +/obj/effect/turf_decal/corner/opaque/terragovgold{ dir = 6 }, -/obj/effect/turf_decal/trimline/opaque/solgovblue/warning{ +/obj/effect/turf_decal/trimline/opaque/terragovblue/warning{ dir = 4 }, /turf/open/floor/plasteel/patterned, @@ -5182,7 +5182,7 @@ /turf/open/floor/wood/walnut, /area/ship/crew/dorm/dormthree) "GV" = ( -/obj/effect/turf_decal/corner/opaque/solgovblue/full, +/obj/effect/turf_decal/corner/opaque/terragovblue/full, /obj/structure/cable{ icon_state = "4-8" }, @@ -5195,7 +5195,7 @@ /obj/structure/chair{ dir = 1 }, -/obj/effect/turf_decal/spline/fancy/transparent/solgovblue{ +/obj/effect/turf_decal/spline/fancy/transparent/terragovblue{ dir = 9 }, /turf/open/floor/plasteel/mono, @@ -5221,18 +5221,18 @@ "Hv" = ( /obj/machinery/light/floor, /obj/effect/turf_decal/siding/yellow, -/obj/effect/turf_decal/spline/fancy/transparent/solgovblue/corner{ +/obj/effect/turf_decal/spline/fancy/transparent/terragovblue/corner{ dir = 4 }, -/obj/effect/turf_decal/trimline/opaque/solgovblue/corner{ +/obj/effect/turf_decal/trimline/opaque/terragovblue/corner{ dir = 4 }, -/obj/effect/turf_decal/trimline/opaque/solgovblue/warning, +/obj/effect/turf_decal/trimline/opaque/terragovblue/warning, /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/plasteel/patterned/cargo_one, /area/ship/cargo) "HB" = ( -/obj/effect/turf_decal/corner/opaque/solgovblue{ +/obj/effect/turf_decal/corner/opaque/terragovblue{ dir = 1 }, /obj/machinery/newscaster/security_unit/directional/south, @@ -5262,7 +5262,7 @@ /area/ship/crew/canteen/kitchen) "HT" = ( /obj/structure/table/wood/fancy/blue, -/obj/machinery/fax/solgov, +/obj/machinery/fax/terragov, /turf/open/floor/wood/maple, /area/ship/bridge) "HV" = ( @@ -5272,7 +5272,7 @@ /obj/effect/turf_decal/techfloor/corner{ dir = 8 }, -/obj/effect/turf_decal/corner/opaque/solgovgold{ +/obj/effect/turf_decal/corner/opaque/terragovgold{ dir = 9 }, /obj/structure/cable{ @@ -5284,7 +5284,7 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 9 }, -/obj/effect/turf_decal/trimline/opaque/solgovblue/warning{ +/obj/effect/turf_decal/trimline/opaque/terragovblue/warning{ dir = 8 }, /obj/effect/decal/cleanable/dirt/dust, @@ -5324,10 +5324,10 @@ /area/ship/hallway/starboard) "Il" = ( /obj/effect/turf_decal/siding/yellow, -/obj/effect/turf_decal/spline/fancy/transparent/solgovblue/corner{ +/obj/effect/turf_decal/spline/fancy/transparent/terragovblue/corner{ dir = 4 }, -/obj/effect/turf_decal/trimline/opaque/solgovblue/corner{ +/obj/effect/turf_decal/trimline/opaque/terragovblue/corner{ dir = 4 }, /obj/effect/decal/cleanable/dirt/dust, @@ -5370,7 +5370,7 @@ pixel_x = 15; pixel_y = 7 }, -/obj/effect/turf_decal/spline/fancy/transparent/solgovblue{ +/obj/effect/turf_decal/spline/fancy/transparent/terragovblue{ dir = 1 }, /turf/open/floor/plasteel/mono, @@ -5396,10 +5396,10 @@ /obj/item/kitchen/knife/letter_opener{ pixel_x = 4 }, -/obj/effect/turf_decal/corner/opaque/solgovblue{ +/obj/effect/turf_decal/corner/opaque/terragovblue{ dir = 10 }, -/obj/structure/sign/poster/solgov/random{ +/obj/structure/sign/poster/terragov/random{ pixel_y = 32 }, /turf/open/floor/plasteel/white, @@ -5429,10 +5429,10 @@ /area/ship/crew/office) "Jh" = ( /obj/effect/turf_decal/siding/yellow, -/obj/effect/turf_decal/spline/fancy/transparent/solgovblue{ +/obj/effect/turf_decal/spline/fancy/transparent/terragovblue{ dir = 1 }, -/obj/effect/turf_decal/trimline/opaque/solgovblue/warning{ +/obj/effect/turf_decal/trimline/opaque/terragovblue/warning{ dir = 1 }, /obj/machinery/light/directional/east, @@ -5444,14 +5444,14 @@ /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ dir = 4 }, -/obj/effect/turf_decal/corner/opaque/solgovblue{ +/obj/effect/turf_decal/corner/opaque/terragovblue{ dir = 5 }, /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/plasteel/white, /area/ship/security/armory) "Jr" = ( -/obj/effect/turf_decal/corner/opaque/solgovblue{ +/obj/effect/turf_decal/corner/opaque/terragovblue{ dir = 6 }, /obj/effect/turf_decal/borderfloorblack{ @@ -5459,7 +5459,7 @@ }, /obj/structure/table/wood, /obj/item/paper_bin, -/obj/item/pen/solgov, +/obj/item/pen/terragov, /turf/open/floor/plasteel/white, /area/ship/crew/cryo) "Js" = ( @@ -5468,7 +5468,7 @@ /turf/open/floor/wood/walnut, /area/ship/crew/library) "Jt" = ( -/obj/effect/turf_decal/spline/fancy/transparent/solgovblue{ +/obj/effect/turf_decal/spline/fancy/transparent/terragovblue{ dir = 8 }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ @@ -5477,7 +5477,7 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 1 }, -/obj/effect/turf_decal/trimline/opaque/solgovblue/warning{ +/obj/effect/turf_decal/trimline/opaque/terragovblue/warning{ dir = 8 }, /obj/effect/decal/cleanable/dirt/dust, @@ -5488,7 +5488,7 @@ dir = 8 }, /obj/effect/turf_decal/techfloor/corner, -/obj/effect/turf_decal/corner/opaque/solgovgold{ +/obj/effect/turf_decal/corner/opaque/terragovgold{ dir = 10 }, /obj/structure/cable{ @@ -5503,13 +5503,13 @@ /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ dir = 4 }, -/obj/effect/turf_decal/trimline/opaque/solgovblue/warning, +/obj/effect/turf_decal/trimline/opaque/terragovblue/warning, /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/plasteel/white, /area/ship/hallway/starboard) "JD" = ( /obj/structure/closet/cardboard{ - desc = "Contains a lifetime supply of Solarian Marine Society Shark plushies!"; + desc = "Contains a lifetime supply of Terran Marine Society Shark plushies!"; name = "plushie transport box" }, /obj/item/toy/plush/blahaj, @@ -5568,7 +5568,7 @@ /turf/open/floor/plasteel/mono/dark, /area/ship/hallway/starboard) "JT" = ( -/obj/effect/turf_decal/corner/opaque/solgovblue/full, +/obj/effect/turf_decal/corner/opaque/terragovblue/full, /obj/structure/cable{ icon_state = "4-8" }, @@ -5594,7 +5594,7 @@ dir = 1 }, /obj/effect/decal/cleanable/dirt/dust, -/obj/structure/sign/poster/solgov/random{ +/obj/structure/sign/poster/terragov/random{ pixel_y = 32 }, /turf/open/floor/plasteel/white, @@ -5632,7 +5632,7 @@ /turf/open/floor/wood/birch, /area/ship/crew/dorm/dormthree) "Kd" = ( -/obj/effect/turf_decal/corner/opaque/solgovblue/full, +/obj/effect/turf_decal/corner/opaque/terragovblue/full, /obj/structure/cable{ icon_state = "4-8" }, @@ -5655,14 +5655,14 @@ /obj/item/tank/internals/emergency_oxygen/engi, /obj/item/tank/internals/emergency_oxygen/engi, /obj/item/tank/internals/emergency_oxygen/engi, -/obj/item/clothing/suit/hazardvest/solgov, -/obj/item/clothing/suit/hazardvest/solgov, -/obj/item/clothing/suit/hazardvest/solgov, -/obj/item/clothing/suit/hazardvest/solgov, -/obj/item/clothing/head/hardhat/solgov, -/obj/item/clothing/head/hardhat/solgov, -/obj/item/clothing/head/hardhat/solgov, -/obj/item/clothing/head/hardhat/solgov, +/obj/item/clothing/suit/hazardvest/terragov, +/obj/item/clothing/suit/hazardvest/terragov, +/obj/item/clothing/suit/hazardvest/terragov, +/obj/item/clothing/suit/hazardvest/terragov, +/obj/item/clothing/head/hardhat/terragov, +/obj/item/clothing/head/hardhat/terragov, +/obj/item/clothing/head/hardhat/terragov, +/obj/item/clothing/head/hardhat/terragov, /obj/effect/turf_decal/industrial/stand_clear{ dir = 1 }, @@ -5688,26 +5688,26 @@ /turf/open/floor/wood, /area/ship/crew/canteen/kitchen) "KK" = ( -/obj/effect/turf_decal/spline/fancy/transparent/solgovblue{ +/obj/effect/turf_decal/spline/fancy/transparent/terragovblue{ dir = 1 }, /obj/structure/cable{ icon_state = "2-8" }, -/obj/effect/turf_decal/trimline/opaque/solgovblue/warning{ +/obj/effect/turf_decal/trimline/opaque/terragovblue/warning{ dir = 1 }, /turf/open/floor/plasteel/patterned/cargo_one, /area/ship/cargo) "KL" = ( /obj/effect/turf_decal/siding/yellow, -/obj/effect/turf_decal/spline/fancy/transparent/solgovblue{ +/obj/effect/turf_decal/spline/fancy/transparent/terragovblue{ dir = 1 }, -/obj/effect/turf_decal/trimline/opaque/solgovblue/warning{ +/obj/effect/turf_decal/trimline/opaque/terragovblue/warning{ dir = 1 }, -/obj/effect/turf_decal/trimline/opaque/solgovblue/corner{ +/obj/effect/turf_decal/trimline/opaque/terragovblue/corner{ dir = 8 }, /turf/open/floor/plasteel/patterned/cargo_one, @@ -5726,14 +5726,14 @@ /turf/open/floor/plasteel/white, /area/ship/hallway/starboard) "KU" = ( -/obj/effect/turf_decal/spline/fancy/transparent/solgovblue/corner, -/obj/effect/turf_decal/spline/fancy/transparent/solgovblue{ +/obj/effect/turf_decal/spline/fancy/transparent/terragovblue/corner, +/obj/effect/turf_decal/spline/fancy/transparent/terragovblue{ dir = 1 }, -/obj/effect/turf_decal/trimline/opaque/solgovblue/warning{ +/obj/effect/turf_decal/trimline/opaque/terragovblue/warning{ dir = 1 }, -/obj/effect/turf_decal/trimline/opaque/solgovblue/corner, +/obj/effect/turf_decal/trimline/opaque/terragovblue/corner, /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/plasteel/patterned/cargo_one, /area/ship/cargo) @@ -5759,7 +5759,7 @@ dir = 8 }, /obj/effect/turf_decal/techfloor/corner, -/obj/effect/turf_decal/corner/opaque/solgovgold{ +/obj/effect/turf_decal/corner/opaque/terragovgold{ dir = 10 }, /obj/structure/cable{ @@ -5771,7 +5771,7 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 1 }, -/obj/effect/turf_decal/trimline/opaque/solgovblue/warning, +/obj/effect/turf_decal/trimline/opaque/terragovblue/warning, /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/plasteel/white, /area/ship/engineering) @@ -5779,9 +5779,9 @@ /obj/effect/turf_decal/siding/yellow{ dir = 1 }, -/obj/effect/turf_decal/spline/fancy/transparent/solgovblue/corner, -/obj/effect/turf_decal/trimline/opaque/solgovblue/corner, -/obj/effect/turf_decal/trimline/opaque/solgovblue/warning{ +/obj/effect/turf_decal/spline/fancy/transparent/terragovblue/corner, +/obj/effect/turf_decal/trimline/opaque/terragovblue/corner, +/obj/effect/turf_decal/trimline/opaque/terragovblue/warning{ dir = 1 }, /obj/machinery/light/floor, @@ -5792,7 +5792,7 @@ dir = 1 }, /obj/effect/turf_decal/techfloor/corner, -/obj/effect/turf_decal/corner/opaque/solgovgold/three_quarters{ +/obj/effect/turf_decal/corner/opaque/terragovgold/three_quarters{ dir = 8 }, /obj/structure/cable{ @@ -5805,7 +5805,7 @@ dir = 6 }, /obj/machinery/firealarm/directional/north, -/obj/effect/turf_decal/trimline/opaque/solgovblue/warning{ +/obj/effect/turf_decal/trimline/opaque/terragovblue/warning{ dir = 5 }, /obj/effect/decal/cleanable/dirt/dust, @@ -5822,10 +5822,10 @@ /turf/open/floor/plasteel/patterned/cargo_one, /area/ship/cargo) "Lw" = ( -/obj/effect/turf_decal/spline/fancy/transparent/solgovblue{ +/obj/effect/turf_decal/spline/fancy/transparent/terragovblue{ dir = 8 }, -/obj/effect/turf_decal/trimline/opaque/solgovblue/warning{ +/obj/effect/turf_decal/trimline/opaque/terragovblue/warning{ dir = 8 }, /obj/effect/decal/cleanable/dirt/dust, @@ -5837,31 +5837,31 @@ /turf/open/floor/plasteel/mono, /area/ship/cargo) "LB" = ( -/obj/item/clothing/head/solgov/captain, -/obj/item/clothing/suit/armor/vest/bulletproof/solgov/captain, -/obj/item/clothing/under/solgov/formal/captain, +/obj/item/clothing/head/terragov/captain, +/obj/item/clothing/suit/armor/vest/bulletproof/terragov/captain, +/obj/item/clothing/under/terragov/formal/captain, /obj/item/clothing/shoes/laceup, /obj/item/clothing/gloves/combat, /obj/item/door_remote/captain, -/obj/item/storage/belt/sabre/solgov, -/obj/item/clothing/under/solgov, -/obj/item/clothing/under/solgov/dress, -/obj/item/clothing/under/solgov/formal, -/obj/item/folder/solgov, -/obj/item/folder/solgov, -/obj/item/folder/documents/solgov, -/obj/item/folder/documents/solgov, +/obj/item/storage/belt/sabre/terragov, +/obj/item/clothing/under/terragov, +/obj/item/clothing/under/terragov/dress, +/obj/item/clothing/under/terragov/formal, +/obj/item/folder/terragov, +/obj/item/folder/terragov, +/obj/item/folder/documents/terragov, +/obj/item/folder/documents/terragov, /obj/structure/closet/secure_closet{ icon_state = "cap"; name = "\proper captain's locker"; req_access_txt = "20" }, /obj/item/fish_feed, -/obj/item/pen/fountain/solgov, +/obj/item/pen/fountain/terragov, /obj/item/gun/ballistic/automatic/powered/gauss/modelh, /obj/item/ammo_box/magazine/modelh, /obj/item/ammo_box/magazine/modelh, -/obj/item/clothing/neck/cloak/solgovcap, +/obj/item/clothing/neck/cloak/terragovcap, /turf/open/floor/wood/maple, /area/ship/crew/dorm/dormtwo) "LJ" = ( @@ -5900,9 +5900,9 @@ /obj/effect/turf_decal/siding/yellow{ dir = 1 }, -/obj/effect/turf_decal/spline/fancy/transparent/solgovblue, -/obj/effect/turf_decal/trimline/opaque/solgovblue/warning, -/obj/effect/turf_decal/trimline/opaque/solgovblue/warning{ +/obj/effect/turf_decal/spline/fancy/transparent/terragovblue, +/obj/effect/turf_decal/trimline/opaque/terragovblue/warning, +/obj/effect/turf_decal/trimline/opaque/terragovblue/warning{ dir = 1 }, /turf/open/floor/plasteel/patterned/cargo_one, @@ -5915,7 +5915,7 @@ /obj/effect/turf_decal/siding/yellow{ dir = 8 }, -/obj/effect/turf_decal/corner/opaque/solgovblue{ +/obj/effect/turf_decal/corner/opaque/terragovblue{ dir = 5 }, /obj/machinery/computer/cryopod/directional/north{ @@ -5925,13 +5925,13 @@ /turf/open/floor/plasteel/white, /area/ship/crew/cryo) "Mt" = ( -/obj/effect/turf_decal/spline/fancy/transparent/solgovblue/corner{ +/obj/effect/turf_decal/spline/fancy/transparent/terragovblue/corner{ dir = 4 }, -/obj/effect/turf_decal/spline/fancy/transparent/solgovblue/corner, +/obj/effect/turf_decal/spline/fancy/transparent/terragovblue/corner, /obj/machinery/light/floor, -/obj/effect/turf_decal/trimline/opaque/solgovblue/corner, -/obj/effect/turf_decal/trimline/opaque/solgovblue/corner{ +/obj/effect/turf_decal/trimline/opaque/terragovblue/corner, +/obj/effect/turf_decal/trimline/opaque/terragovblue/corner{ dir = 4 }, /turf/open/floor/plasteel/patterned/cargo_one, @@ -6040,10 +6040,10 @@ /turf/open/floor/plasteel/mono, /area/ship/cargo) "Nd" = ( -/obj/effect/turf_decal/spline/fancy/transparent/solgovblue{ +/obj/effect/turf_decal/spline/fancy/transparent/terragovblue{ dir = 9 }, -/obj/effect/turf_decal/trimline/opaque/solgovblue/warning{ +/obj/effect/turf_decal/trimline/opaque/terragovblue/warning{ dir = 9 }, /turf/open/floor/plasteel/patterned/cargo_one, @@ -6063,7 +6063,7 @@ /obj/effect/turf_decal/techfloor/corner{ dir = 1 }, -/obj/effect/turf_decal/corner/opaque/solgovgold/three_quarters{ +/obj/effect/turf_decal/corner/opaque/terragovgold/three_quarters{ dir = 1 }, /obj/structure/cable{ @@ -6076,7 +6076,7 @@ dir = 8 }, /obj/machinery/light/directional/south, -/obj/effect/turf_decal/trimline/opaque/solgovblue/warning{ +/obj/effect/turf_decal/trimline/opaque/terragovblue/warning{ dir = 8 }, /obj/effect/decal/cleanable/dirt/dust, @@ -6088,19 +6088,19 @@ /turf/open/floor/wood/walnut, /area/ship/crew/canteen/kitchen) "NA" = ( -/obj/effect/turf_decal/spline/fancy/transparent/solgovblue{ +/obj/effect/turf_decal/spline/fancy/transparent/terragovblue{ dir = 4 }, -/obj/effect/turf_decal/spline/fancy/transparent/solgovblue{ +/obj/effect/turf_decal/spline/fancy/transparent/terragovblue{ dir = 8 }, /obj/structure/cable{ icon_state = "1-8" }, -/obj/effect/turf_decal/trimline/opaque/solgovblue/warning{ +/obj/effect/turf_decal/trimline/opaque/terragovblue/warning{ dir = 4 }, -/obj/effect/turf_decal/trimline/opaque/solgovblue/warning{ +/obj/effect/turf_decal/trimline/opaque/terragovblue/warning{ dir = 8 }, /turf/open/floor/plasteel/patterned/cargo_one, @@ -6148,7 +6148,7 @@ /turf/open/floor/wood, /area/ship/crew/library) "NV" = ( -/obj/effect/turf_decal/corner/opaque/solgovblue/full, +/obj/effect/turf_decal/corner/opaque/terragovblue/full, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2, /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/plasteel/white, @@ -6166,7 +6166,7 @@ /turf/closed/wall/mineral/titanium, /area/ship/maintenance/port) "Ol" = ( -/obj/effect/turf_decal/corner/opaque/solgovblue{ +/obj/effect/turf_decal/corner/opaque/terragovblue{ dir = 8 }, /obj/structure/cable{ @@ -6203,7 +6203,7 @@ /area/ship/crew/office) "Or" = ( /obj/machinery/atmospherics/pipe/layer_manifold, -/obj/structure/sign/solgov_seal{ +/obj/structure/sign/terragov_seal{ pixel_y = 0; pixel_x = -1 }, @@ -6238,7 +6238,7 @@ pixel_x = 5; pixel_y = 8 }, -/obj/item/desk_flag/solgov{ +/obj/item/desk_flag/terragov{ pixel_y = 12; pixel_x = -8 }, @@ -6267,15 +6267,15 @@ /obj/effect/turf_decal/siding/yellow{ dir = 1 }, -/obj/effect/turf_decal/spline/fancy/transparent/solgovblue/corner, -/obj/effect/turf_decal/trimline/opaque/solgovblue/corner, +/obj/effect/turf_decal/spline/fancy/transparent/terragovblue/corner, +/obj/effect/turf_decal/trimline/opaque/terragovblue/corner, /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/plasteel/patterned/cargo_one, /area/ship/cargo) "OW" = ( /obj/structure/table/wood/fancy/blue, /obj/item/paper_bin, -/obj/item/pen/solgov, +/obj/item/pen/terragov, /turf/open/floor/wood/walnut, /area/ship/crew/dorm/dormthree) "OX" = ( @@ -6289,10 +6289,10 @@ dir = 1 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/effect/turf_decal/corner/opaque/solgovgold{ +/obj/effect/turf_decal/corner/opaque/terragovgold{ dir = 10 }, -/obj/effect/turf_decal/trimline/opaque/solgovblue/warning, +/obj/effect/turf_decal/trimline/opaque/terragovblue/warning, /turf/open/floor/plasteel/white, /area/ship/crew/cryo) "Pf" = ( @@ -6300,7 +6300,7 @@ /turf/open/floor/plasteel/mono, /area/ship/cargo) "Pq" = ( -/obj/effect/turf_decal/spline/fancy/transparent/solgovblue{ +/obj/effect/turf_decal/spline/fancy/transparent/terragovblue{ dir = 4 }, /obj/structure/cable{ @@ -6309,14 +6309,14 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/effect/turf_decal/trimline/opaque/solgovblue/warning{ +/obj/effect/turf_decal/trimline/opaque/terragovblue/warning{ dir = 4 }, /obj/machinery/light/floor, /turf/open/floor/plasteel/patterned/cargo_one, /area/ship/cargo) "Pu" = ( -/obj/effect/turf_decal/corner/opaque/solgovblue/full, +/obj/effect/turf_decal/corner/opaque/terragovblue/full, /obj/structure/cable{ icon_state = "1-4" }, @@ -6349,14 +6349,14 @@ /turf/open/floor/wood/maple, /area/ship/crew/dorm/dormtwo) "PN" = ( -/obj/effect/turf_decal/corner/opaque/solgovblue/full, +/obj/effect/turf_decal/corner/opaque/terragovblue/full, /obj/structure/cable{ icon_state = "4-8" }, /turf/open/floor/plasteel/white, /area/ship/security/armory) "PR" = ( -/obj/effect/turf_decal/corner/opaque/solgovblue{ +/obj/effect/turf_decal/corner/opaque/terragovblue{ dir = 1 }, /obj/structure/cable{ @@ -6392,7 +6392,7 @@ /obj/effect/turf_decal/techfloor/orange{ dir = 10 }, -/obj/effect/turf_decal/corner/opaque/solgovblue{ +/obj/effect/turf_decal/corner/opaque/terragovblue{ dir = 4 }, /obj/machinery/button/door{ @@ -6416,7 +6416,7 @@ /area/ship/bridge) "Qz" = ( /obj/structure/chair, -/obj/effect/turf_decal/spline/fancy/transparent/solgovblue{ +/obj/effect/turf_decal/spline/fancy/transparent/terragovblue{ dir = 6 }, /turf/open/floor/plasteel/mono, @@ -6426,7 +6426,7 @@ dir = 5 }, /obj/effect/decal/cleanable/dirt/dust, -/obj/machinery/suit_storage_unit/solgov, +/obj/machinery/suit_storage_unit/terragov, /turf/open/floor/plasteel/white, /area/ship/security/armory) "QB" = ( @@ -6451,7 +6451,7 @@ /obj/structure/railing{ dir = 1 }, -/obj/effect/turf_decal/corner/opaque/solgovblue{ +/obj/effect/turf_decal/corner/opaque/terragovblue{ dir = 10 }, /turf/open/floor/plasteel/white, @@ -6470,10 +6470,10 @@ /turf/open/floor/plasteel/mono, /area/ship/cargo) "QP" = ( -/obj/effect/turf_decal/corner/opaque/solgovblue{ +/obj/effect/turf_decal/corner/opaque/terragovblue{ dir = 8 }, -/obj/effect/turf_decal/spline/fancy/transparent/solgovblue{ +/obj/effect/turf_decal/spline/fancy/transparent/terragovblue{ dir = 8 }, /obj/structure/closet/firecloset/wall/directional/north, @@ -6492,7 +6492,7 @@ "QX" = ( /obj/structure/table/wood/fancy/blue, /obj/item/clipboard, -/obj/item/folder/solgov, +/obj/item/folder/terragov, /obj/item/radio/intercom/directional/south, /turf/open/floor/wood/walnut, /area/ship/crew/dorm/dormthree) @@ -6601,7 +6601,7 @@ /area/ship/security/armory) "Ru" = ( /obj/structure/table/wood/fancy/blue, -/obj/item/desk_flag/solgov{ +/obj/item/desk_flag/terragov{ pixel_y = 12; pixel_x = -8 }, @@ -6609,7 +6609,7 @@ /turf/open/floor/wood/walnut, /area/ship/crew/dorm/dormthree) "Rw" = ( -/obj/effect/turf_decal/corner/opaque/solgovblue{ +/obj/effect/turf_decal/corner/opaque/terragovblue{ dir = 1 }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ @@ -6637,7 +6637,7 @@ /turf/open/floor/wood/walnut, /area/ship/crew/canteen/kitchen) "RH" = ( -/obj/effect/turf_decal/corner/opaque/solgovgold{ +/obj/effect/turf_decal/corner/opaque/terragovgold{ dir = 10 }, /obj/effect/turf_decal/techfloor/corner{ @@ -6650,10 +6650,10 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 6 }, -/obj/effect/turf_decal/corner/opaque/solgovblue{ +/obj/effect/turf_decal/corner/opaque/terragovblue{ dir = 5 }, -/obj/effect/turf_decal/trimline/opaque/solgovblue/warning, +/obj/effect/turf_decal/trimline/opaque/terragovblue/warning, /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/plasteel/white, /area/ship/security/armory) @@ -6663,17 +6663,17 @@ populate = 0 }, /obj/item/storage/backpack/industrial, -/obj/item/clothing/head/hardhat/solgov, -/obj/item/folder/solgov, +/obj/item/clothing/head/hardhat/terragov, +/obj/item/folder/terragov, /obj/item/clipboard, -/obj/item/clothing/under/solgov/formal, -/obj/item/clothing/under/solgov, +/obj/item/clothing/under/terragov/formal, +/obj/item/clothing/under/terragov, /obj/item/clothing/accessory/armband/engine, /obj/item/storage/toolbox/mechanical, /obj/item/clothing/glasses/welding, /obj/item/clothing/head/welding, -/obj/item/pen/solgov, -/obj/item/clothing/suit/hazardvest/solgov, +/obj/item/pen/terragov, +/obj/item/clothing/suit/hazardvest/terragov, /obj/item/clothing/shoes/workboots, /obj/item/clothing/gloves/combat, /obj/effect/turf_decal/techfloor, @@ -6721,13 +6721,13 @@ /area/ship/crew/canteen) "Sf" = ( /obj/effect/turf_decal/siding/yellow, -/obj/effect/turf_decal/spline/fancy/transparent/solgovblue{ +/obj/effect/turf_decal/spline/fancy/transparent/terragovblue{ dir = 1 }, -/obj/effect/turf_decal/trimline/opaque/solgovblue/warning{ +/obj/effect/turf_decal/trimline/opaque/terragovblue/warning{ dir = 1 }, -/obj/effect/turf_decal/trimline/opaque/solgovblue/corner{ +/obj/effect/turf_decal/trimline/opaque/terragovblue/corner{ dir = 8 }, /obj/effect/decal/cleanable/dirt/dust, @@ -6745,7 +6745,7 @@ /turf/open/floor/plasteel/mono/dark, /area/ship/storage) "Sr" = ( -/obj/effect/turf_decal/corner/opaque/solgovblue{ +/obj/effect/turf_decal/corner/opaque/terragovblue{ dir = 6 }, /obj/effect/turf_decal/borderfloorblack{ @@ -6770,29 +6770,29 @@ /turf/open/floor/wood, /area/ship/crew/canteen/kitchen) "Sw" = ( -/obj/effect/turf_decal/spline/fancy/transparent/solgovblue{ +/obj/effect/turf_decal/spline/fancy/transparent/terragovblue{ dir = 8 }, -/obj/effect/turf_decal/trimline/opaque/solgovblue/warning{ +/obj/effect/turf_decal/trimline/opaque/terragovblue/warning{ dir = 8 }, /turf/open/floor/plasteel/patterned/cargo_one, /area/ship/cargo) "Sx" = ( -/obj/effect/turf_decal/spline/fancy/transparent/solgovblue{ +/obj/effect/turf_decal/spline/fancy/transparent/terragovblue{ dir = 8 }, -/obj/effect/turf_decal/spline/fancy/transparent/solgovblue/corner{ +/obj/effect/turf_decal/spline/fancy/transparent/terragovblue/corner{ dir = 4 }, /obj/structure/cable{ icon_state = "4-8" }, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2, -/obj/effect/turf_decal/trimline/opaque/solgovblue/corner{ +/obj/effect/turf_decal/trimline/opaque/terragovblue/corner{ dir = 4 }, -/obj/effect/turf_decal/trimline/opaque/solgovblue/warning{ +/obj/effect/turf_decal/trimline/opaque/terragovblue/warning{ dir = 8 }, /turf/open/floor/plasteel/patterned/cargo_one, @@ -6806,7 +6806,7 @@ /turf/open/floor/plasteel/mono, /area/ship/cargo) "SB" = ( -/obj/effect/turf_decal/corner/opaque/solgovblue{ +/obj/effect/turf_decal/corner/opaque/terragovblue{ dir = 1 }, /obj/effect/turf_decal/techfloor/orange{ @@ -6822,7 +6822,7 @@ "SC" = ( /obj/machinery/light/floor, /obj/effect/turf_decal/siding/yellow, -/obj/effect/turf_decal/spline/fancy/transparent/solgovblue/corner{ +/obj/effect/turf_decal/spline/fancy/transparent/terragovblue/corner{ dir = 1 }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ @@ -6831,7 +6831,7 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 1 }, -/obj/effect/turf_decal/trimline/opaque/solgovblue/corner{ +/obj/effect/turf_decal/trimline/opaque/terragovblue/corner{ dir = 1 }, /obj/effect/decal/cleanable/dirt/dust, @@ -6869,14 +6869,14 @@ }, /obj/item/pickaxe/drill/jackhammer, /obj/item/storage/toolbox/mechanical, -/obj/item/clothing/head/hardhat/solgov, +/obj/item/clothing/head/hardhat/terragov, /obj/item/radio{ icon_state = "sec_radio" }, -/obj/item/clothing/under/solgov/formal, -/obj/item/clothing/under/solgov/dress, -/obj/item/clothing/under/solgov, -/obj/item/clothing/suit/hazardvest/solgov, +/obj/item/clothing/under/terragov/formal, +/obj/item/clothing/under/terragov/dress, +/obj/item/clothing/under/terragov, +/obj/item/clothing/suit/hazardvest/terragov, /obj/item/clothing/accessory/armband/cargo, /obj/item/clothing/shoes/workboots, /obj/item/clothing/gloves/combat, @@ -6892,10 +6892,10 @@ /turf/open/floor/plasteel/white, /area/ship/cargo/office) "Tf" = ( -/obj/effect/turf_decal/spline/fancy/transparent/solgovblue{ +/obj/effect/turf_decal/spline/fancy/transparent/terragovblue{ dir = 10 }, -/obj/effect/turf_decal/trimline/opaque/solgovblue/warning{ +/obj/effect/turf_decal/trimline/opaque/terragovblue/warning{ dir = 10 }, /obj/effect/decal/cleanable/dirt/dust, @@ -7021,7 +7021,7 @@ /turf/open/floor/wood, /area/ship/crew/canteen) "UC" = ( -/obj/effect/turf_decal/corner/opaque/solgovblue/full, +/obj/effect/turf_decal/corner/opaque/terragovblue/full, /obj/structure/cable{ icon_state = "4-8" }, @@ -7113,10 +7113,10 @@ pixel_x = 7; pixel_y = 8 }, -/obj/item/folder/solgov{ +/obj/item/folder/terragov{ pixel_x = 4 }, -/obj/item/pen/solgov{ +/obj/item/pen/terragov{ pixel_x = 2 }, /turf/open/floor/wood/maple, @@ -7172,7 +7172,7 @@ pixel_y = 18 }, /obj/item/clipboard, -/obj/item/folder/solgov, +/obj/item/folder/terragov, /obj/item/stamp/denied{ pixel_x = 4 }, @@ -7180,7 +7180,7 @@ pixel_x = -5; pixel_y = 9 }, -/obj/item/pen/solgov{ +/obj/item/pen/terragov{ pixel_y = 18 }, /turf/open/floor/wood/walnut, @@ -7215,7 +7215,7 @@ /turf/open/floor/plasteel/mono/dark, /area/ship/crew/dorm) "Wc" = ( -/obj/effect/turf_decal/corner/opaque/solgovblue/full, +/obj/effect/turf_decal/corner/opaque/terragovblue/full, /obj/structure/cable{ icon_state = "2-8" }, @@ -7258,7 +7258,7 @@ dir = 1 }, /obj/structure/table/wood/fancy/purple, -/obj/structure/sign/poster/solgov/random{ +/obj/structure/sign/poster/terragov/random{ pixel_y = 32 }, /turf/open/floor/wood/maple, @@ -7331,7 +7331,7 @@ /turf/open/floor/plasteel/mono, /area/ship/cargo) "WG" = ( -/obj/effect/turf_decal/corner/opaque/solgovblue{ +/obj/effect/turf_decal/corner/opaque/terragovblue{ dir = 1 }, /obj/effect/decal/cleanable/dirt/dust, @@ -7343,7 +7343,7 @@ /turf/open/floor/wood, /area/ship/crew/canteen) "WK" = ( -/obj/effect/turf_decal/solgov/all/bottom_right, +/obj/effect/turf_decal/terragov/all/bottom_right, /obj/effect/turf_decal/industrial/warning{ dir = 8 }, @@ -7435,13 +7435,13 @@ /obj/structure/cable{ icon_state = "2-8" }, -/obj/effect/turf_decal/corner/opaque/solgovgold{ +/obj/effect/turf_decal/corner/opaque/terragovgold{ dir = 6 }, -/obj/effect/turf_decal/corner/opaque/solgovblue{ +/obj/effect/turf_decal/corner/opaque/terragovblue{ dir = 9 }, -/obj/effect/turf_decal/trimline/opaque/solgovblue/warning{ +/obj/effect/turf_decal/trimline/opaque/terragovblue/warning{ dir = 4 }, /turf/open/floor/plasteel/tech, @@ -7474,7 +7474,7 @@ /obj/effect/turf_decal/techfloor/orange{ dir = 9 }, -/obj/effect/turf_decal/corner/opaque/solgovblue, +/obj/effect/turf_decal/corner/opaque/terragovblue, /obj/machinery/button/door{ pixel_y = 24; pixel_x = -4; @@ -7536,10 +7536,10 @@ /turf/open/floor/wood/walnut, /area/ship/cargo) "Yt" = ( -/obj/effect/turf_decal/spline/fancy/transparent/solgovblue{ +/obj/effect/turf_decal/spline/fancy/transparent/terragovblue{ dir = 4 }, -/obj/effect/turf_decal/trimline/opaque/solgovblue/warning{ +/obj/effect/turf_decal/trimline/opaque/terragovblue/warning{ dir = 4 }, /obj/effect/decal/cleanable/dirt/dust, @@ -7549,27 +7549,27 @@ /obj/effect/turf_decal/siding/yellow{ dir = 1 }, -/obj/effect/turf_decal/spline/fancy/transparent/solgovblue, -/obj/effect/turf_decal/trimline/opaque/solgovblue/warning, +/obj/effect/turf_decal/spline/fancy/transparent/terragovblue, +/obj/effect/turf_decal/trimline/opaque/terragovblue/warning, /obj/machinery/light/directional/east, /turf/open/floor/plasteel/patterned, /area/ship/cargo) "YB" = ( -/obj/effect/turf_decal/spline/fancy/transparent/solgovblue{ +/obj/effect/turf_decal/spline/fancy/transparent/terragovblue{ dir = 1 }, -/obj/effect/turf_decal/spline/fancy/transparent/solgovblue, -/obj/effect/turf_decal/trimline/opaque/solgovblue/warning{ +/obj/effect/turf_decal/spline/fancy/transparent/terragovblue, +/obj/effect/turf_decal/trimline/opaque/terragovblue/warning{ dir = 1 }, -/obj/effect/turf_decal/trimline/opaque/solgovblue/warning, +/obj/effect/turf_decal/trimline/opaque/terragovblue/warning, /turf/open/floor/plasteel/patterned/cargo_one, /area/ship/cargo) "YC" = ( -/obj/effect/turf_decal/spline/fancy/transparent/solgovblue{ +/obj/effect/turf_decal/spline/fancy/transparent/terragovblue{ dir = 4 }, -/obj/effect/turf_decal/spline/fancy/transparent/solgovblue{ +/obj/effect/turf_decal/spline/fancy/transparent/terragovblue{ dir = 8 }, /obj/structure/cable{ @@ -7581,10 +7581,10 @@ /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ dir = 4 }, -/obj/effect/turf_decal/trimline/opaque/solgovblue/warning{ +/obj/effect/turf_decal/trimline/opaque/terragovblue/warning{ dir = 4 }, -/obj/effect/turf_decal/trimline/opaque/solgovblue/warning{ +/obj/effect/turf_decal/trimline/opaque/terragovblue/warning{ dir = 8 }, /turf/open/floor/plasteel/patterned/cargo_one, @@ -7597,11 +7597,11 @@ /obj/effect/turf_decal/techfloor/orange{ dir = 4 }, -/obj/effect/turf_decal/corner/opaque/solgovblue{ +/obj/effect/turf_decal/corner/opaque/terragovblue{ dir = 9 }, /obj/effect/turf_decal/industrial/outline/yellow, -/obj/structure/sign/poster/solgov/random{ +/obj/structure/sign/poster/terragov/random{ pixel_x = 32 }, /turf/open/floor/plasteel/tech, @@ -7630,11 +7630,11 @@ /turf/open/floor/plasteel/white, /area/ship/hallway/starboard) "YP" = ( -/obj/effect/turf_decal/spline/fancy/transparent/solgovblue, +/obj/effect/turf_decal/spline/fancy/transparent/terragovblue, /obj/structure/cable{ icon_state = "1-8" }, -/obj/effect/turf_decal/trimline/opaque/solgovblue/warning, +/obj/effect/turf_decal/trimline/opaque/terragovblue/warning, /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/plasteel/patterned/cargo_one, /area/ship/cargo) @@ -7719,7 +7719,7 @@ /turf/open/floor/plasteel/patterned/ridged, /area/ship/cargo) "Zw" = ( -/obj/effect/turf_decal/corner/opaque/solgovgold{ +/obj/effect/turf_decal/corner/opaque/terragovgold{ dir = 5 }, /obj/effect/turf_decal/techfloor/corner{ @@ -7730,7 +7730,7 @@ }, /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, -/obj/effect/turf_decal/trimline/opaque/solgovblue/warning{ +/obj/effect/turf_decal/trimline/opaque/terragovblue/warning{ dir = 1 }, /turf/open/floor/plasteel/white, @@ -7828,7 +7828,7 @@ /turf/open/floor/wood/birch, /area/ship/crew/dorm/dormthree) "ZV" = ( -/obj/effect/turf_decal/solgov/all/center_right, +/obj/effect/turf_decal/terragov/all/center_right, /obj/effect/turf_decal/industrial/warning{ dir = 8 }, diff --git a/_maps/shuttles/solgov/solgov_paracelsus.dmm b/_maps/shuttles/solgov/solgov_paracelsus.dmm index 1eb02eac6a21..5d54f0682911 100644 --- a/_maps/shuttles/solgov/solgov_paracelsus.dmm +++ b/_maps/shuttles/solgov/solgov_paracelsus.dmm @@ -3,7 +3,7 @@ /turf/open/floor/plasteel/stairs/wood, /area/ship/bridge) "af" = ( -/obj/effect/turf_decal/solgov/wood/bottom_right, +/obj/effect/turf_decal/terragov/wood/bottom_right, /obj/effect/turf_decal/siding/wood{ dir = 8 }, @@ -55,11 +55,11 @@ "aG" = ( /obj/structure/table/wood, /obj/item/paper_bin, -/obj/item/pen/solgov, +/obj/item/pen/terragov, /turf/open/floor/carpet/royalblue, /area/ship/crew/canteen) "aJ" = ( -/obj/effect/turf_decal/trimline/opaque/solgovblue/filled/line{ +/obj/effect/turf_decal/trimline/opaque/terragovblue/filled/line{ dir = 5 }, /turf/open/floor/plasteel/white, @@ -172,7 +172,7 @@ /turf/closed/wall/mineral/titanium/nodiagonal, /area/ship/crew/crewtwo) "bT" = ( -/obj/effect/turf_decal/trimline/opaque/solgovblue/filled/line{ +/obj/effect/turf_decal/trimline/opaque/terragovblue/filled/line{ dir = 8 }, /turf/open/floor/plasteel/white, @@ -227,10 +227,10 @@ /turf/open/floor/wood, /area/ship/crew/crewtwo) "cu" = ( -/obj/effect/turf_decal/trimline/opaque/solgovblue/filled/corner{ +/obj/effect/turf_decal/trimline/opaque/terragovblue/filled/corner{ dir = 1 }, -/obj/effect/turf_decal/trimline/opaque/solgovblue/filled/corner{ +/obj/effect/turf_decal/trimline/opaque/terragovblue/filled/corner{ dir = 8 }, /obj/effect/turf_decal/siding/wideplating/dark/corner, @@ -285,7 +285,7 @@ /obj/machinery/door/firedoor/border_only{ dir = 1 }, -/obj/machinery/door/airlock/solgov/glass{ +/obj/machinery/door/airlock/terragov/glass{ name = "Waiting Room" }, /turf/open/floor/plasteel/dark, @@ -387,7 +387,7 @@ /turf/open/floor/plating, /area/ship/medical/surgery) "dS" = ( -/obj/effect/turf_decal/trimline/opaque/solgovblue/filled/line{ +/obj/effect/turf_decal/trimline/opaque/terragovblue/filled/line{ dir = 1 }, /obj/structure/noticeboard{ @@ -451,8 +451,8 @@ /turf/open/floor/plating, /area/ship/crew/crewtwo) "eC" = ( -/obj/effect/turf_decal/trimline/opaque/solgovblue/filled/corner, -/obj/effect/turf_decal/trimline/opaque/solgovblue/filled/corner{ +/obj/effect/turf_decal/trimline/opaque/terragovblue/filled/corner, +/obj/effect/turf_decal/trimline/opaque/terragovblue/filled/corner{ dir = 8 }, /obj/effect/turf_decal/borderfloorwhite{ @@ -496,7 +496,7 @@ /turf/open/floor/plasteel/white, /area/ship/medical/surgery) "fb" = ( -/obj/effect/turf_decal/trimline/opaque/solgovblue/filled/line{ +/obj/effect/turf_decal/trimline/opaque/terragovblue/filled/line{ dir = 1 }, /turf/open/floor/plasteel/white, @@ -546,7 +546,7 @@ /area/ship/cargo) "fV" = ( /obj/structure/closet/crate/bin, -/obj/effect/turf_decal/trimline/opaque/solgovblue/filled/line{ +/obj/effect/turf_decal/trimline/opaque/terragovblue/filled/line{ dir = 4 }, /obj/effect/decal/cleanable/dirt, @@ -563,7 +563,7 @@ "gk" = ( /obj/structure/table/wood, /obj/item/paper_bin, -/obj/item/pen/solgov, +/obj/item/pen/terragov, /obj/machinery/recharger{ pixel_x = -16; pixel_y = 3 @@ -586,7 +586,7 @@ dir = 1; color = "#792f27" }, -/obj/structure/sign/poster/solgov/random{ +/obj/structure/sign/poster/terragov/random{ pixel_y = 30 }, /turf/open/floor/wood/mahogany, @@ -606,7 +606,7 @@ /area/ship/maintenance/port) "gK" = ( /obj/structure/bed, -/obj/item/bedsheet/solgov, +/obj/item/bedsheet/terragov, /obj/machinery/firealarm/directional/north, /obj/machinery/light/directional/east, /turf/open/floor/carpet/royalblue, @@ -633,7 +633,7 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/door/airlock/solgov/glass{ +/obj/machinery/door/airlock/terragov/glass{ dir = 4; name = "Starboard Hallway" }, @@ -690,7 +690,7 @@ pixel_y = 8; pixel_x = 12 }, -/obj/effect/turf_decal/trimline/opaque/solgovblue/filled/line, +/obj/effect/turf_decal/trimline/opaque/terragovblue/filled/line, /obj/effect/turf_decal/borderfloorwhite{ dir = 1 }, @@ -763,25 +763,25 @@ /area/ship/maintenance/port) "hM" = ( /obj/effect/decal/cleanable/dirt/dust, -/obj/item/clothing/neck/stripedsolgovscarf, -/obj/item/clothing/neck/stripedsolgovscarf, -/obj/item/clothing/under/solgov, -/obj/item/clothing/under/solgov, -/obj/item/clothing/under/solgov/dress, -/obj/item/clothing/under/solgov/formal, -/obj/item/clothing/under/solgov/formal, +/obj/item/clothing/neck/stripedterragovscarf, +/obj/item/clothing/neck/stripedterragovscarf, +/obj/item/clothing/under/terragov, +/obj/item/clothing/under/terragov, +/obj/item/clothing/under/terragov/dress, +/obj/item/clothing/under/terragov/formal, +/obj/item/clothing/under/terragov/formal, /obj/item/clothing/shoes/laceup, /obj/item/clothing/shoes/laceup, -/obj/item/clothing/head/beret/solgov/plain, -/obj/item/clothing/head/beret/solgov/plain, -/obj/item/clothing/suit/solgov, -/obj/item/clothing/suit/solgov/dress, -/obj/item/clothing/suit/solgov/jacket, +/obj/item/clothing/head/beret/terragov/plain, +/obj/item/clothing/head/beret/terragov/plain, +/obj/item/clothing/suit/terragov, +/obj/item/clothing/suit/terragov/dress, +/obj/item/clothing/suit/terragov/jacket, /obj/machinery/light/small/directional/east, -/obj/item/clothing/under/solgov/formal/skirt, -/obj/item/clothing/suit/solgov/suit, -/obj/item/clothing/suit/hooded/wintercoat/solgov, -/obj/item/clothing/suit/hooded/wintercoat/solgov, +/obj/item/clothing/under/terragov/formal/skirt, +/obj/item/clothing/suit/terragov/suit, +/obj/item/clothing/suit/hooded/wintercoat/terragov, +/obj/item/clothing/suit/hooded/wintercoat/terragov, /obj/item/toy/plush/blahaj, /obj/structure/closet/cabinet, /turf/open/floor/wood/ebony, @@ -805,14 +805,14 @@ }, /obj/item/kitchen/knife/combat/survival, /obj/item/clothing/gloves/combat, -/obj/item/clothing/suit/hazardvest/solgov, -/obj/item/clothing/head/hardhat/solgov, +/obj/item/clothing/suit/hazardvest/terragov, +/obj/item/clothing/head/hardhat/terragov, /obj/item/clothing/glasses/meson, /obj/item/clothing/shoes/workboots, /obj/item/storage/toolbox/mechanical, -/obj/item/clothing/under/solgov, -/obj/item/clothing/under/solgov/dress, -/obj/item/clothing/under/solgov/formal, +/obj/item/clothing/under/terragov, +/obj/item/clothing/under/terragov/dress, +/obj/item/clothing/under/terragov/formal, /obj/item/storage/backpack, /obj/item/radio, /obj/structure/closet/secure_closet{ @@ -868,7 +868,7 @@ dir = 1 }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/door/airlock/solgov/glass{ +/obj/machinery/door/airlock/terragov/glass{ name = "Waiting Room" }, /turf/open/floor/plasteel/dark, @@ -897,7 +897,7 @@ }, /obj/item/reagent_containers/medigel/sterilizine, /obj/machinery/light/directional/west, -/obj/structure/sign/poster/solgov/random{ +/obj/structure/sign/poster/terragov/random{ pixel_y = 30 }, /turf/open/floor/mineral/titanium/tiled/white, @@ -947,7 +947,7 @@ /obj/effect/turf_decal/siding/yellow{ dir = 1 }, -/obj/machinery/suit_storage_unit/solgov, +/obj/machinery/suit_storage_unit/terragov, /obj/structure/window/reinforced{ dir = 4 }, @@ -999,17 +999,17 @@ /turf/open/floor/wood/yew, /area/ship/crew) "ku" = ( -/obj/effect/turf_decal/trimline/opaque/solgovblue/filled/corner{ +/obj/effect/turf_decal/trimline/opaque/terragovblue/filled/corner{ dir = 4 }, -/obj/effect/turf_decal/trimline/opaque/solgovblue/filled/corner, +/obj/effect/turf_decal/trimline/opaque/terragovblue/filled/corner, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ dir = 8 }, /turf/open/floor/plasteel/white, /area/ship/medical/surgery) "kw" = ( -/obj/structure/sign/solgov_seal{ +/obj/structure/sign/terragov_seal{ pixel_y = 0 }, /obj/docking_port/mobile{ @@ -1021,7 +1021,7 @@ /turf/closed/wall/mineral/titanium, /area/ship/cargo) "kC" = ( -/obj/effect/turf_decal/corner/opaque/solgovblue{ +/obj/effect/turf_decal/corner/opaque/terragovblue{ dir = 9 }, /obj/structure/table/wood, @@ -1032,7 +1032,7 @@ pixel_x = 7; pixel_y = 12 }, -/obj/item/pen/fountain/solgov{ +/obj/item/pen/fountain/terragov{ pixel_x = -5 }, /obj/machinery/recharger{ @@ -1041,7 +1041,7 @@ /turf/open/floor/plasteel/white, /area/ship/bridge) "kF" = ( -/obj/machinery/door/airlock/solgov{ +/obj/machinery/door/airlock/terragov{ dir = 4; req_one_access = list(20); name = "Captain's Quarters"; @@ -1071,7 +1071,7 @@ /turf/open/floor/plasteel/dark, /area/ship/crew) "kM" = ( -/obj/effect/turf_decal/solgov/all/center_left, +/obj/effect/turf_decal/terragov/all/center_left, /turf/open/floor/plasteel/mono, /area/ship/cargo) "kO" = ( @@ -1101,7 +1101,7 @@ "kW" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/machinery/suit_storage_unit/inherit, -/obj/item/clothing/suit/space/hardsuit/solgov, +/obj/item/clothing/suit/space/hardsuit/terragov, /obj/item/tank/jetpack, /turf/open/floor/wood/yew, /area/ship/crew) @@ -1201,7 +1201,7 @@ }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/door/airlock/solgov{ +/obj/machinery/door/airlock/terragov{ name = "Bridge" }, /turf/open/floor/plasteel/dark, @@ -1258,7 +1258,7 @@ /turf/open/floor/plasteel, /area/ship/cargo) "nb" = ( -/obj/effect/turf_decal/solgov/all/bottom_left, +/obj/effect/turf_decal/terragov/all/bottom_left, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 8 }, @@ -1305,7 +1305,7 @@ /obj/effect/turf_decal/borderfloorblack{ dir = 1 }, -/obj/effect/turf_decal/trimline/opaque/solgovblue/filled/line{ +/obj/effect/turf_decal/trimline/opaque/terragovblue/filled/line{ dir = 4 }, /obj/machinery/light/directional/east, @@ -1404,7 +1404,7 @@ /turf/open/floor/plasteel/mono/white, /area/ship/medical/surgery) "oz" = ( -/obj/machinery/door/airlock/solgov{ +/obj/machinery/door/airlock/terragov{ name = "Bridge" }, /obj/effect/turf_decal/industrial/warning{ @@ -1447,7 +1447,7 @@ /area/ship/maintenance/port) "oF" = ( /obj/structure/bed, -/obj/item/bedsheet/solgov, +/obj/item/bedsheet/terragov, /obj/structure/curtain/cloth, /obj/effect/turf_decal/siding/wood{ dir = 1; @@ -1461,7 +1461,7 @@ /obj/structure/railing/wood{ dir = 8 }, -/obj/machinery/computer/crew/solgov{ +/obj/machinery/computer/crew/terragov{ dir = 4 }, /obj/effect/turf_decal/siding/wood{ @@ -1490,7 +1490,7 @@ /area/ship/hallway/starboard) "pc" = ( /obj/structure/bed, -/obj/item/bedsheet/solgov, +/obj/item/bedsheet/terragov, /obj/structure/curtain/cloth, /turf/open/floor/wood/ebony, /area/ship/crew/dorm) @@ -1635,7 +1635,7 @@ /turf/open/floor/carpet/royalblue, /area/ship/crew/office) "qp" = ( -/obj/structure/sign/solgov_seal{ +/obj/structure/sign/terragov_seal{ pixel_y = 4 }, /turf/closed/wall/mineral/titanium, @@ -1654,14 +1654,14 @@ }, /obj/item/kitchen/knife/combat/survival, /obj/item/clothing/gloves/combat, -/obj/item/clothing/suit/hazardvest/solgov, -/obj/item/clothing/head/hardhat/solgov, +/obj/item/clothing/suit/hazardvest/terragov, +/obj/item/clothing/head/hardhat/terragov, /obj/item/clothing/glasses/meson, /obj/item/clothing/shoes/workboots, /obj/item/storage/toolbox/mechanical, -/obj/item/clothing/under/solgov, -/obj/item/clothing/under/solgov/dress, -/obj/item/clothing/under/solgov/formal, +/obj/item/clothing/under/terragov, +/obj/item/clothing/under/terragov/dress, +/obj/item/clothing/under/terragov/formal, /obj/item/storage/backpack, /obj/item/radio, /obj/structure/closet/secure_closet{ @@ -1745,16 +1745,16 @@ req_access = list(11) }, /obj/item/clothing/gloves/combat, -/obj/item/clothing/head/hardhat/solgov, -/obj/item/clothing/under/solgov/formal, +/obj/item/clothing/head/hardhat/terragov, +/obj/item/clothing/under/terragov/formal, /obj/item/storage/toolbox/mechanical, /obj/item/clothing/accessory/armband/engine, /obj/item/clothing/glasses/welding, -/obj/item/clothing/suit/hazardvest/solgov, +/obj/item/clothing/suit/hazardvest/terragov, /obj/item/clothing/shoes/workboots, -/obj/item/folder/solgov, +/obj/item/folder/terragov, /obj/item/clipboard, -/obj/item/pen/solgov, +/obj/item/pen/terragov, /obj/item/clothing/glasses/meson/prescription, /turf/open/floor/plasteel/tech/techmaint, /area/ship/maintenance/port) @@ -1788,7 +1788,7 @@ /obj/machinery/shower{ dir = 8 }, -/obj/effect/turf_decal/trimline/opaque/solgovblue/filled/line, +/obj/effect/turf_decal/trimline/opaque/terragovblue/filled/line, /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ dir = 8 @@ -1852,7 +1852,7 @@ /turf/open/floor/carpet/royalblue, /area/ship/crew/canteen) "rY" = ( -/obj/structure/sign/solgov_flag{ +/obj/structure/sign/terragov_flag{ pixel_y = -3 }, /turf/closed/wall/mineral/titanium, @@ -1874,7 +1874,7 @@ pixel_x = 8; pixel_y = 12 }, -/obj/machinery/fax/solgov, +/obj/machinery/fax/terragov, /turf/open/floor/wood/mahogany, /area/ship/bridge) "sp" = ( @@ -2060,9 +2060,9 @@ dir = 4 }, /obj/effect/turf_decal/industrial/outline/yellow, -/obj/item/folder/solgov, -/obj/item/folder/solgov, -/obj/item/folder/solgov, +/obj/item/folder/terragov, +/obj/item/folder/terragov, +/obj/item/folder/terragov, /turf/open/floor/plasteel/mono, /area/ship/cargo/office) "uO" = ( @@ -2105,7 +2105,7 @@ /turf/open/floor/plasteel/patterned, /area/ship/cargo/office) "vi" = ( -/obj/effect/turf_decal/solgov/all/center_right, +/obj/effect/turf_decal/terragov/all/center_right, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 1 }, @@ -2137,7 +2137,7 @@ /turf/open/floor/wood, /area/ship/hallway/starboard) "vl" = ( -/obj/structure/sign/solgov_flag{ +/obj/structure/sign/terragov_flag{ dir = 4; pixel_x = 4 }, @@ -2244,7 +2244,7 @@ /turf/open/floor/wood, /area/ship/cargo/office) "wk" = ( -/obj/machinery/door/airlock/solgov{ +/obj/machinery/door/airlock/terragov{ name = "Psychologist Office"; id_tag = "sg_par_psychlock" }, @@ -2284,7 +2284,7 @@ dir = 1 }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/door/airlock/solgov/glass{ +/obj/machinery/door/airlock/terragov/glass{ name = "Offices" }, /turf/open/floor/plasteel/dark, @@ -2324,13 +2324,13 @@ /turf/template_noop, /area/template_noop) "wK" = ( -/obj/effect/turf_decal/trimline/opaque/solgovblue/filled/corner{ +/obj/effect/turf_decal/trimline/opaque/terragovblue/filled/corner{ dir = 4 }, -/obj/effect/turf_decal/trimline/opaque/solgovblue/filled/corner{ +/obj/effect/turf_decal/trimline/opaque/terragovblue/filled/corner{ dir = 1 }, -/obj/effect/turf_decal/trimline/opaque/solgovblue/filled/corner{ +/obj/effect/turf_decal/trimline/opaque/terragovblue/filled/corner{ dir = 8 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ @@ -2407,7 +2407,7 @@ /turf/open/floor/wood/ebony, /area/ship/crew/canteen) "xw" = ( -/obj/effect/turf_decal/solgov/all/bottom_right, +/obj/effect/turf_decal/terragov/all/bottom_right, /obj/structure/cable{ icon_state = "1-2" }, @@ -2449,7 +2449,7 @@ /obj/effect/turf_decal/siding/wood/corner{ dir = 8 }, -/obj/effect/turf_decal/solgov/wood/center_right, +/obj/effect/turf_decal/terragov/wood/center_right, /obj/structure/cable{ icon_state = "4-8" }, @@ -2463,24 +2463,24 @@ /area/ship/bridge) "ye" = ( /obj/item/clothing/neck/cloak/overseer, -/obj/item/clothing/suit/armor/vest/bulletproof/solgov/overseer, +/obj/item/clothing/suit/armor/vest/bulletproof/terragov/overseer, /obj/structure/closet/secure_closet/head_of_personnel{ anchored = 1; name = "\proper overseer's locker"; populate = 0 }, /obj/item/clothing/gloves/combat, -/obj/item/folder/solgov, -/obj/item/folder/solgov, -/obj/item/folder/documents/solgov, -/obj/item/clothing/under/solgov/formal, -/obj/item/clothing/head/solgov, -/obj/item/storage/belt/sabre/solgov, +/obj/item/folder/terragov, +/obj/item/folder/terragov, +/obj/item/folder/documents/terragov, +/obj/item/clothing/under/terragov/formal, +/obj/item/clothing/head/terragov, +/obj/item/storage/belt/sabre/terragov, /obj/item/storage/backpack, -/obj/item/pen/solgov, -/obj/item/clothing/under/solgov/dress, -/obj/item/stamp/solgov, -/obj/item/clothing/suit/armor/solgov_trenchcoat, +/obj/item/pen/terragov, +/obj/item/clothing/under/terragov/dress, +/obj/item/stamp/terragov, +/obj/item/clothing/suit/armor/terragov_trenchcoat, /obj/effect/turf_decal/siding/wood{ dir = 1; color = "#792f27" @@ -2527,14 +2527,14 @@ dir = 1 }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/structure/sign/poster/solgov/random{ +/obj/structure/sign/poster/terragov/random{ pixel_x = 28 }, /turf/open/floor/plasteel/patterned, /area/ship/cargo) "yN" = ( /obj/machinery/iv_drip, -/obj/effect/turf_decal/trimline/opaque/solgovblue/filled/line, +/obj/effect/turf_decal/trimline/opaque/terragovblue/filled/line, /obj/effect/turf_decal/borderfloorwhite{ dir = 1 }, @@ -2589,7 +2589,7 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/door/airlock/solgov/glass{ +/obj/machinery/door/airlock/terragov/glass{ dir = 4; name = "Cafeteria" }, @@ -2600,7 +2600,7 @@ /area/ship/crew/dorm) "zc" = ( /obj/structure/table/wood, -/obj/item/desk_flag/solgov{ +/obj/item/desk_flag/terragov{ pixel_y = 2; pixel_x = 7 }, @@ -2673,7 +2673,7 @@ /area/ship/cargo/office) "Ac" = ( /obj/item/kirbyplants/random, -/obj/effect/turf_decal/trimline/opaque/solgovblue/filled/line{ +/obj/effect/turf_decal/trimline/opaque/terragovblue/filled/line{ dir = 8 }, /obj/effect/turf_decal/siding/wideplating/dark{ @@ -2702,7 +2702,7 @@ dir = 1 }, /obj/effect/decal/cleanable/dirt/dust, -/obj/machinery/suit_storage_unit/solgov, +/obj/machinery/suit_storage_unit/terragov, /obj/structure/window/reinforced{ dir = 4 }, @@ -2725,7 +2725,7 @@ /obj/structure/railing/wood{ dir = 8 }, -/obj/machinery/computer/cargo/express/solgov{ +/obj/machinery/computer/cargo/express/terragov{ dir = 4 }, /obj/effect/turf_decal/siding/wood{ @@ -2735,10 +2735,10 @@ /turf/open/floor/wood/mahogany, /area/ship/bridge) "AO" = ( -/obj/effect/turf_decal/trimline/opaque/solgovblue/filled/line{ +/obj/effect/turf_decal/trimline/opaque/terragovblue/filled/line{ dir = 1 }, -/obj/effect/turf_decal/trimline/opaque/solgovblue/filled/line, +/obj/effect/turf_decal/trimline/opaque/terragovblue/filled/line, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 4 }, @@ -2793,14 +2793,14 @@ /turf/open/floor/plasteel/tech/techmaint, /area/ship/maintenance/starboard) "Bs" = ( -/obj/effect/turf_decal/trimline/opaque/solgovblue/filled/line{ +/obj/effect/turf_decal/trimline/opaque/terragovblue/filled/line{ dir = 4 }, /obj/effect/decal/cleanable/dirt, /turf/open/floor/plasteel/white, /area/ship/medical/surgery) "Bx" = ( -/obj/effect/turf_decal/trimline/opaque/solgovblue/filled/corner{ +/obj/effect/turf_decal/trimline/opaque/terragovblue/filled/corner{ dir = 1 }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ @@ -2820,7 +2820,7 @@ /obj/machinery/cryopod{ dir = 4 }, -/obj/effect/turf_decal/corner/opaque/solgovblue{ +/obj/effect/turf_decal/corner/opaque/terragovblue{ dir = 9 }, /obj/effect/turf_decal/corner/opaque/grey/half{ @@ -2849,8 +2849,8 @@ /obj/structure/railing/wood{ dir = 8 }, -/obj/item/gun/ballistic/automatic/pistol/solgov, -/obj/item/gun/ballistic/automatic/pistol/solgov, +/obj/item/gun/ballistic/automatic/pistol/terragov, +/obj/item/gun/ballistic/automatic/pistol/terragov, /obj/item/ammo_box/magazine/pistol556mm, /obj/item/ammo_box/magazine/pistol556mm, /obj/item/ammo_box/magazine/pistol556mm, @@ -2911,7 +2911,7 @@ /turf/open/floor/wood/ebony, /area/ship/crew/office) "Cn" = ( -/obj/effect/turf_decal/solgov/all/center, +/obj/effect/turf_decal/terragov/all/center, /turf/open/floor/plasteel/mono, /area/ship/cargo) "Co" = ( @@ -2923,7 +2923,7 @@ dir = 1 }, /obj/machinery/door/firedoor/border_only, -/obj/machinery/door/airlock/solgov/glass{ +/obj/machinery/door/airlock/terragov/glass{ name = "Offices" }, /turf/open/floor/plasteel/dark, @@ -2982,7 +2982,7 @@ /area/ship/cargo) "Di" = ( /obj/effect/decal/cleanable/dirt/dust, -/obj/effect/turf_decal/solgov/all/top_right, +/obj/effect/turf_decal/terragov/all/top_right, /obj/structure/cable{ icon_state = "1-8" }, @@ -3019,7 +3019,7 @@ /turf/open/floor/plasteel/patterned, /area/ship/cargo/office) "Dv" = ( -/obj/effect/turf_decal/solgov/all/bottom_center, +/obj/effect/turf_decal/terragov/all/bottom_center, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 8 }, @@ -3031,8 +3031,8 @@ "Dz" = ( /obj/structure/table/wood, /obj/item/paper_bin, -/obj/item/pen/solgov, -/obj/item/folder/solgov{ +/obj/item/pen/terragov, +/obj/item/folder/terragov{ pixel_x = -16 }, /turf/open/floor/wood/ebony, @@ -3046,7 +3046,7 @@ /area/ship/crew/canteen) "DL" = ( /obj/effect/decal/cleanable/dirt/dust, -/obj/effect/turf_decal/solgov/wood/top_right, +/obj/effect/turf_decal/terragov/wood/top_right, /obj/effect/turf_decal/siding/wood{ dir = 8 }, @@ -3085,7 +3085,7 @@ /turf/open/floor/wood/ebony, /area/ship/crew/canteen) "Eh" = ( -/obj/item/bedsheet/double/solgov{ +/obj/item/bedsheet/double/terragov{ dir = 4 }, /obj/structure/bed/double{ @@ -3109,14 +3109,14 @@ /obj/machinery/cryopod{ dir = 4 }, -/obj/effect/turf_decal/corner/opaque/solgovblue{ +/obj/effect/turf_decal/corner/opaque/terragovblue{ dir = 9 }, /obj/machinery/light/small/directional/west, /obj/effect/turf_decal/corner/opaque/grey/half{ dir = 4 }, -/obj/structure/sign/poster/solgov/random{ +/obj/structure/sign/poster/terragov/random{ pixel_y = 30 }, /turf/open/floor/plasteel, @@ -3131,10 +3131,10 @@ /turf/open/floor/plasteel/white, /area/ship/hallway/port) "Eu" = ( -/obj/effect/turf_decal/trimline/opaque/solgovblue/filled/corner{ +/obj/effect/turf_decal/trimline/opaque/terragovblue/filled/corner{ dir = 1 }, -/obj/effect/turf_decal/trimline/opaque/solgovblue/filled/corner{ +/obj/effect/turf_decal/trimline/opaque/terragovblue/filled/corner{ dir = 4 }, /obj/structure/cable{ @@ -3234,7 +3234,7 @@ /area/ship/crew/office) "Fe" = ( /obj/machinery/iv_drip, -/obj/effect/turf_decal/trimline/opaque/solgovblue/filled/line, +/obj/effect/turf_decal/trimline/opaque/terragovblue/filled/line, /obj/effect/turf_decal/borderfloorwhite{ dir = 1 }, @@ -3245,10 +3245,10 @@ /turf/open/floor/plasteel/white, /area/ship/medical/surgery) "Fk" = ( -/obj/effect/turf_decal/trimline/opaque/solgovblue/filled/corner{ +/obj/effect/turf_decal/trimline/opaque/terragovblue/filled/corner{ dir = 4 }, -/obj/effect/turf_decal/trimline/opaque/solgovblue/filled/corner, +/obj/effect/turf_decal/trimline/opaque/terragovblue/filled/corner, /obj/structure/cable{ icon_state = "4-8" }, @@ -3386,12 +3386,12 @@ /turf/open/floor/wood/ebony, /area/ship/crew/crewtwo) "Ht" = ( -/obj/effect/turf_decal/trimline/opaque/solgovblue/filled/line{ +/obj/effect/turf_decal/trimline/opaque/terragovblue/filled/line{ dir = 8 }, /obj/structure/table, /obj/item/paper_bin, -/obj/item/pen/solgov, +/obj/item/pen/terragov, /turf/open/floor/plasteel/white, /area/ship/hallway/port) "HD" = ( @@ -3403,10 +3403,10 @@ /turf/open/floor/plasteel/white, /area/ship/hallway/port) "HK" = ( -/obj/effect/turf_decal/trimline/opaque/solgovblue/filled/corner{ +/obj/effect/turf_decal/trimline/opaque/terragovblue/filled/corner{ dir = 1 }, -/obj/effect/turf_decal/trimline/opaque/solgovblue/filled/corner{ +/obj/effect/turf_decal/trimline/opaque/terragovblue/filled/corner{ dir = 8 }, /obj/structure/cable{ @@ -3418,19 +3418,19 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 4 }, -/obj/structure/sign/poster/solgov/random{ +/obj/structure/sign/poster/terragov/random{ pixel_y = 30 }, /turf/open/floor/plasteel/white, /area/ship/hallway/port) "HM" = ( -/obj/effect/turf_decal/corner/opaque/solgovblue{ +/obj/effect/turf_decal/corner/opaque/terragovblue{ dir = 6 }, /obj/structure/table/wood, /obj/item/reagent_containers/glass/rag{ desc = "For cleaning up messes when you wake up."; - name = "solarian anti-vomit rag" + name = "terran anti-vomit rag" }, /obj/structure/noticeboard{ dir = 8; @@ -3504,7 +3504,7 @@ }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/door/airlock/solgov{ +/obj/machinery/door/airlock/terragov{ name = "Bridge" }, /turf/open/floor/plasteel/dark, @@ -3559,31 +3559,31 @@ /turf/open/floor/wood, /area/ship/crew/crewtwo) "IX" = ( -/obj/item/clothing/head/solgov/captain, -/obj/item/clothing/suit/armor/vest/bulletproof/solgov/captain, -/obj/item/clothing/under/solgov/formal/captain, +/obj/item/clothing/head/terragov/captain, +/obj/item/clothing/suit/armor/vest/bulletproof/terragov/captain, +/obj/item/clothing/under/terragov/formal/captain, /obj/item/clothing/shoes/laceup, /obj/item/clothing/gloves/combat, /obj/item/door_remote/captain, -/obj/item/storage/belt/sabre/solgov, -/obj/item/clothing/under/solgov, -/obj/item/clothing/under/solgov/dress, -/obj/item/clothing/under/solgov/formal, -/obj/item/folder/solgov, -/obj/item/folder/solgov, -/obj/item/folder/documents/solgov, -/obj/item/folder/documents/solgov, +/obj/item/storage/belt/sabre/terragov, +/obj/item/clothing/under/terragov, +/obj/item/clothing/under/terragov/dress, +/obj/item/clothing/under/terragov/formal, +/obj/item/folder/terragov, +/obj/item/folder/terragov, +/obj/item/folder/documents/terragov, +/obj/item/folder/documents/terragov, /obj/structure/closet/secure_closet{ icon_state = "cap"; name = "\proper captain's locker"; req_access_txt = "20" }, /obj/item/fish_feed, -/obj/item/pen/fountain/solgov, +/obj/item/pen/fountain/terragov, /obj/item/gun/ballistic/automatic/powered/gauss/modelh, /obj/item/ammo_box/magazine/modelh, /obj/item/ammo_box/magazine/modelh, -/obj/item/clothing/neck/cloak/solgovcap, +/obj/item/clothing/neck/cloak/terragovcap, /turf/open/floor/carpet/royalblue, /area/ship/crew) "IZ" = ( @@ -3606,7 +3606,7 @@ }, /obj/structure/table/wood, /obj/item/paper_bin, -/obj/item/pen/solgov, +/obj/item/pen/terragov, /obj/item/clipboard{ pixel_x = -15 }, @@ -3617,13 +3617,13 @@ /turf/open/floor/plating, /area/ship/external/dark) "JI" = ( -/obj/effect/turf_decal/trimline/opaque/solgovblue/filled/corner{ +/obj/effect/turf_decal/trimline/opaque/terragovblue/filled/corner{ dir = 1 }, -/obj/effect/turf_decal/trimline/opaque/solgovblue/filled/corner{ +/obj/effect/turf_decal/trimline/opaque/terragovblue/filled/corner{ dir = 4 }, -/obj/effect/turf_decal/trimline/opaque/solgovblue/filled/corner, +/obj/effect/turf_decal/trimline/opaque/terragovblue/filled/corner, /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ dir = 8 }, @@ -3660,17 +3660,17 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/door/airlock/solgov{ +/obj/machinery/door/airlock/terragov{ dir = 4; name = "Port Hallway" }, /turf/open/floor/plasteel/dark, /area/ship/hallway/port) "JU" = ( -/obj/effect/turf_decal/trimline/opaque/solgovblue/filled/corner{ +/obj/effect/turf_decal/trimline/opaque/terragovblue/filled/corner{ dir = 8 }, -/obj/effect/turf_decal/trimline/opaque/solgovblue/filled/corner, +/obj/effect/turf_decal/trimline/opaque/terragovblue/filled/corner, /obj/structure/cable{ icon_state = "1-2" }, @@ -3689,7 +3689,7 @@ /obj/machinery/door/firedoor/border_only{ dir = 1 }, -/obj/machinery/door/airlock/solgov{ +/obj/machinery/door/airlock/terragov{ name = "Bridge" }, /turf/open/floor/plasteel/dark, @@ -3728,7 +3728,7 @@ /turf/open/floor/plasteel/white, /area/ship/hallway/port) "Kn" = ( -/obj/effect/turf_decal/corner/opaque/solgovblue{ +/obj/effect/turf_decal/corner/opaque/terragovblue{ dir = 9 }, /obj/machinery/modular_computer/console/preset/id{ @@ -3752,7 +3752,7 @@ /turf/open/floor/plasteel/mono, /area/ship/cargo) "Kw" = ( -/obj/machinery/computer/operating/solgov, +/obj/machinery/computer/operating/terragov, /turf/open/floor/mineral/titanium/tiled/white, /area/ship/medical/surgery) "Kx" = ( @@ -3796,12 +3796,12 @@ /turf/open/floor/plasteel/tech/techmaint, /area/ship/maintenance/port) "KW" = ( -/obj/effect/turf_decal/corner/opaque/solgovblue{ +/obj/effect/turf_decal/corner/opaque/terragovblue{ dir = 6 }, /obj/structure/table/wood, /obj/item/paper_bin, -/obj/item/pen/solgov, +/obj/item/pen/terragov, /obj/machinery/light/small/directional/east, /obj/machinery/firealarm/directional/north, /turf/open/floor/plasteel, @@ -3810,7 +3810,7 @@ /obj/effect/turf_decal/borderfloorblack{ dir = 1 }, -/obj/effect/turf_decal/trimline/opaque/solgovblue/filled/line{ +/obj/effect/turf_decal/trimline/opaque/terragovblue/filled/line{ dir = 8 }, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ @@ -3833,7 +3833,7 @@ /turf/open/floor/wood, /area/ship/crew/canteen) "Lx" = ( -/obj/effect/turf_decal/solgov/all, +/obj/effect/turf_decal/terragov/all, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 4 }, @@ -3884,7 +3884,7 @@ /turf/open/floor/plasteel/patterned, /area/ship/cargo/office) "LK" = ( -/obj/effect/turf_decal/trimline/opaque/solgovblue/filled/line, +/obj/effect/turf_decal/trimline/opaque/terragovblue/filled/line, /obj/machinery/button/door{ dir = 4; id = "sg_par_chem"; @@ -3906,7 +3906,7 @@ /area/ship/medical) "LS" = ( /obj/structure/closet/secure_closet/personal/patient, -/obj/effect/turf_decal/trimline/opaque/solgovblue/filled/line, +/obj/effect/turf_decal/trimline/opaque/terragovblue/filled/line, /obj/effect/turf_decal/borderfloorwhite{ dir = 1 }, @@ -4020,20 +4020,20 @@ anchored = 1; name = "refrigerator" }, -/obj/structure/sign/poster/solgov/random{ +/obj/structure/sign/poster/terragov/random{ pixel_y = 30 }, /turf/open/floor/wood/ebony, /area/ship/crew/canteen) "MO" = ( -/obj/effect/turf_decal/trimline/opaque/solgovblue/filled/line{ +/obj/effect/turf_decal/trimline/opaque/terragovblue/filled/line{ dir = 9 }, /obj/effect/decal/cleanable/dirt, /turf/open/floor/plasteel/white, /area/ship/medical/surgery) "MP" = ( -/obj/effect/turf_decal/solgov/all/top, +/obj/effect/turf_decal/terragov/all/top, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 4 }, @@ -4072,7 +4072,7 @@ /turf/open/floor/plasteel/mono, /area/ship/cargo) "NB" = ( -/obj/effect/turf_decal/trimline/opaque/solgovblue/filled/line{ +/obj/effect/turf_decal/trimline/opaque/terragovblue/filled/line{ dir = 4 }, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ @@ -4102,17 +4102,17 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/door/airlock/solgov/glass{ +/obj/machinery/door/airlock/terragov/glass{ dir = 4; name = "Starboard Hallway" }, /turf/open/floor/plasteel/dark, /area/ship/cargo/office) "NX" = ( -/obj/effect/turf_decal/trimline/opaque/solgovblue/filled/corner{ +/obj/effect/turf_decal/trimline/opaque/terragovblue/filled/corner{ dir = 8 }, -/obj/effect/turf_decal/trimline/opaque/solgovblue/filled/corner, +/obj/effect/turf_decal/trimline/opaque/terragovblue/filled/corner, /obj/effect/turf_decal/borderfloorwhite{ dir = 1 }, @@ -4185,7 +4185,7 @@ pixel_y = 8; pixel_x = -12 }, -/obj/effect/turf_decal/trimline/opaque/solgovblue/filled/line, +/obj/effect/turf_decal/trimline/opaque/terragovblue/filled/line, /obj/effect/turf_decal/borderfloorwhite{ dir = 1 }, @@ -4240,7 +4240,7 @@ /area/ship/cargo/office) "OZ" = ( /obj/structure/closet/secure_closet/personal/patient, -/obj/effect/turf_decal/trimline/opaque/solgovblue/filled/line, +/obj/effect/turf_decal/trimline/opaque/terragovblue/filled/line, /obj/effect/turf_decal/borderfloorwhite{ dir = 1 }, @@ -4307,22 +4307,22 @@ /obj/structure/closet/secure_closet/wall/directional/east, /obj/item/clipboard, /obj/item/paper_bin/carbon, -/obj/item/clothing/accessory/waistcoat/solgov, -/obj/item/clothing/head/beret/solgov/plain, +/obj/item/clothing/accessory/waistcoat/terragov, +/obj/item/clothing/head/beret/terragov/plain, /obj/item/stack/sheet/mineral/wood/fifty, -/obj/item/clothing/under/solgov/formal, +/obj/item/clothing/under/terragov/formal, /obj/item/clothing/shoes/laceup, -/obj/item/folder/solgov, -/obj/item/clothing/neck/stripedsolgovscarf, +/obj/item/folder/terragov, +/obj/item/clothing/neck/stripedterragovscarf, /obj/item/clothing/gloves/color/black, -/obj/item/pen/solgov, +/obj/item/pen/terragov, /obj/item/clothing/glasses/regular, /obj/item/toy/plush/blahaj, /obj/item/lighter, -/obj/item/clothing/under/solgov/formal/skirt, -/obj/item/clothing/suit/solgov/suit, -/obj/item/folder/solgov, -/obj/item/clothing/head/fedora/solgov, +/obj/item/clothing/under/terragov/formal/skirt, +/obj/item/clothing/suit/terragov/suit, +/obj/item/folder/terragov, +/obj/item/clothing/head/fedora/terragov, /turf/open/floor/carpet/royalblue, /area/ship/crew/office) "Ps" = ( @@ -4417,7 +4417,7 @@ /obj/structure/cable{ icon_state = "2-4" }, -/obj/effect/turf_decal/solgov/all/top, +/obj/effect/turf_decal/terragov/all/top, /turf/open/floor/plasteel/patterned, /area/ship/cargo/office) "QB" = ( @@ -4443,20 +4443,20 @@ "QP" = ( /obj/structure/closet/cabinet, /obj/effect/decal/cleanable/dirt/dust, -/obj/item/clothing/neck/stripedsolgovscarf, -/obj/item/clothing/neck/stripedsolgovscarf, -/obj/item/clothing/under/solgov, -/obj/item/clothing/under/solgov, -/obj/item/clothing/under/solgov/dress, -/obj/item/clothing/under/solgov/formal, -/obj/item/clothing/under/solgov/formal, +/obj/item/clothing/neck/stripedterragovscarf, +/obj/item/clothing/neck/stripedterragovscarf, +/obj/item/clothing/under/terragov, +/obj/item/clothing/under/terragov, +/obj/item/clothing/under/terragov/dress, +/obj/item/clothing/under/terragov/formal, +/obj/item/clothing/under/terragov/formal, /obj/item/clothing/shoes/laceup, /obj/item/clothing/shoes/laceup, -/obj/item/clothing/head/beret/solgov/plain, -/obj/item/clothing/head/beret/solgov/plain, -/obj/item/clothing/suit/solgov, -/obj/item/clothing/suit/solgov/dress, -/obj/item/clothing/suit/solgov/jacket, +/obj/item/clothing/head/beret/terragov/plain, +/obj/item/clothing/head/beret/terragov/plain, +/obj/item/clothing/suit/terragov, +/obj/item/clothing/suit/terragov/dress, +/obj/item/clothing/suit/terragov/jacket, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ dir = 8 }, @@ -4467,10 +4467,10 @@ pixel_x = 20; pixel_y = 7 }, -/obj/item/clothing/under/solgov/formal/skirt, -/obj/item/clothing/suit/solgov/suit, -/obj/item/clothing/suit/hooded/wintercoat/solgov, -/obj/item/clothing/suit/hooded/wintercoat/solgov, +/obj/item/clothing/under/terragov/formal/skirt, +/obj/item/clothing/suit/terragov/suit, +/obj/item/clothing/suit/hooded/wintercoat/terragov, +/obj/item/clothing/suit/hooded/wintercoat/terragov, /obj/item/toy/plush/blahaj, /turf/open/floor/wood/ebony, /area/ship/crew/dorm) @@ -4499,7 +4499,7 @@ /obj/effect/decal/cleanable/dirt/dust, /obj/machinery/airalarm/directional/east, /obj/structure/chair/wood, -/obj/structure/sign/poster/solgov/random{ +/obj/structure/sign/poster/terragov/random{ pixel_y = 30 }, /turf/open/floor/wood/ebony, @@ -4523,7 +4523,7 @@ /turf/open/floor/plasteel/tech/techmaint, /area/ship/maintenance/starboard) "Rv" = ( -/obj/effect/turf_decal/trimline/opaque/solgovblue/filled/line{ +/obj/effect/turf_decal/trimline/opaque/terragovblue/filled/line{ dir = 5 }, /obj/effect/decal/cleanable/dirt, @@ -4541,14 +4541,14 @@ /turf/open/floor/plasteel/dark, /area/ship/maintenance/starboard) "RA" = ( -/obj/effect/turf_decal/trimline/opaque/solgovblue/filled/line{ +/obj/effect/turf_decal/trimline/opaque/terragovblue/filled/line{ dir = 8 }, /obj/item/kirbyplants/random, /turf/open/floor/plasteel/white, /area/ship/hallway/port) "RC" = ( -/obj/effect/turf_decal/trimline/opaque/solgovblue/filled/corner{ +/obj/effect/turf_decal/trimline/opaque/terragovblue/filled/corner{ dir = 4 }, /obj/structure/cable{ @@ -4721,7 +4721,7 @@ /turf/open/floor/wood/ebony, /area/ship/crew/canteen) "Tc" = ( -/obj/effect/turf_decal/trimline/opaque/solgovblue/filled/line{ +/obj/effect/turf_decal/trimline/opaque/terragovblue/filled/line{ dir = 4 }, /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ @@ -4839,7 +4839,7 @@ /turf/open/floor/plasteel/patterned, /area/ship/cargo/office) "Up" = ( -/obj/effect/turf_decal/trimline/opaque/solgovblue/filled/line{ +/obj/effect/turf_decal/trimline/opaque/terragovblue/filled/line{ dir = 8 }, /obj/machinery/holopad/emergency/medical, @@ -4856,7 +4856,7 @@ /obj/effect/turf_decal/borderfloorblack{ dir = 8 }, -/obj/effect/turf_decal/solgov/all, +/obj/effect/turf_decal/terragov/all, /obj/structure/sign/warning/incident{ pixel_x = -32 }, @@ -4872,14 +4872,14 @@ /obj/item/clothing/mask/breath/medical, /obj/item/clothing/mask/breath/medical, /obj/item/clothing/mask/breath/medical, -/obj/item/clothing/suit/hazardvest/solgov, -/obj/item/clothing/suit/hazardvest/solgov, -/obj/item/clothing/suit/hazardvest/solgov, +/obj/item/clothing/suit/hazardvest/terragov, +/obj/item/clothing/suit/hazardvest/terragov, +/obj/item/clothing/suit/hazardvest/terragov, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /turf/open/floor/plasteel/mono, /area/ship/cargo/office) "UE" = ( -/obj/effect/turf_decal/solgov/all/top_right, +/obj/effect/turf_decal/terragov/all/top_right, /obj/structure/cable{ icon_state = "1-2" }, @@ -4902,10 +4902,10 @@ pixel_y = 32; density = 0 }, -/obj/effect/turf_decal/trimline/opaque/solgovblue/filled/line{ +/obj/effect/turf_decal/trimline/opaque/terragovblue/filled/line{ dir = 1 }, -/obj/effect/turf_decal/trimline/opaque/solgovblue/filled/line, +/obj/effect/turf_decal/trimline/opaque/terragovblue/filled/line, /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 4 @@ -4931,10 +4931,10 @@ /turf/open/floor/carpet/royalblue, /area/ship/crew/office) "Vq" = ( -/obj/effect/turf_decal/corner/opaque/solgovblue{ +/obj/effect/turf_decal/corner/opaque/terragovblue{ dir = 9 }, -/obj/machinery/computer/helm/solgov{ +/obj/machinery/computer/helm/terragov{ dir = 8 }, /turf/open/floor/plasteel/white, @@ -4984,11 +4984,11 @@ dir = 1 }, /obj/effect/decal/cleanable/dirt/dust, -/obj/machinery/suit_storage_unit/solgov, +/obj/machinery/suit_storage_unit/terragov, /obj/structure/window/reinforced{ dir = 4 }, -/obj/structure/sign/poster/solgov/random{ +/obj/structure/sign/poster/terragov/random{ pixel_y = 30 }, /obj/effect/turf_decal/industrial/outline/yellow, @@ -5045,7 +5045,7 @@ /area/ship/crew/crewtwo) "Ws" = ( /obj/structure/table/wood, -/obj/item/desk_flag/solgov{ +/obj/item/desk_flag/terragov{ pixel_y = 3 }, /obj/structure/cable{ @@ -5095,7 +5095,7 @@ /turf/open/floor/wood, /area/ship/hallway/starboard) "WB" = ( -/obj/effect/turf_decal/trimline/opaque/solgovblue/filled/line{ +/obj/effect/turf_decal/trimline/opaque/terragovblue/filled/line{ dir = 1 }, /obj/effect/decal/cleanable/dirt, @@ -5107,14 +5107,14 @@ "WE" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, -/obj/structure/sign/poster/solgov/random{ +/obj/structure/sign/poster/terragov/random{ pixel_y = 30 }, /obj/effect/turf_decal/industrial/outline/yellow, /turf/open/floor/plasteel/mono, /area/ship/cargo/office) "WG" = ( -/obj/effect/turf_decal/trimline/opaque/solgovblue/filled/line{ +/obj/effect/turf_decal/trimline/opaque/terragovblue/filled/line{ dir = 1 }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ @@ -5123,7 +5123,7 @@ /turf/open/floor/plasteel/white, /area/ship/medical/surgery) "WH" = ( -/obj/effect/turf_decal/trimline/opaque/solgovblue/filled/line{ +/obj/effect/turf_decal/trimline/opaque/terragovblue/filled/line{ dir = 1 }, /obj/effect/decal/cleanable/dirt, @@ -5139,7 +5139,7 @@ /turf/open/floor/plasteel/white, /area/ship/hallway/port) "WL" = ( -/obj/effect/turf_decal/trimline/opaque/solgovblue/filled/corner{ +/obj/effect/turf_decal/trimline/opaque/terragovblue/filled/corner{ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, @@ -5252,7 +5252,7 @@ pixel_x = 6; pixel_y = 4 }, -/obj/item/pen/solgov{ +/obj/item/pen/terragov{ pixel_x = 6; pixel_y = 4 }, @@ -5385,7 +5385,7 @@ /area/ship/crew/office) "YK" = ( /obj/structure/table/wood, -/obj/item/desk_flag/solgov{ +/obj/item/desk_flag/terragov{ pixel_x = 8; pixel_y = -8 }, @@ -5456,7 +5456,7 @@ /turf/open/floor/plating, /area/ship/bridge) "Zt" = ( -/obj/effect/turf_decal/trimline/opaque/solgovblue/filled/line{ +/obj/effect/turf_decal/trimline/opaque/terragovblue/filled/line{ dir = 8 }, /obj/machinery/light/directional/west, @@ -5498,7 +5498,7 @@ /area/ship/cargo/office) "ZY" = ( /obj/machinery/vending/medical, -/obj/effect/turf_decal/trimline/opaque/solgovblue/filled/line{ +/obj/effect/turf_decal/trimline/opaque/terragovblue/filled/line{ dir = 4 }, /obj/machinery/light/directional/east, diff --git a/_maps/shuttles/syndicate/syndicate_litieguai.dmm b/_maps/shuttles/syndicate/syndicate_litieguai.dmm index a7e6bb4dbcf5..9241070aabf2 100644 --- a/_maps/shuttles/syndicate/syndicate_litieguai.dmm +++ b/_maps/shuttles/syndicate/syndicate_litieguai.dmm @@ -1491,7 +1491,7 @@ /obj/item/healthanalyzer/advanced, /obj/item/hypospray/mkii/CMO, /obj/structure/closet/secure_closet/wall/directional/west{ - icon_state = "solgov_wall"; + icon_state = "terragov_wall"; name = "chief medical officer's closet"; req_access_txt = "40" }, @@ -2845,7 +2845,7 @@ /obj/item/megaphone/command, /obj/item/clothing/glasses/sunglasses, /obj/structure/closet/secure_closet/wall/directional/west{ - icon_state = "solgov_wall"; + icon_state = "terragov_wall"; name = "captain's closet"; req_access_txt = "20" }, diff --git a/_maps/shuttles/syndicate/syndicate_twinkleshine.dmm b/_maps/shuttles/syndicate/syndicate_twinkleshine.dmm index 6d0b0b423e61..541503960a29 100644 --- a/_maps/shuttles/syndicate/syndicate_twinkleshine.dmm +++ b/_maps/shuttles/syndicate/syndicate_twinkleshine.dmm @@ -7331,7 +7331,7 @@ keyslot = null }, /obj/item/gun/ballistic/automatic/powered/gauss/modelh, -/obj/item/storage/belt/sabre/solgov, +/obj/item/storage/belt/sabre/terragov, /obj/item/ammo_box/magazine/modelh, /obj/item/ammo_box/magazine/modelh, /turf/open/floor/mineral/plastitanium, @@ -8924,7 +8924,7 @@ /obj/effect/turf_decal/industrial/warning{ dir = 6 }, -/obj/structure/sign/poster/solgov/suns{ +/obj/structure/sign/poster/terragov/suns{ pixel_x = 32 }, /obj/structure/crate_shelf, diff --git a/code/__DEFINES/access.dm b/code/__DEFINES/access.dm index 8cb220243b68..e79a69ae8d1c 100644 --- a/code/__DEFINES/access.dm +++ b/code/__DEFINES/access.dm @@ -85,7 +85,7 @@ /// Cloning room and clone pod ejection #define ACCESS_CLONING 68 /// SGR Office -#define ACCESS_SOLGOV 90 //Let's give em plenty of room, now +#define ACCESS_TERRAGOV 90 //Let's give em plenty of room, now //WS End diff --git a/code/__DEFINES/factions.dm b/code/__DEFINES/factions.dm index 5eb0209dda4c..ef6289b4040e 100644 --- a/code/__DEFINES/factions.dm +++ b/code/__DEFINES/factions.dm @@ -8,7 +8,7 @@ #define FACTION_PLAYER_NANOTRASEN "playerNanotrasen" #define FACTION_PLAYER_FRONTIERSMEN "playerFrontiersmen" #define FACTION_PLAYER_MINUTEMAN "playerMinuteman" -#define FACTION_PLAYER_SOLGOV "playerSolgov" +#define FACTION_PLAYER_TERRAGOV "playerTerragov" #define FACTION_PLAYER_INTEQ "playerInteq" #define FACTION_PLAYER_ROUMAIN "playerRoumain" #define FACTION_PLAYER_GEZENA "playerGezena" diff --git a/code/__DEFINES/jobs.dm b/code/__DEFINES/jobs.dm index 21eb9b40e066..4ca8cff87d80 100644 --- a/code/__DEFINES/jobs.dm +++ b/code/__DEFINES/jobs.dm @@ -10,7 +10,7 @@ #define JOB_DISPLAY_ORDER_CAPTAIN 0 #define JOB_DISPLAY_ORDER_HEAD_OF_PERSONNEL 1 -#define JOB_DISPLAY_ORDER_SOLGOV 2 +#define JOB_DISPLAY_ORDER_TERRAGOV 2 #define JOB_DISPLAY_ORDER_HEAD_OF_SECURITY 10 #define JOB_DISPLAY_ORDER_WARDEN 11 diff --git a/code/__DEFINES/radio.dm b/code/__DEFINES/radio.dm index 96e7ab6e0578..5c1a861e23f7 100644 --- a/code/__DEFINES/radio.dm +++ b/code/__DEFINES/radio.dm @@ -23,9 +23,9 @@ #define RADIO_TOKEN_CENTCOM ":e" //WS Begin - SGR, Overmaps -#define RADIO_CHANNEL_SOLGOV "SolGov" -#define RADIO_KEY_SOLGOV "s" -#define RADIO_TOKEN_SOLGOV ":s" +#define RADIO_CHANNEL_TERRAGOV "TerraGov" +#define RADIO_KEY_TERRAGOV "s" +#define RADIO_TOKEN_TERRAGOV ":s" #define RADIO_CHANNEL_NANOTRASEN "Nanotrasen" #define RADIO_KEY_NANOTRASEN "n" @@ -61,7 +61,7 @@ #define FREQ_CTF_RED 1215 // CTF red team comms frequency, red #define FREQ_CTF_BLUE 1217 // CTF blue team comms frequency, blue #define FREQ_CENTCOM 1337 // CentCom comms frequency, gray -#define FREQ_SOLGOV 1345 // SolGov comms frequency, dark blue WS ADDITION +#define FREQ_TERRAGOV 1345 // TerraGov comms frequency, dark blue WS ADDITION #define FREQ_INTEQ 1347 // Inteq comms frequency, light brown #define FREQ_PGF 1349 // PGF comms frequency, lime green #define FREQ_NANOTRASEN 1351 // Nanotrasen comms frequency, plum diff --git a/code/__HELPERS/names.dm b/code/__HELPERS/names.dm index 7054c051f707..5c67b081b79e 100644 --- a/code/__HELPERS/names.dm +++ b/code/__HELPERS/names.dm @@ -237,7 +237,7 @@ GLOBAL_DATUM(syndicate_code_response_regex, /regex) #define FACTION_NGR "New Gorlex Republic" #define FACTION_CYBERSUN "CyberSun" #define FACTION_SUNS "Student-Union of Naturalistic Sciences" -#define FACTION_SOLGOV "SolGov" +#define FACTION_TERRAGOV "TerraGov" #define FACTION_SRM "Saint-Roumain Militia" #define FACTION_INTEQ "Inteq Risk Management Group" #define FACTION_CLIP "CLIP Minutemen" @@ -252,7 +252,7 @@ GLOBAL_DATUM(syndicate_code_response_regex, /regex) #define PREFIX_NGR list("NGRV") #define PREFIX_CYBERSUN list("CSSV") #define PREFIX_SUNS list("SUNS") -#define PREFIX_SOLGOV list("SCSV") +#define PREFIX_TERRAGOV list("TGSV") #define PREFIX_SRM list("SRSV") #define PREFIX_INTEQ list("IRMV") #define PREFIX_CLIP list("CMSV", "CMGSV") @@ -269,7 +269,7 @@ GLOBAL_LIST_INIT(ship_faction_to_prefixes, list( FACTION_NGR = PREFIX_NGR, FACTION_CYBERSUN = PREFIX_CYBERSUN, FACTION_SUNS = PREFIX_SUNS, - FACTION_SOLGOV = PREFIX_SOLGOV, + FACTION_TERRAGOV = PREFIX_TERRAGOV, FACTION_SRM = PREFIX_SRM, FACTION_INTEQ = PREFIX_INTEQ, FACTION_CLIP = PREFIX_CLIP, diff --git a/code/_globalvars/lists/flavor_misc.dm b/code/_globalvars/lists/flavor_misc.dm index f9edbc500142..81f4d3178ad7 100644 --- a/code/_globalvars/lists/flavor_misc.dm +++ b/code/_globalvars/lists/flavor_misc.dm @@ -199,7 +199,7 @@ GLOBAL_LIST_INIT(uplink_spawn_loc_list, list(UPLINK_PDA, UPLINK_RADIO, UPLINK_PE #define PREF_CIG_CARP "Carp Classic Cigarettes" #define PREF_CIG_MIDORI "Midori Taboko Rollies" #define PREF_CIGAR "Premium Cigars" -#define PREF_CIGAR_SOLAR "Solarian Cigars" +#define PREF_CIGAR_SOLAR "Terran Cigars" #define PREF_CIGAR_COHIBA "Cohiba Cigars" #define PREF_VAPE "Vape Pen" #define PREF_PIPE "Fancy Pipe" diff --git a/code/controllers/subsystem/blackbox.dm b/code/controllers/subsystem/blackbox.dm index 2ac0b06b74d6..93700a41f4dc 100644 --- a/code/controllers/subsystem/blackbox.dm +++ b/code/controllers/subsystem/blackbox.dm @@ -146,8 +146,8 @@ SUBSYSTEM_DEF(blackbox) record_feedback("tally", "radio_usage", 1, "pgf") if(FREQ_CENTCOM) record_feedback("tally", "radio_usage", 1, "centcom") - if(FREQ_SOLGOV) //WS Edit - SolGov Rep - record_feedback("tally", "radio_usage", 1, "solgov") //WS Edit - SolGov Rep + if(FREQ_TERRAGOV) //WS/C Edit - TerraGov Rep + record_feedback("tally", "radio_usage", 1, "terragov") //WS/C Edit - TerraGov Rep if(FREQ_AI_PRIVATE) record_feedback("tally", "radio_usage", 1, "ai private") if(FREQ_CTF_RED) diff --git a/code/datums/ert.dm b/code/datums/ert.dm index 0c5227e41074..80179d524d0d 100644 --- a/code/datums/ert.dm +++ b/code/datums/ert.dm @@ -120,26 +120,26 @@ polldesc = "an Inteq emergency team" ert_template = /datum/map_template/shuttle/subshuttles/anvil -// SolGov +// terragov -/datum/ert/solgov +/datum/ert/terragov teamsize = 4 opendoors = FALSE - leader_role = /datum/antagonist/ert/solgov - roles = list(/datum/antagonist/ert/solgov) - mission = "Intervene in Solarian interests." - rename_team = "SolGov Sonnensoldner Team" - polldesc = "a SolGov mercenary team" + leader_role = /datum/antagonist/ert/terragov + roles = list(/datum/antagonist/ert/terragov) + mission = "Intervene in Terran interests." + rename_team = "TerraGov Sonnensoldner Team" + polldesc = "a TerraGov mercenary team" -/datum/ert/solgov/inspector +/datum/ert/terragov/inspector teamsize = 1 - leader_role = /datum/antagonist/ert/official/solgov - roles = list(/datum/antagonist/ert/official/solgov) - rename_team = "SolGov Inspector" - polldesc = "a solarian inspector" + leader_role = /datum/antagonist/ert/official/terragov + roles = list(/datum/antagonist/ert/official/terragov) + rename_team = "TerraHov Inspector" + polldesc = "a Terran inspector" spawn_at_outpost = FALSE -/datum/ert/solgov/inspector/New() +/datum/ert/terragov/inspector/New() mission = "Conduct a routine review on [station_name()]'s vessels." // CLIP diff --git a/code/datums/ruins/lavaland.dm b/code/datums/ruins/lavaland.dm index 816ffd685c14..95444348b5e3 100644 --- a/code/datums/ruins/lavaland.dm +++ b/code/datums/ruins/lavaland.dm @@ -5,9 +5,9 @@ ruin_type = RUINTYPE_LAVA /datum/map_template/ruin/lavaland/biodome/winter - name = "Solarian Winter Biodome" + name = "Terran Winter Biodome" id = "biodome-winter" - description = "A Solarian frontier research facility created by the Pionierskompanien \ + description = "A Terran frontier research facility created by the Pionierskompanien \ This one seems to simulate the wintery climate of the northern provinces, including a sauna!" suffix = "lavaland_surface_biodome_winter.dmm" diff --git a/code/game/MapData/shuttles/srm_elder.dm b/code/game/MapData/shuttles/srm_elder.dm index 97805731ec2f..a1ea075e682e 100644 --- a/code/game/MapData/shuttles/srm_elder.dm +++ b/code/game/MapData/shuttles/srm_elder.dm @@ -126,9 +126,9 @@ Notes on the Saint-Roumain Militia:
The SRM originated on the planet Illestren, a planet colonized early in the - expansionist period of space exploration by solgov colonists. Formed by large + expansionist period of space exploration by TerraGov colonists. Formed by large group of hunters who banded together to form a sort of citizen's militia. - When these Solgov colonists came to Illestren, the brought with them the + When these TerraGov colonists came to Illestren, the brought with them the tales of the Ashen Hunter, a figure who came to be venerated by this militia. The Ashen Huntsman is a religious figure venerated by the SRM, said to be able to survive any conditions on their own, and fell any man, creature, or beast diff --git a/code/game/area/ship_areas.dm b/code/game/area/ship_areas.dm index 5f4e75b71d4d..297b1a3de64a 100644 --- a/code/game/area/ship_areas.dm +++ b/code/game/area/ship_areas.dm @@ -210,8 +210,8 @@ NOTE: there are two lists of areas in the end of this file: centcom and station icon_state = "law" sound_environment = SOUND_AREA_SMALL_SOFTFLOOR -/area/ship/crew/solgov - name = "SolGov Consulate" +/area/ship/crew/terragov + name = "TerraGov Consulate" icon_state = "solgov" sound_environment = SOUND_AREA_SMALL_SOFTFLOOR diff --git a/code/game/communications.dm b/code/game/communications.dm index 94afdbf364f5..aa50014b8bc9 100644 --- a/code/game/communications.dm +++ b/code/game/communications.dm @@ -94,7 +94,7 @@ GLOBAL_LIST_INIT(radiochannels, list( RADIO_CHANNEL_COMMON = FREQ_COMMON, RADIO_CHANNEL_COMMAND = FREQ_COMMAND, RADIO_CHANNEL_CENTCOM = FREQ_CENTCOM, - RADIO_CHANNEL_SOLGOV = FREQ_SOLGOV, //WS Edit - SolGov Rep + RADIO_CHANNEL_TERRAGOV = FREQ_TERRAGOV, //WS Edit - TERRAGOV Rep RADIO_CHANNEL_WIDEBAND = FREQ_WIDEBAND, //WS Edit - Overmap RADIO_CHANNEL_SYNDICATE = FREQ_SYNDICATE, RADIO_CHANNEL_NANOTRASEN = FREQ_NANOTRASEN, @@ -111,8 +111,8 @@ GLOBAL_LIST_INIT(reverseradiochannels, list( "[FREQ_COMMON]" = RADIO_CHANNEL_COMMON, "[FREQ_COMMAND]" = RADIO_CHANNEL_COMMAND, "[FREQ_CENTCOM]" = RADIO_CHANNEL_CENTCOM, - "[FREQ_SOLGOV]" = RADIO_CHANNEL_SOLGOV, //WS Edit - SolGov Rep - "[FREQ_WIDEBAND]" = RADIO_CHANNEL_WIDEBAND, //WS Edit - SolGov Rep + "[FREQ_TERRAGOV]" = RADIO_CHANNEL_TERRAGOV, //WS Edit - TERRAGOV Rep + "[FREQ_WIDEBAND]" = RADIO_CHANNEL_WIDEBAND, //WS Edit - TERRAGOV Rep "[FREQ_SYNDICATE]" = RADIO_CHANNEL_SYNDICATE, "[FREQ_NANOTRASEN]" = RADIO_CHANNEL_NANOTRASEN, "[FREQ_MINUTEMEN]" = RADIO_CHANNEL_MINUTEMEN, diff --git a/code/game/gamemodes/changeling/changeling.dm b/code/game/gamemodes/changeling/changeling.dm index adb9a25b9832..fdf4784a6c6d 100644 --- a/code/game/gamemodes/changeling/changeling.dm +++ b/code/game/gamemodes/changeling/changeling.dm @@ -12,7 +12,7 @@ GLOBAL_VAR(changeling_team_objective_type) //If this is not null, we hand our th antag_flag = ROLE_CHANGELING false_report_weight = 10 restricted_jobs = list("AI", "Cyborg") - protected_jobs = list("Security Officer", "Warden", "Detective", "Head of Security", "Captain", "Head of Personnel", "Brig Physician", "SolGov Representative", "Prisoner") //WS edit - Brig Physicians, SolGov Rep + protected_jobs = list("Security Officer", "Warden", "Detective", "Head of Security", "Captain", "Head of Personnel", "Brig Physician", "TerraGov Representative", "Prisoner") required_players = 15 required_enemies = 1 recommended_enemies = 4 diff --git a/code/game/gamemodes/cult/cult.dm b/code/game/gamemodes/cult/cult.dm index f7ce7b036eb5..67e722dae5b9 100644 --- a/code/game/gamemodes/cult/cult.dm +++ b/code/game/gamemodes/cult/cult.dm @@ -34,7 +34,7 @@ report_type = "cult" antag_flag = ROLE_CULTIST false_report_weight = 10 - restricted_jobs = list("Chaplain","AI", "Cyborg", "Security Officer", "Warden", "Detective", "Head of Security", "Captain", "Head of Personnel", "Brig Physician", "SolGov Representative", "Prisoner") //WS edit - Brig Physicians, SolGov Rep + restricted_jobs = list("Chaplain","AI", "Cyborg", "Security Officer", "Warden", "Detective", "Head of Security", "Captain", "Head of Personnel", "Brig Physician", "TerraGov Representative", "Prisoner") protected_jobs = list() required_players = 29 required_enemies = 4 diff --git a/code/game/gamemodes/dynamic/dynamic_rulesets_latejoin.dm b/code/game/gamemodes/dynamic/dynamic_rulesets_latejoin.dm index 228df9bd35f1..f3931cff9f97 100644 --- a/code/game/gamemodes/dynamic/dynamic_rulesets_latejoin.dm +++ b/code/game/gamemodes/dynamic/dynamic_rulesets_latejoin.dm @@ -59,7 +59,7 @@ name = "Syndicate Infiltrator" antag_datum = /datum/antagonist/traitor antag_flag = ROLE_TRAITOR - protected_roles = list("Security Officer", "Warden", "Head of Personnel", "Detective", "Head of Security", "Captain", "Prisoner", "Research Director", "Chief Engineer", "Chief Medical Officer", "SolGov Representative") + protected_roles = list("Security Officer", "Warden", "Head of Personnel", "Detective", "Head of Security", "Captain", "Prisoner", "Research Director", "Chief Engineer", "Chief Medical Officer", "TerraGov Representative") restricted_roles = list("AI","Cyborg") required_candidates = 1 weight = 7 diff --git a/code/game/gamemodes/dynamic/dynamic_rulesets_midround.dm b/code/game/gamemodes/dynamic/dynamic_rulesets_midround.dm index 613182cea211..ae7ffb3cbbb5 100644 --- a/code/game/gamemodes/dynamic/dynamic_rulesets_midround.dm +++ b/code/game/gamemodes/dynamic/dynamic_rulesets_midround.dm @@ -164,7 +164,7 @@ name = "Syndicate Sleeper Agent" antag_datum = /datum/antagonist/traitor antag_flag = ROLE_TRAITOR - protected_roles = list("Prisoner", "Security Officer", "Warden", "Detective", "Head of Security", "Captain", "Prisoner", "Chief Engineer", "Research Director", "Chief Medical Officer", "Head of Personnel", "SolGov Representative") + protected_roles = list("Prisoner", "Security Officer", "Warden", "Detective", "Head of Security", "Captain", "Prisoner", "Chief Engineer", "Research Director", "Chief Medical Officer", "Head of Personnel", "TerraGov Representative") restricted_roles = list("Cyborg", "AI", "Positronic Brain") required_candidates = 1 weight = 7 @@ -219,7 +219,7 @@ name = "Malfunctioning AI" antag_datum = /datum/antagonist/traitor antag_flag = ROLE_MALF - enemy_roles = list("Security Officer", "Warden", "Detective", "Head of Security", "Captain", "Scientist", "Chemist", "Research Director", "Chief Engineer", "SolGov Representative") + enemy_roles = list("Security Officer", "Warden", "Detective", "Head of Security", "Captain", "Scientist", "Chemist", "Research Director", "Chief Engineer", "TerraGov Representative") exclusive_roles = list("AI") required_enemies = list(4,4,4,4,4,4,2,2,2,0) required_candidates = 1 diff --git a/code/game/gamemodes/dynamic/dynamic_rulesets_roundstart.dm b/code/game/gamemodes/dynamic/dynamic_rulesets_roundstart.dm index 8c8fe19d0a97..6f8f9523fe2d 100644 --- a/code/game/gamemodes/dynamic/dynamic_rulesets_roundstart.dm +++ b/code/game/gamemodes/dynamic/dynamic_rulesets_roundstart.dm @@ -11,7 +11,7 @@ antag_flag = ROLE_TRAITOR antag_datum = /datum/antagonist/traitor/ minimum_required_age = 0 - protected_roles = list("Prisoner", "Security Officer", "Warden", "Detective", "Head of Security", "Captain", "Research Director", "Chief Medical Officer", "Chief Engineer", "Head of Personnel", "SolGov Representative") + protected_roles = list("Prisoner", "Security Officer", "Warden", "Detective", "Head of Security", "Captain", "Research Director", "Chief Medical Officer", "Chief Engineer", "Head of Personnel", "TerraGov Representative") restricted_roles = list("Cyborg") required_candidates = 1 weight = 5 @@ -52,7 +52,7 @@ name = "Blood Brothers" antag_flag = ROLE_BROTHER antag_datum = /datum/antagonist/brother/ - protected_roles = list("Prisoner", "Security Officer", "Warden", "Detective", "Head of Security", "Captain", "Head of Personnel", "Chief Engineer", "Chief Medical Officer", "Research Director", "SolGov Representative") + protected_roles = list("Prisoner", "Security Officer", "Warden", "Detective", "Head of Security", "Captain", "Head of Personnel", "Chief Engineer", "Chief Medical Officer", "Research Director", "TerraGov Representative") restricted_roles = list("Cyborg", "AI") required_candidates = 2 weight = 4 @@ -103,7 +103,7 @@ name = "Changelings" antag_flag = ROLE_CHANGELING antag_datum = /datum/antagonist/changeling - protected_roles = list("Prisoner", "Security Officer", "Warden", "Detective", "Head of Security", "Captain", "Head of Personnel", "Research Director", "Chief Medical Officer", "Chief Engineer", "SolGov Representative") + protected_roles = list("Prisoner", "Security Officer", "Warden", "Detective", "Head of Security", "Captain", "Head of Personnel", "Research Director", "Chief Medical Officer", "Chief Engineer", "TerraGov Representative") restricted_roles = list("AI", "Cyborg") required_candidates = 1 weight = 3 @@ -202,7 +202,7 @@ antag_flag = ROLE_CULTIST antag_datum = /datum/antagonist/cult minimum_required_age = 14 - restricted_roles = list("AI", "Cyborg", "Prisoner", "Security Officer", "Warden", "Detective", "Head of Security", "Captain", "Chaplain", "Head of Personnel", "Research Director", "Chief Medical Officer", "Chief Engineer", "SolGov Representative") + restricted_roles = list("AI", "Cyborg", "Prisoner", "Security Officer", "Warden", "Detective", "Head of Security", "Captain", "Chaplain", "Head of Personnel", "Research Director", "Chief Medical Officer", "Chief Engineer", "TerraGov Representative") required_candidates = 2 weight = 3 cost = 35 diff --git a/code/game/gamemodes/traitor/traitor.dm b/code/game/gamemodes/traitor/traitor.dm index 1aaf853fc000..ca9b166498ce 100644 --- a/code/game/gamemodes/traitor/traitor.dm +++ b/code/game/gamemodes/traitor/traitor.dm @@ -12,7 +12,7 @@ antag_flag = ROLE_TRAITOR false_report_weight = 20 //Reports of traitors are pretty common. restricted_jobs = list("Cyborg")//They are part of the AI if he is traitor so are they, they use to get double chances - protected_jobs = list("Security Officer", "Warden", "Detective", "Head of Security", "Captain", "Head of Personnel", "Brig Physician", "Prisoner", "SolGov Representative") //WS edit - Brig Physicians, SolGov Rep + protected_jobs = list("Security Officer", "Warden", "Detective", "Head of Security", "Captain", "Head of Personnel", "Brig Physician", "Prisoner", "TerraGov Representative" required_players = 0 required_enemies = 1 recommended_enemies = 4 diff --git a/code/game/machinery/computer/Operating.dm b/code/game/machinery/computer/Operating.dm index d014b33010d7..da82b0905b79 100644 --- a/code/game/machinery/computer/Operating.dm +++ b/code/game/machinery/computer/Operating.dm @@ -19,10 +19,10 @@ icon_state = "computer-retro" deconpath = /obj/structure/frame/computer/retro -/obj/machinery/computer/operating/solgov +/obj/machinery/computer/operating/terragov icon = 'icons/obj/machines/retro_computer.dmi' icon_state = "computer-solgov" - deconpath = /obj/structure/frame/computer/solgov + deconpath = /obj/structure/frame/computer/terragov /obj/machinery/computer/operating/Initialize() . = ..() diff --git a/code/game/machinery/computer/atmos_alert.dm b/code/game/machinery/computer/atmos_alert.dm index 7a64743c900b..87a885a392c5 100644 --- a/code/game/machinery/computer/atmos_alert.dm +++ b/code/game/machinery/computer/atmos_alert.dm @@ -15,10 +15,10 @@ icon_state = "computer-retro" deconpath = /obj/structure/frame/computer/retro -/obj/machinery/computer/atmos_alert/solgov +/obj/machinery/computer/atmos_alert/terragov icon = 'icons/obj/machines/retro_computer.dmi' icon_state = "computer-solgov" - deconpath = /obj/structure/frame/computer/solgov + deconpath = /obj/structure/frame/computer/terragov /obj/machinery/computer/atmos_alert/Initialize() . = ..() diff --git a/code/game/machinery/computer/atmos_control.dm b/code/game/machinery/computer/atmos_control.dm index 81d2860473c7..3b8abe985183 100644 --- a/code/game/machinery/computer/atmos_control.dm +++ b/code/game/machinery/computer/atmos_control.dm @@ -199,10 +199,10 @@ GLOBAL_LIST_EMPTY(atmos_air_controllers) icon_state = "computer-retro" deconpath = /obj/structure/frame/computer/retro -/obj/machinery/computer/atmos_control/tank/oxygen_tank/solgov +/obj/machinery/computer/atmos_control/tank/oxygen_tank/terragov icon = 'icons/obj/machines/retro_computer.dmi' icon_state = "computer-solgov" - deconpath = /obj/structure/frame/computer/solgov + deconpath = /obj/structure/frame/computer/terragov /obj/machinery/computer/atmos_control/tank/toxin_tank name = "Plasma Supply Control" @@ -216,10 +216,10 @@ GLOBAL_LIST_EMPTY(atmos_air_controllers) icon_state = "computer-retro" deconpath = /obj/structure/frame/computer/retro -/obj/machinery/computer/atmos_control/tank/toxin_tank/solgov +/obj/machinery/computer/atmos_control/tank/toxin_tank/terragov icon = 'icons/obj/machines/retro_computer.dmi' icon_state = "computer-solgov" - deconpath = /obj/structure/frame/computer/solgov + deconpath = /obj/structure/frame/computer/terragov /obj/machinery/computer/atmos_control/tank/air_tank name = "Mixed Air Supply Control" @@ -233,10 +233,10 @@ GLOBAL_LIST_EMPTY(atmos_air_controllers) icon_state = "computer-retro" deconpath = /obj/structure/frame/computer/retro -/obj/machinery/computer/atmos_control/tank/air_tank/solgov +/obj/machinery/computer/atmos_control/tank/air_tank/terragov icon = 'icons/obj/machines/retro_computer.dmi' icon_state = "computer-solgov" - deconpath = /obj/structure/frame/computer/solgov + deconpath = /obj/structure/frame/computer/terragov /obj/machinery/computer/atmos_control/tank/mix_tank name = "Gas Mix Tank Control" @@ -250,10 +250,10 @@ GLOBAL_LIST_EMPTY(atmos_air_controllers) icon_state = "computer-retro" deconpath = /obj/structure/frame/computer/retro -/obj/machinery/computer/atmos_control/tank/mix_tank/solgov +/obj/machinery/computer/atmos_control/tank/mix_tank/terragov icon = 'icons/obj/machines/retro_computer.dmi' icon_state = "computer-solgov" - deconpath = /obj/structure/frame/computer/solgov + deconpath = /obj/structure/frame/computer/terragov /obj/machinery/computer/atmos_control/tank/nitrous_tank name = "Nitrous Oxide Supply Control" @@ -267,10 +267,10 @@ GLOBAL_LIST_EMPTY(atmos_air_controllers) icon_state = "computer-retro" deconpath = /obj/structure/frame/computer/retro -/obj/machinery/computer/atmos_control/tank/nitrous_tank/solgov +/obj/machinery/computer/atmos_control/tank/nitrous_tank/terragov icon = 'icons/obj/machines/retro_computer.dmi' icon_state = "computer-solgov" - deconpath = /obj/structure/frame/computer/solgov + deconpath = /obj/structure/frame/computer/terragov /obj/machinery/computer/atmos_control/tank/nitrogen_tank name = "Nitrogen Supply Control" @@ -284,10 +284,10 @@ GLOBAL_LIST_EMPTY(atmos_air_controllers) icon_state = "computer-retro" deconpath = /obj/structure/frame/computer/retro -/obj/machinery/computer/atmos_control/tank/nitrogen_tank/solgov +/obj/machinery/computer/atmos_control/tank/nitrogen_tank/terragov icon = 'icons/obj/machines/retro_computer.dmi' icon_state = "computer-solgov" - deconpath = /obj/structure/frame/computer/solgov + deconpath = /obj/structure/frame/computer/terragov /obj/machinery/computer/atmos_control/tank/carbon_tank name = "Carbon Dioxide Supply Control" @@ -301,10 +301,10 @@ GLOBAL_LIST_EMPTY(atmos_air_controllers) icon_state = "computer-retro" deconpath = /obj/structure/frame/computer/retro -/obj/machinery/computer/atmos_control/tank/carbon_tank/solgov +/obj/machinery/computer/atmos_control/tank/carbon_tank/terragov icon = 'icons/obj/machines/retro_computer.dmi' icon_state = "computer-solgov" - deconpath = /obj/structure/frame/computer/solgov + deconpath = /obj/structure/frame/computer/terragov // This hacky madness is the evidence of the fact that a lot of machines were never meant to be constructable, im so sorry you had to see this /obj/machinery/computer/atmos_control/tank/proc/reconnect(mob/user) diff --git a/code/game/machinery/computer/buildandrepair.dm b/code/game/machinery/computer/buildandrepair.dm index e4e98f28b21e..726332b2a185 100644 --- a/code/game/machinery/computer/buildandrepair.dm +++ b/code/game/machinery/computer/buildandrepair.dm @@ -170,7 +170,7 @@ built_icon_state = "computer-retro" deconpath = /obj/structure/frame/computer/retro -/obj/structure/frame/computer/solgov +/obj/structure/frame/computer/terragov name = "wooden computer frame" icon_state = "console_frame-solgov" base_icon_state = "solgov" diff --git a/code/game/machinery/computer/camera.dm b/code/game/machinery/computer/camera.dm index 50ed20ae619e..b50b1b13a6c6 100644 --- a/code/game/machinery/computer/camera.dm +++ b/code/game/machinery/computer/camera.dm @@ -22,10 +22,10 @@ icon_state = "computer-retro" deconpath = /obj/structure/frame/computer/retro -/obj/machinery/computer/security/solgov +/obj/machinery/computer/security/terragov icon = 'icons/obj/machines/retro_computer.dmi' icon_state = "computer-solgov" - deconpath = /obj/structure/frame/computer/solgov + deconpath = /obj/structure/frame/computer/terragov /obj/machinery/computer/security/Initialize() . = ..() diff --git a/code/game/machinery/computer/card.dm b/code/game/machinery/computer/card.dm index 63f9284c28ae..9799ddd359ba 100644 --- a/code/game/machinery/computer/card.dm +++ b/code/game/machinery/computer/card.dm @@ -41,7 +41,7 @@ GLOBAL_VAR_INIT(time_last_changed_position, 0) "Research Director", "Chief Medical Officer", "Brig Physician", - "SolGov Representative", //WS Edit - SolGov Rep + "TerraGov Representative", "Prisoner") //The scaling factor of max total positions in relation to the total amount of people on board the station in % @@ -61,10 +61,10 @@ GLOBAL_VAR_INIT(time_last_changed_position, 0) icon_state = "computer-retro" deconpath = /obj/structure/frame/computer/retro -/obj/machinery/computer/card/solgov +/obj/machinery/computer/card/terragov icon = 'icons/obj/machines/retro_computer.dmi' icon_state = "computer-solgov" - deconpath = /obj/structure/frame/computer/solgov + deconpath = /obj/structure/frame/computer/terragov /obj/machinery/computer/card/proc/get_jobs() return get_all_jobs() diff --git a/code/game/machinery/computer/crew.dm b/code/game/machinery/computer/crew.dm index c1a1171e57cc..9ea7c706f9ab 100644 --- a/code/game/machinery/computer/crew.dm +++ b/code/game/machinery/computer/crew.dm @@ -17,10 +17,10 @@ icon_state = "computer-retro" deconpath = /obj/structure/frame/computer/retro -/obj/machinery/computer/crew/solgov +/obj/machinery/computer/crew/terragov icon = 'icons/obj/machines/retro_computer.dmi' icon_state = "computer-solgov" - deconpath = /obj/structure/frame/computer/solgov + deconpath = /obj/structure/frame/computer/terragov /obj/machinery/computer/crew/syndie icon_keyboard = "syndie_key" diff --git a/code/game/machinery/computer/station_alert.dm b/code/game/machinery/computer/station_alert.dm index f6ef2e6c31e0..17c8d50d3728 100644 --- a/code/game/machinery/computer/station_alert.dm +++ b/code/game/machinery/computer/station_alert.dm @@ -13,10 +13,10 @@ icon_state = "computer-retro" deconpath = /obj/structure/frame/computer/retro -/obj/machinery/computer/station_alert/solgov +/obj/machinery/computer/station_alert/terragov icon = 'icons/obj/machines/retro_computer.dmi' icon_state = "computer-solgov" - deconpath = /obj/structure/frame/computer/solgov + deconpath = /obj/structure/frame/computer/terragov /obj/machinery/computer/station_alert/Initialize() . = ..() diff --git a/code/game/machinery/doors/airlock_types.dm b/code/game/machinery/doors/airlock_types.dm index 492ce30f6ac4..faee4614a88f 100644 --- a/code/game/machinery/doors/airlock_types.dm +++ b/code/game/machinery/doors/airlock_types.dm @@ -7,7 +7,7 @@ assemblytype = /obj/structure/door_assembly/door_assembly_com normal_integrity = 450 -/obj/machinery/door/airlock/solgov +/obj/machinery/door/airlock/terragov icon = 'icons/obj/doors/airlocks/station/solgov.dmi' assemblytype = /obj/structure/door_assembly/door_assembly_sgv normal_integrity = 450 @@ -88,7 +88,7 @@ glass = TRUE normal_integrity = 400 -/obj/machinery/door/airlock/solgov/glass +/obj/machinery/door/airlock/terragov/glass opacity = FALSE glass = TRUE normal_integrity = 400 diff --git a/code/game/machinery/porta_turret/portable_turret.dm b/code/game/machinery/porta_turret/portable_turret.dm index 5891898ef6dc..a8859065b87f 100644 --- a/code/game/machinery/porta_turret/portable_turret.dm +++ b/code/game/machinery/porta_turret/portable_turret.dm @@ -836,8 +836,8 @@ DEFINE_BITFIELD(turret_flags, list( stun_projectile_sound = 'sound/weapons/gun/smg/shot.ogg' desc = "A ballistic machine gun auto-turret." -/obj/machinery/porta_turret/ship/solgov - faction = list("playerSolgov", "turret") +/obj/machinery/porta_turret/ship/terragov + faction = list("playerTerragov", "turret") /obj/machinery/porta_turret/ship/syndicate faction = list(FACTION_PLAYER_SYNDICATE, "turret") diff --git a/code/game/machinery/suit_storage_unit.dm b/code/game/machinery/suit_storage_unit.dm index 107c5656c034..703d18d102f2 100644 --- a/code/game/machinery/suit_storage_unit.dm +++ b/code/game/machinery/suit_storage_unit.dm @@ -153,10 +153,10 @@ //SHIPTEST suits below -/obj/machinery/suit_storage_unit/solgov - name = "solgov suit storage unit" - suit_type = /obj/item/clothing/suit/space/solgov - helmet_type = /obj/item/clothing/head/helmet/space/solgov +/obj/machinery/suit_storage_unit/terragov + name = "terragov suit storage unit" + suit_type = /obj/item/clothing/suit/space/terragov + helmet_type = /obj/item/clothing/head/helmet/space/terragov mask_type = /obj/item/clothing/mask/breath storage_type = /obj/item/tank/internals/emergency_oxygen/engi diff --git a/code/game/machinery/telecomms/computers/logbrowser.dm b/code/game/machinery/telecomms/computers/logbrowser.dm index 8939e36f34ad..aa34a89bbdbb 100644 --- a/code/game/machinery/telecomms/computers/logbrowser.dm +++ b/code/game/machinery/telecomms/computers/logbrowser.dm @@ -22,10 +22,10 @@ icon_state = "computer-retro" deconpath = /obj/structure/frame/computer/retro -/obj/machinery/computer/telecomms/server/solgov +/obj/machinery/computer/telecomms/server/terragov icon = 'icons/obj/machines/retro_computer.dmi' icon_state = "computer-solgov" - deconpath = /obj/structure/frame/computer/solgov + deconpath = /obj/structure/frame/computer/terragov /obj/machinery/computer/telecomms/server/ui_interact(mob/user) . = ..() diff --git a/code/game/machinery/telecomms/computers/telemonitor.dm b/code/game/machinery/telecomms/computers/telemonitor.dm index 25d5622419ce..5ce4f238b7d6 100644 --- a/code/game/machinery/telecomms/computers/telemonitor.dm +++ b/code/game/machinery/telecomms/computers/telemonitor.dm @@ -24,10 +24,10 @@ icon_state = "computer-retro" deconpath = /obj/structure/frame/computer/retro -/obj/machinery/computer/telecomms/monitor/solgov +/obj/machinery/computer/telecomms/monitor/terragov icon = 'icons/obj/machines/retro_computer.dmi' icon_state = "computer-solgov" - deconpath = /obj/structure/frame/computer/solgov + deconpath = /obj/structure/frame/computer/terragov /obj/machinery/computer/telecomms/monitor/ui_interact(mob/user) . = ..() diff --git a/code/game/machinery/telecomms/machines/bus.dm b/code/game/machinery/telecomms/machines/bus.dm index 6428456d1614..409817c9c3b8 100644 --- a/code/game/machinery/telecomms/machines/bus.dm +++ b/code/game/machinery/telecomms/machines/bus.dm @@ -84,10 +84,10 @@ autolinkers = list("processor6", "pirate", "receiverB", "messaging") /obj/machinery/telecomms/bus/preset_seven - id = "Solgov Communications Bus" + id = "TerraGov Communications Bus" network = "tcommsat" - freq_listening = list(FREQ_SOLGOV, FREQ_COMMON) - autolinkers = list("processor7", "solgov", "receiverA", "messaging") + freq_listening = list(FREQ_TERRAGOV, FREQ_COMMON) + autolinkers = list("processor7", "terragov", "receiverA", "messaging") /obj/machinery/telecomms/bus/preset_seven/Initialize() . = ..() diff --git a/code/game/machinery/telecomms/machines/processor.dm b/code/game/machinery/telecomms/machines/processor.dm index 6c13ee65d510..a283bf7d7977 100644 --- a/code/game/machinery/telecomms/machines/processor.dm +++ b/code/game/machinery/telecomms/machines/processor.dm @@ -64,7 +64,7 @@ autolinkers = list("processor6") /obj/machinery/telecomms/processor/preset_seven - id = "Solgov Communications Processor" + id = "TerraGov Communications Processor" network = "tcommsat" autolinkers = list("processor7") diff --git a/code/game/machinery/telecomms/machines/receiver.dm b/code/game/machinery/telecomms/machines/receiver.dm index 33b0bc7028ec..8b58a0c8cba2 100644 --- a/code/game/machinery/telecomms/machines/receiver.dm +++ b/code/game/machinery/telecomms/machines/receiver.dm @@ -48,7 +48,7 @@ id = "Receiver A" network = "tcommsat" autolinkers = list("receiverA") // link to relay - freq_listening = list(FREQ_SOLGOV, FREQ_NANOTRASEN, FREQ_MINUTEMEN, FREQ_COMMAND, FREQ_COMMON) + freq_listening = list(FREQ_TERRAGOV, FREQ_NANOTRASEN, FREQ_MINUTEMEN, FREQ_COMMAND, FREQ_COMMON) //--PRESET RIGHT--// diff --git a/code/game/machinery/telecomms/machines/relay.dm b/code/game/machinery/telecomms/machines/relay.dm index 763c42dbbf9c..b0a45765addd 100644 --- a/code/game/machinery/telecomms/machines/relay.dm +++ b/code/game/machinery/telecomms/machines/relay.dm @@ -88,10 +88,10 @@ id = "CLIP Relay" network = "clip_commnet" -/obj/machinery/telecomms/relay/preset/solgov - freq_listening = list(FREQ_COMMAND, FREQ_SOLGOV) - id = "SolGov Relay" - network = "solgov_commnet" +/obj/machinery/telecomms/relay/preset/terragov + freq_listening = list(FREQ_COMMAND, FREQ_TERRAGOV) + id = "TerraGov Relay" + network = "terragov_commnet" /obj/machinery/telecomms/relay/preset/syndicate freq_listening = list(FREQ_COMMAND, FREQ_SYNDICATE) diff --git a/code/game/machinery/telecomms/machines/server.dm b/code/game/machinery/telecomms/machines/server.dm index 5607b6bbec8c..504329179c52 100644 --- a/code/game/machinery/telecomms/machines/server.dm +++ b/code/game/machinery/telecomms/machines/server.dm @@ -78,10 +78,10 @@ freq_listening = list(FREQ_NANOTRASEN, FREQ_COMMON) autolinkers = list("nanotrasen", "broadcasterA") -/obj/machinery/telecomms/server/presets/solgov - id = "SolGov Server" - freq_listening = list(FREQ_SOLGOV, FREQ_COMMON) - autolinkers = list("solgov", "broadcasterA") +/obj/machinery/telecomms/server/presets/terragov + id = "TerraGov Server" + freq_listening = list(FREQ_TERRAGOV, FREQ_COMMON) + autolinkers = list("terragov", "broadcasterA") /obj/machinery/telecomms/server/presets/syndicate id = "Syndicate Server" diff --git a/code/game/mecha/mech_bay.dm b/code/game/mecha/mech_bay.dm index ca24240b4f2e..02ae7f9e093e 100644 --- a/code/game/mecha/mech_bay.dm +++ b/code/game/mecha/mech_bay.dm @@ -94,10 +94,10 @@ icon_state = "computer-retro" deconpath = /obj/structure/frame/computer/retro -/obj/machinery/computer/mech_bay_power_console/solgov +/obj/machinery/computer/mech_bay_power_console/terragov icon = 'icons/obj/machines/retro_computer.dmi' icon_state = "computer-solgov" - deconpath = /obj/structure/frame/computer/solgov + deconpath = /obj/structure/frame/computer/terragov /obj/machinery/computer/mech_bay_power_console/ui_interact(mob/user, datum/tgui/ui) ui = SStgui.try_update_ui(user, src, ui) diff --git a/code/game/objects/effects/contraband.dm b/code/game/objects/effects/contraband.dm index ccfd89363482..bb2f4d741866 100644 --- a/code/game/objects/effects/contraband.dm +++ b/code/game/objects/effects/contraband.dm @@ -50,9 +50,9 @@ poster_type = /obj/structure/sign/poster/retro/random icon_state = "rolled_legit" -/obj/item/poster/random_solgov - name = "random solarian poster" - poster_type = /obj/structure/sign/poster/solgov/random +/obj/item/poster/random_terragov + name = "random terran poster" + poster_type = /obj/structure/sign/poster/terragov/random icon_state = "rolled_solgov" /obj/item/poster/random_minutemen @@ -237,9 +237,9 @@ icon_state = "random_contraband" never_random = TRUE random_basetype = /obj/structure/sign/poster/contraband - random_type = POSTER_ADD_FROM_LIST // what this does is add the SUNS poster, which would usually only be in the solgov poster pool to the contraband pool. + random_type = POSTER_ADD_FROM_LIST // what this does is add the SUNS poster, which would usually only be in the terragov poster pool to the contraband pool. random_pool = list( - /obj/structure/sign/poster/solgov/suns, + /obj/structure/sign/poster/terragov/suns, /obj/structure/sign/poster/official/ion_carbine, /obj/structure/sign/poster/official/mini_energy_gun, ) @@ -792,7 +792,7 @@ /obj/structure/sign/poster/retro/radio name = "Radio" - desc = "A poster advertising one of Nanotrasen's earliest products, a radio. One of its main selling points was a integrated OS and two way automatic translation for Solarian Common, and Kalixcian Common, which made it a smash hit. This thing is ancient." + desc = "A poster advertising one of Nanotrasen's earliest products, a radio. One of its main selling points was a integrated OS and two way automatic translation for Terran Common, and Kalixcian Common, which made it a smash hit. This thing is ancient." icon_state = "poster-radio70_retro" //Safety moth posters, credit to AspEv for the art which the below posters are based on and to Ayy-Robotics for the sprites. @@ -852,70 +852,70 @@ desc = "A decommisioned poster that uses Safety Pill(TM?) to promote less-than-legal chemicals. This is one of the reasons Nanotrasen stopped outsourcing their posters. It's partially signed by 'AspEv'." icon_state = "poster_moth_pill" -//Solgov poster pool. expect a focus on solarian based products and places. Expect these on solgov ships -/obj/structure/sign/poster/solgov - poster_item_name = "solarian poster" - poster_item_desc = "A solarian based poster, made with natural paper! It comes with adhesive backing, for easy pinning to any vertical surface." +//terragov poster pool. expect a focus on terran based products and places. Expect these on terragov ships +/obj/structure/sign/poster/terragov + poster_item_name = "terran poster" + poster_item_desc = "A terran based poster, made with natural paper! It comes with adhesive backing, for easy pinning to any vertical surface." poster_item_icon_state = "rolled_legit" -/obj/structure/sign/poster/solgov/random - name = "random solarian poster" +/obj/structure/sign/poster/terragov/random + name = "random terran poster" icon_state = "random_solgov" never_random = TRUE - random_basetype = /obj/structure/sign/poster/solgov + random_basetype = /obj/structure/sign/poster/terragov random_type = POSTER_SUBTYPES -/obj/structure/sign/poster/solgov/solgov_logo - name = "Solgov" - desc = "The seal of The Most Serene Solar and Intersolar Confederation, or more boringly known as SolGov. \"The State is a sapling: Waters of change may drown it, and rays of fear may wither it, but well-tended it will one day bear fruit.\"" - icon_state = "poster-solgov" +/obj/structure/sign/poster/terragov/terragov_logo + name = "Terragov" + desc = "The coat of arms of TerraGov and the Terran Regency, which the latter still exists to this day." + icon_state = "poster-terragov" -/obj/structure/sign/poster/solgov/terra +/obj/structure/sign/poster/terragov/terra name = "Terra" desc = "Terra, or Earth as it's called by inhabitants, the third planet in the Sol system. Home to the only life as humans knew it, until contact with the outside universe. This poster in particular is trying to attract tourists to Terra, listing attractions like the Grand Orrery and Neue Waldstätte." icon_state = "poster-solgov-terra" -/obj/structure/sign/poster/solgov/ares - name = "Ares" - desc = "Ares, fourth planet in the Sol system. While evidence suggests that Aphrodite and Ares may have once had life, Terra was the only one that kept it. This poster in particular is trying to attract tourists to Ares, listing attractions like skiing resorts and ancient robot exhibits." +/obj/structure/sign/poster/terragov/ares + name = "Mars" + desc = "Mars, the fourth planet in the Sol system. While evidence suggests that Venus and Mars may have once had life, Terra was the only one that kept it. This poster in particular is trying to attract tourists to Mars, listing attractions like skiing resorts and ancient robot exhibits." icon_state = "poster-solgov-ares" -/obj/structure/sign/poster/solgov/luna +/obj/structure/sign/poster/terragov/luna name = "Luna" - desc = "Luna, the only moon of Terra. Culturally significant to the Solarians historically as a symbol of time, harvest, and new frontiers. This poster in particular is trying to attract tourists to Luna, listing attractions like the massive spaceport and white flags scattered across the surface, a relic from ages past." + desc = "Luna, the only moon of Terra. Culturally significant to the Terrans historically as a symbol of time, harvest, and new frontiers. This poster in particular is trying to attract tourists to Luna, listing attractions like the massive spaceport and white flags scattered across the surface, a relic from ages past." icon_state = "poster-solgov-luna" -/obj/structure/sign/poster/solgov/kepler +/obj/structure/sign/poster/terragov/kepler name = "Kepler 453b" desc = "Kepler 453b, the only colonized planet in the Kepler 453 system. This poster in particular is trying to attract tourists to the planet, listing attractions like the salty desert and dual suns. \"Where your shadow always has company!\"" icon_state = "poster-solgov-kepler" -/obj/structure/sign/poster/solgov/skiing +/obj/structure/sign/poster/terragov/skiing name = "Lo-Fly Skiing Advert" desc = "An advertisement for some low-gravity skiing resort on Ares. \"Popular with SUNS groups!\"" icon_state = "poster-solgov-loskiing" -/obj/structure/sign/poster/solgov/recyle +/obj/structure/sign/poster/terragov/recyle name = "Recycle" desc = "A popular poster reminding the reader to recycle to keep the planet and ships clean!" icon_state = "poster-solgov-recycle" -/obj/structure/sign/poster/solgov/terragov +/obj/structure/sign/poster/terragov/terragov name = "TerraGov" desc = "The coat of arms of TerraGov and the Terran Regency, which the latter still exists to this day." icon_state = "poster-terragov" -/obj/structure/sign/poster/solgov/paperwork +/obj/structure/sign/poster/terragov/paperwork name = "Paperwork" desc = "A poster reminding civil servants that it is their duty to keep detailed records." icon_state = "poster-solgov-paperwork" -/obj/structure/sign/poster/solgov/sonnensoldner +/obj/structure/sign/poster/terragov/sonnensoldner name = "The Sonnensöldners" desc = "The symbol of the many Solar Companies." icon_state = "poster-solgov-sonnensoldner" -/obj/structure/sign/poster/solgov/alexandria +/obj/structure/sign/poster/terragov/alexandria name = "Archive of Alexandria" desc = "In the great desert \n\ Lies a great library \n\ @@ -924,19 +924,19 @@ With the greatest works of all humankind." icon_state = "poster-solgov-alexandria" -/obj/structure/sign/poster/solgov/solgov_enlist //much better. +/obj/structure/sign/poster/terragov/terragov_enlist //much better. name = "Enlist" - desc = "Enlist to be a part of the SolGov Exploration Forces!" - icon_state = "poster_solgov_enlist_legit" + desc = "Enlist to be a part of the TerraGov Exploration Forces!" + icon_state = "poster_terragov_enlist_legit" -/obj/structure/sign/poster/solgov/nanomichi_ad +/obj/structure/sign/poster/terragov/nanomichi_ad name = "Nanomichi Ad" - desc = " A poster advertising a early post-NOF solarian computer. Severely outdated, but the advert is now a pretty nifty decoration." + desc = " A poster advertising a early post-NOF terran computer. Severely outdated, but the advert is now a pretty nifty decoration." icon_state = "poster_nanomichi" -/obj/structure/sign/poster/solgov/suns +/obj/structure/sign/poster/terragov/suns name = "Student Union of Natural Sciences" - desc = "SUNS, best known for it's diverse variety of top students from various solarian universities, dealing with internal fighting via dueling with swords, and being sued by Nanotrasen for trademark infrigement on their old name \"NSV.\"" + desc = "SUNS, best known for it's diverse variety of top students from various terran universities, dealing with internal fighting via dueling with swords, and being sued by Nanotrasen for trademark infrigement on their old name \"NSV.\"" icon_state = "poster-solgov_suns" //CLIP poster pool. This is quite limited, so don't use more than 3 random ones at once. Expect to see these on CLIP ships. @@ -1004,7 +1004,7 @@ /obj/structure/sign/poster/contraband/stechkin, /obj/structure/sign/poster/contraband/c20r, /obj/structure/sign/poster/contraband/syndiemoth, - /obj/structure/sign/poster/solgov/suns, + /obj/structure/sign/poster/terragov/suns, /obj/structure/sign/poster/contraband/bulldog, /obj/structure/sign/poster/contraband/m90, /obj/structure/sign/poster/contraband/cybersun, diff --git a/code/game/objects/effects/decals/turfdecal/flooring_decals.dm b/code/game/objects/effects/decals/turfdecal/flooring_decals.dm index fc23ed89c278..2ec6fd0f858b 100644 --- a/code/game/objects/effects/decals/turfdecal/flooring_decals.dm +++ b/code/game/objects/effects/decals/turfdecal/flooring_decals.dm @@ -140,8 +140,8 @@ TURF_DECAL_COLOR_HELPER(opaque/bottlegreen, "#57967f", 255) TURF_DECAL_COLOR_HELPER(opaque/ntblue, "#283674", 255) TURF_DECAL_COLOR_HELPER(opaque/nsorange, "#FF6600", 255) TURF_DECAL_COLOR_HELPER(opaque/vired, "#d40000", 255) -TURF_DECAL_COLOR_HELPER(opaque/solgovblue, "#2d2a4e", 255) -TURF_DECAL_COLOR_HELPER(opaque/solgovgold, "#eeac2e", 255) +TURF_DECAL_COLOR_HELPER(opaque/terragovblue, "#2d2a4e", 255) +TURF_DECAL_COLOR_HELPER(opaque/terragovgold, "#eeac2e", 255) TURF_DECAL_COLOR_HELPER(opaque/syndiered, "#730622", 255) TURF_DECAL_COLOR_HELPER(opaque/inteqbrown, "#4b2a18", 255) @@ -167,8 +167,8 @@ TURF_DECAL_COLOR_HELPER(transparent/bottlegreen, "#57967f", 140) TURF_DECAL_COLOR_HELPER(transparent/ntblue, "#283674", 140) TURF_DECAL_COLOR_HELPER(transparent/nsorange, "#FF6600", 140) TURF_DECAL_COLOR_HELPER(opaque/vired, "#d40000", 140) -TURF_DECAL_COLOR_HELPER(transparent/solgovblue, "#2d2a4e", 140) -TURF_DECAL_COLOR_HELPER(transparent/solgovgold, "#eeac2e", 140) +TURF_DECAL_COLOR_HELPER(transparent/terragovblue, "#2d2a4e", 140) +TURF_DECAL_COLOR_HELPER(transparent/terragovgold, "#eeac2e", 140) TURF_DECAL_COLOR_HELPER(transparent/syndiered, "#730622", 140) TURF_DECAL_COLOR_HELPER(transparent/inteqbrown, "#4b2a18", 140) @@ -718,86 +718,86 @@ TURF_DECAL_COLOR_HELPER(transparent/inteqbrown, "#4b2a18", 140) /obj/effect/turf_decal/rechargefloor icon_state = "recharge_floor" -/obj/effect/turf_decal/solgov +/obj/effect/turf_decal/terragov icon = 'icons/obj/solgov_floor.dmi' icon_state = "top-left" -/obj/effect/turf_decal/solgov/top +/obj/effect/turf_decal/terragov/top icon_state = "top-center" -/obj/effect/turf_decal/solgov/top_right +/obj/effect/turf_decal/terragov/top_right icon_state = "top-right" -/obj/effect/turf_decal/solgov/center_left +/obj/effect/turf_decal/terragov/center_left icon_state = "center-left" -/obj/effect/turf_decal/solgov/center +/obj/effect/turf_decal/terragov/center icon_state = "center" -/obj/effect/turf_decal/solgov/center_right +/obj/effect/turf_decal/terragov/center_right icon_state = "center-right" -/obj/effect/turf_decal/solgov/bottom_left +/obj/effect/turf_decal/terragov/bottom_left icon_state = "bottom-left" -/obj/effect/turf_decal/solgov/bottom_center +/obj/effect/turf_decal/terragov/bottom_center icon_state = "bottom-center" -/obj/effect/turf_decal/solgov/bottom_right +/obj/effect/turf_decal/terragov/bottom_right icon_state = "bottom-right" -/obj/effect/turf_decal/solgov/wood +/obj/effect/turf_decal/terragov/wood icon_state = "top-left-wood" -/obj/effect/turf_decal/solgov/wood/top +/obj/effect/turf_decal/terragov/wood/top icon_state = "top-center-wood" -/obj/effect/turf_decal/solgov/wood/top_right +/obj/effect/turf_decal/terragov/wood/top_right icon_state = "top-right-wood" -/obj/effect/turf_decal/solgov/wood/center_left +/obj/effect/turf_decal/terragov/wood/center_left icon_state = "center-left-wood" -/obj/effect/turf_decal/solgov/wood/center +/obj/effect/turf_decal/terragov/wood/center icon_state = "center-wood" -/obj/effect/turf_decal/solgov/wood/center_right +/obj/effect/turf_decal/terragov/wood/center_right icon_state = "center-right-wood" -/obj/effect/turf_decal/solgov/wood/bottom_left +/obj/effect/turf_decal/terragov/wood/bottom_left icon_state = "bottom-left-wood" -/obj/effect/turf_decal/solgov/wood/bottom_center +/obj/effect/turf_decal/terragov/wood/bottom_center icon_state = "bottom-center-wood" -/obj/effect/turf_decal/solgov/wood/bottom_right +/obj/effect/turf_decal/terragov/wood/bottom_right icon_state = "bottom-right-wood" -/obj/effect/turf_decal/solgov/all +/obj/effect/turf_decal/terragov/all icon_state = "top-left-all" -/obj/effect/turf_decal/solgov/all/top +/obj/effect/turf_decal/terragov/all/top icon_state = "top-center-all" -/obj/effect/turf_decal/solgov/all/top_right +/obj/effect/turf_decal/terragov/all/top_right icon_state = "top-right-all" -/obj/effect/turf_decal/solgov/all/center_left +/obj/effect/turf_decal/terragov/all/center_left icon_state = "center-left-all" -/obj/effect/turf_decal/solgov/all/center +/obj/effect/turf_decal/terragov/all/center icon_state = "center-all" -/obj/effect/turf_decal/solgov/all/center_right +/obj/effect/turf_decal/terragov/all/center_right icon_state = "center-right-all" -/obj/effect/turf_decal/solgov/all/bottom_left +/obj/effect/turf_decal/terragov/all/bottom_left icon_state = "bottom-left-all" -/obj/effect/turf_decal/solgov/all/bottom_center +/obj/effect/turf_decal/terragov/all/bottom_center icon_state = "bottom-center-all" -/obj/effect/turf_decal/solgov/all/bottom_right +/obj/effect/turf_decal/terragov/all/bottom_right icon_state = "bottom-right-all" // suns diff --git a/code/game/objects/items/cards_ids.dm b/code/game/objects/items/cards_ids.dm index ae7aa27cdc3f..e995f672db13 100644 --- a/code/game/objects/items/cards_ids.dm +++ b/code/game/objects/items/cards_ids.dm @@ -592,16 +592,16 @@ update_label() /obj/item/card/id/away/deep_storage //deepstorage.dmm space ruin name = "bunker access ID" -/obj/item/card/id/solgov - name = "\improper SolGov keycard" - desc = "A SolGov keycard with no proper access to speak of." +/obj/item/card/id/terragov + name = "\improper TerraGov keycard" + desc = "A TerraGov keycard with no proper access to speak of." assignment = "Officer" icon_state = "solgov" uses_overlays = FALSE -/obj/item/card/id/solgov/commander - name = "\improper SolGov commander keycard" - desc = "A SolGov keycard with no proper access to speak of. This one indicates a Commander." +/obj/item/card/id/terragov/commander + name = "\improper TerraGov commander keycard" + desc = "A TerraGov keycard with no proper access to speak of. This one indicates a Commander." assignment = "Commander" /obj/item/card/id/suns diff --git a/code/game/objects/items/desk_flags.dm b/code/game/objects/items/desk_flags.dm index c1af9cfe6c3f..bbb4e307b552 100644 --- a/code/game/objects/items/desk_flags.dm +++ b/code/game/objects/items/desk_flags.dm @@ -16,8 +16,8 @@ desc = "The blue, cyan, and white flag of the transylvanian society of vampires." icon_state = "trans" -/obj/item/desk_flag/solgov - name = "solgov desk flag" +/obj/item/desk_flag/terragov + name = "terragov desk flag" desc = "The blue and gold flag of the Sol Government." icon_state = "solgov" diff --git a/code/game/objects/items/devices/PDA/PDA_types.dm b/code/game/objects/items/devices/PDA/PDA_types.dm index c8a918732a9d..ad7b4178fb05 100644 --- a/code/game/objects/items/devices/PDA/PDA_types.dm +++ b/code/game/objects/items/devices/PDA/PDA_types.dm @@ -229,10 +229,10 @@ default_cartridge = /obj/item/cartridge/medical icon_state = "pda-genetics" -/obj/item/pda/solgov - name = "solgov officer PDA" +/obj/item/pda/terragov + name = "terragov officer PDA" default_cartridge = /obj/item/cartridge/lawyer - inserted_item = /obj/item/pen/fountain/solgov + inserted_item = /obj/item/pen/fountain/terragov icon_state = "pda-solgov" /obj/item/pda/brig_phys diff --git a/code/game/objects/items/devices/radio/encryptionkey.dm b/code/game/objects/items/devices/radio/encryptionkey.dm index f8ced22c54be..d528447d0e0f 100644 --- a/code/game/objects/items/devices/radio/encryptionkey.dm +++ b/code/game/objects/items/devices/radio/encryptionkey.dm @@ -82,11 +82,11 @@ /obj/item/encryptionkey/secbot channels = list(RADIO_CHANNEL_AI_PRIVATE = 1) -/obj/item/encryptionkey/solgov - name = "\improper SolGov encryption key" +/obj/item/encryptionkey/terragov + name = "\improper TerraGov encryption key" icon = 'icons/obj/radio.dmi' icon_state = "solgov_cypherkey" - channels = list(RADIO_CHANNEL_SOLGOV = 1) + channels = list(RADIO_CHANNEL_TERRAGOV = 1) // /obj/item/encryptionkey/suns // name = "\improper SUNS encryption key" diff --git a/code/game/objects/items/devices/radio/headset.dm b/code/game/objects/items/devices/radio/headset.dm index 0f0081c90454..66473ae51ad3 100644 --- a/code/game/objects/items/devices/radio/headset.dm +++ b/code/game/objects/items/devices/radio/headset.dm @@ -3,7 +3,7 @@ GLOBAL_LIST_INIT(channel_tokens, list( RADIO_CHANNEL_COMMON = RADIO_KEY_COMMON, RADIO_CHANNEL_COMMAND = RADIO_TOKEN_COMMAND, RADIO_CHANNEL_CENTCOM = RADIO_TOKEN_CENTCOM, - RADIO_CHANNEL_SOLGOV = RADIO_TOKEN_SOLGOV, //WS Edit - SolGov Rep + RADIO_CHANNEL_TERRAGOV = RADIO_TOKEN_TERRAGOV, RADIO_CHANNEL_SYNDICATE = RADIO_TOKEN_SYNDICATE, RADIO_CHANNEL_NANOTRASEN = RADIO_TOKEN_NANOTRASEN, //Shiptest edits - faction channels, removed department channels RADIO_CHANNEL_MINUTEMEN = RADIO_TOKEN_MINUTEMEN, @@ -273,31 +273,31 @@ GLOBAL_LIST_INIT(channel_tokens, list( keyslot2 = new /obj/item/encryptionkey/heads/captain command = TRUE -//solgov -/obj/item/radio/headset/solgov - name = "\improper SolGov headset" +//terragov +/obj/item/radio/headset/terragov + name = "\improper TerraGov headset" desc = "Worn by bureaucrats and, occasionally, Sonnensoldneren." icon_state = "solgov_headset" - keyslot = new /obj/item/encryptionkey/solgov + keyslot = new /obj/item/encryptionkey/terragov -/obj/item/radio/headset/solgov/captain - name = "\improper SolGov official radio headset" - desc = "Worn by various officials and leaders from SolGov. Fancy hat not included." +/obj/item/radio/headset/terragov/captain + name = "\improper TerraGov official radio headset" + desc = "Worn by various officials and leaders from TerraGov. Fancy hat not included." keyslot2 = new /obj/item/encryptionkey/heads/captain command = TRUE -/obj/item/radio/headset/solgov/alt - name = "\improper SolGov bowman headset" - desc = "Worn by bureaucrats and, occasionally, Sonnensoldneren. Protects ears from flashbangs." +/obj/item/radio/headset/terragov/alt + name = "\improper TerraGov bowman headset" + desc = "Worn by bureaucrats. Protects ears from flashbangs." icon_state = "solgov_headset_alt" -/obj/item/radio/headset/solgov/alt/captain - name = "\improper SolGov official bowman headset" - desc = "Worn by various officials and leaders from SolGov. Fancy hat not included. Protects ears from flashbangs." +/obj/item/radio/headset/terragov/alt/captain + name = "\improper TerraGov official bowman headset" + desc = "Worn by various officials and leaders from TerraGov. Fancy hat not included. Protects ears from flashbangs." keyslot2 = new /obj/item/encryptionkey/heads/captain command = TRUE -/obj/item/radio/headset/solgov/alt/ComponentInitialize() +/obj/item/radio/headset/terragov/alt/ComponentInitialize() . = ..() AddComponent(/datum/component/wearertargeting/earprotection, list(ITEM_SLOT_EARS)) diff --git a/code/game/objects/items/devices/radio/radio.dm b/code/game/objects/items/devices/radio/radio.dm index cc528f103fe2..8940e563252b 100644 --- a/code/game/objects/items/devices/radio/radio.dm +++ b/code/game/objects/items/devices/radio/radio.dm @@ -254,7 +254,7 @@ var/datum/signal/subspace/vocal/signal = new(src, freq, speaker, language, message, spans, message_mods) // Independent radios, on the CentCom frequency, reach all independent radios - if (independent && (freq == FREQ_CENTCOM || freq == FREQ_WIDEBAND || freq == FREQ_CTF_RED || freq == FREQ_CTF_BLUE)) //WS Edit - SolGov Rep + if (independent && (freq == FREQ_CENTCOM || freq == FREQ_WIDEBAND || freq == FREQ_CTF_RED || freq == FREQ_CTF_BLUE)) signal.data["compression"] = 0 signal.transmission_method = TRANSMISSION_SUPERSPACE signal.map_zones = list(0) // reaches all Z-levels diff --git a/code/game/objects/items/documents.dm b/code/game/objects/items/documents.dm index 51c17ff4290d..50fa39579d9a 100644 --- a/code/game/objects/items/documents.dm +++ b/code/game/objects/items/documents.dm @@ -16,7 +16,7 @@ desc = "\"Top Secret\" Nanotrasen documents, filled with complex diagrams and lists of names, dates and coordinates." icon_state = "docs_verified" -/obj/item/documents/solgov +/obj/item/documents/terragov desc = "\"TOP SECRET\"-level memo, listing a number of black company operatives on various space stations and worlds. Some entries have been crossed out, underlined in red, or even redacted entirely with black ink." icon_state = "docs_verified" diff --git a/code/game/objects/items/melee/energy.dm b/code/game/objects/items/melee/energy.dm index b500eadca2f2..44293c3cd09d 100644 --- a/code/game/objects/items/melee/energy.dm +++ b/code/game/objects/items/melee/energy.dm @@ -275,7 +275,7 @@ if(. && active) icon_state = "plasmasword1" -/obj/item/melee/transforming/energy/ctf/solgov +/obj/item/melee/transforming/energy/ctf/terragov armour_penetration = 40 force_on = 34 //desword grade, but 0 blocking diff --git a/code/game/objects/items/melee/misc.dm b/code/game/objects/items/melee/misc.dm index 9d90a1a43373..8af737445d58 100644 --- a/code/game/objects/items/melee/misc.dm +++ b/code/game/objects/items/melee/misc.dm @@ -79,15 +79,15 @@ if(istype(B)) playsound(B, 'sound/items/sheath.ogg', 25, TRUE) -/obj/item/melee/sabre/solgov - name = "solarian sabre" - desc = "A refined ceremonial blade often given to soldiers and high ranking officials of SolGov." +/obj/item/melee/sabre/terragov + name = "terran sabre" + desc = "A refined ceremonial blade often given to soldiers and high ranking officials of TerraGov." icon_state = "sabresolgov" item_state = "sabresolgov" /obj/item/melee/sabre/suns name = "SUNS sabre" - desc = "A blade of Solarian origin given to SUNS followers." + desc = "A blade of Terran origin given to SUNS followers." icon_state = "suns-sabre" item_state = "suns-sabre" diff --git a/code/game/objects/items/plushes.dm b/code/game/objects/items/plushes.dm index a6ef402ecad4..2e0adbb11432 100644 --- a/code/game/objects/items/plushes.dm +++ b/code/game/objects/items/plushes.dm @@ -765,8 +765,8 @@ icon_state = "flushplush" /obj/item/toy/plush/blahaj - name = "Solarian Marine Society mascot plushie" - desc = "The adorable little mascot of the solarian marine society. Popular with vampires." + name = "Terran Marine Society mascot plushie" + desc = "The adorable little mascot of the terran marine society. Popular with vampires." icon_state = "blahaj" item_state = "blahaj" lefthand_file = 'icons/mob/inhands/misc/plushes_lefthand.dmi' //todo: sort the god damn plushie inhands diff --git a/code/game/objects/items/stacks/sheets/sheet_types.dm b/code/game/objects/items/stacks/sheets/sheet_types.dm index ead6b8aeb8f1..a44981e60e94 100644 --- a/code/game/objects/items/stacks/sheets/sheet_types.dm +++ b/code/game/objects/items/stacks/sheets/sheet_types.dm @@ -151,7 +151,7 @@ GLOBAL_LIST_INIT(wood_recipes, list ( \ null, \ new/datum/stack_recipe("wooden railing", /obj/structure/railing/wood, 3, time = 18, window_checks = TRUE), \ new/datum/stack_recipe("wooden railing corner", /obj/structure/railing/corner/wood, 1, time = 10, window_checks = TRUE), \ - new /datum/stack_recipe("wooden computer frame", /obj/structure/frame/computer/solgov, 5, time = 25, one_per_turf = TRUE, on_floor = TRUE), \ + new /datum/stack_recipe("wooden computer frame", /obj/structure/frame/computer/terragov, 5, time = 25, one_per_turf = TRUE, on_floor = TRUE), \ )) /obj/item/stack/sheet/mineral/wood diff --git a/code/game/objects/items/storage/belt.dm b/code/game/objects/items/storage/belt.dm index 802eeee2d45f..ab65bf5a6035 100644 --- a/code/game/objects/items/storage/belt.dm +++ b/code/game/objects/items/storage/belt.dm @@ -812,15 +812,15 @@ new /obj/item/melee/sabre(src) update_appearance() -/obj/item/storage/belt/sabre/solgov - name = "solarian sabre sheath" +/obj/item/storage/belt/sabre/terragov + name = "terran sabre sheath" desc = "An ornate sheath designed to hold an officer's blade." base_icon_state = "sheath-solgov" icon_state = "sheath-solgov" item_state = "sheath-solgov" w_class = WEIGHT_CLASS_BULKY -/obj/item/storage/belt/sabre/solgov/ComponentInitialize() +/obj/item/storage/belt/sabre/terragov/ComponentInitialize() AddComponent(component_type) AddElement(/datum/element/update_icon_updates_onmob) var/datum/component/storage/STR = GetComponent(/datum/component/storage) @@ -828,11 +828,11 @@ STR.use_sound = null STR.max_w_class = WEIGHT_CLASS_BULKY STR.set_holdable(list( - /obj/item/melee/sabre/solgov + /obj/item/melee/sabre/terragov )) -/obj/item/storage/belt/sabre/solgov/PopulateContents() - new /obj/item/melee/sabre/solgov(src) +/obj/item/storage/belt/sabre/terragov/PopulateContents() + new /obj/item/melee/sabre/terragov(src) update_appearance() /obj/item/storage/belt/sabre/suns diff --git a/code/game/objects/items/storage/fancy.dm b/code/game/objects/items/storage/fancy.dm index d6edfb29461a..01a1027d4a82 100644 --- a/code/game/objects/items/storage/fancy.dm +++ b/code/game/objects/items/storage/fancy.dm @@ -458,7 +458,7 @@ /obj/item/storage/fancy/cigarettes/cigars/havana name = "\improper premium Havanian cigar case" - desc = "Even after centuries of Solarian export, Havana smooth is only found in proper terran cigars." + desc = "Even after centuries of Terran export, Havana smooth is only found in proper terran cigars." icon_state = "cohibacase" base_icon_state = "cohibacase" spawn_type = /obj/item/clothing/mask/cigarette/cigar/havana diff --git a/code/game/objects/structures/bedsheet_bin.dm b/code/game/objects/structures/bedsheet_bin.dm index d57e31ce9514..fd4392cdb063 100644 --- a/code/game/objects/structures/bedsheet_bin.dm +++ b/code/game/objects/structures/bedsheet_bin.dm @@ -228,9 +228,9 @@ LINEN BINS item_state = "sheetNT" dream_messages = list("authority", "an ending") -/obj/item/bedsheet/solgov - name = "\improper SolGov bedsheet" - desc = "It has the emblem of the Solar Confederation emblazoned upon it!" +/obj/item/bedsheet/terragov + name = "\improper TerraGov bedsheet" + desc = "It has the emblem of the Terran Confederation emblazoned upon it!" icon_state = "sheetsolgov" item_state = "sheetsolgov" dream_messages = list("bureaucracy", "laws", "papers", "writing") @@ -356,8 +356,8 @@ LINEN BINS dream_messages = list("authority", "a silvery ID", "a bomb", "a mech", "a facehugger", "maniacal laughter", "the research director") desc = "It appears to have a beaker emblem, and is made out of fire-resistant material, although it probably won't protect you in the event of fires you're familiar with every day." -/obj/item/bedsheet/double/solgov - name = "double SolGov bedsheet" +/obj/item/bedsheet/double/terragov + name = "double TerraGov bedsheet" icon_state = "double_sheetsolgov" item_state = "double_sheetsolgov" dream_messages = list("bureaucracy", "laws", "papers", "writing") diff --git a/code/game/objects/structures/door_assembly_types.dm b/code/game/objects/structures/door_assembly_types.dm index d2bcf77cfda7..ccf570bd521e 100644 --- a/code/game/objects/structures/door_assembly_types.dm +++ b/code/game/objects/structures/door_assembly_types.dm @@ -13,11 +13,11 @@ airlock_type = /obj/machinery/door/airlock/command /obj/structure/door_assembly/door_assembly_sgv - name = "solgov airlock assembly" + name = "terragov airlock assembly" icon = 'icons/obj/doors/airlocks/station/solgov.dmi' - base_name = "solgov airlock" - glass_type = /obj/machinery/door/airlock/solgov/glass - airlock_type = /obj/machinery/door/airlock/solgov + base_name = "terragov airlock" + glass_type = /obj/machinery/door/airlock/terragov/glass + airlock_type = /obj/machinery/door/airlock/terragov /obj/structure/door_assembly/door_assembly_sec name = "security airlock assembly" diff --git a/code/game/objects/structures/icemoon/cave_entrance.dm b/code/game/objects/structures/icemoon/cave_entrance.dm index 91085fe9f104..e27c1883bc7a 100644 --- a/code/game/objects/structures/icemoon/cave_entrance.dm +++ b/code/game/objects/structures/icemoon/cave_entrance.dm @@ -471,17 +471,17 @@ GLOBAL_LIST_INIT(ore_probability, list( new /obj/item/storage/firstaid/regular(loc) new /mob/living/simple_animal/hostile/blob/blobspore/weak(loc) if(prob(35)) - new /obj/effect/mob_spawn/human/corpse/solgov/sonnensoldner(loc) + new /obj/effect/mob_spawn/human/corpse/terragov/sonnensoldner(loc) new /mob/living/simple_animal/hostile/blob/blobspore/weak(loc) else new /obj/effect/mob_spawn/human/doctor(loc) if(prob(35)) - new /obj/effect/mob_spawn/human/corpse/solgov/sonnensoldner(loc) + new /obj/effect/mob_spawn/human/corpse/terragov/sonnensoldner(loc) new /mob/living/simple_animal/hostile/blob/blobspore/weak(loc) else new /obj/effect/mob_spawn/human/doctor(loc) if(prob(35)) - new /obj/effect/mob_spawn/human/corpse/solgov/sonnensoldner(loc) + new /obj/effect/mob_spawn/human/corpse/terragov/sonnensoldner(loc) new /mob/living/simple_animal/hostile/blob/blobspore/weak(loc) else new /obj/effect/mob_spawn/human/doctor(loc) diff --git a/code/game/objects/structures/printer.dm b/code/game/objects/structures/printer.dm index c4c1abea9cf7..abbabd6eeae7 100644 --- a/code/game/objects/structures/printer.dm +++ b/code/game/objects/structures/printer.dm @@ -168,8 +168,8 @@ if("Syndicate") var/obj/item/poster/random_contraband/poster = new() printed_poster = WEAKREF(poster) - if("SolGov") - var/obj/item/poster/random_solgov/poster = new() + if("TerraGov") + var/obj/item/poster/random_terragov/poster = new() printed_poster = WEAKREF(poster) if("Nanotrasen") var/obj/item/poster/random_official/poster = new() diff --git a/code/game/objects/structures/signs/_signs.dm b/code/game/objects/structures/signs/_signs.dm index f96d11703943..710a4ae466f2 100644 --- a/code/game/objects/structures/signs/_signs.dm +++ b/code/game/objects/structures/signs/_signs.dm @@ -250,17 +250,17 @@ icon_state = "donkco" is_editable = TRUE -// some solgov stuff -/obj/structure/sign/solgov_seal - name = "seal of the solarian government" +// some terragov stuff +/obj/structure/sign/terragov_seal + name = "seal of the terran government" desc = "A seal emblazened with a gold trim depicting Sol." icon = 'icons/obj/solgov_logos.dmi' icon_state = "solgovseal" pixel_y = 27 -/obj/structure/sign/solgov_flag - name = "solgov banner" - desc = "A large flag displaying the logo of solgov, the government of the Sol system." +/obj/structure/sign/terragov_flag + name = "terragov banner" + desc = "A large flag displaying the logo of terragov, the government of the Sol system." icon = 'icons/obj/solgov_logos.dmi' icon_state = "solgovflag-left" diff --git a/code/game/objects/structures/tables_racks.dm b/code/game/objects/structures/tables_racks.dm index 4ebd416675b8..94e652cad2ee 100644 --- a/code/game/objects/structures/tables_racks.dm +++ b/code/game/objects/structures/tables_racks.dm @@ -758,7 +758,7 @@ qdel(src) building = FALSE -/obj/structure/table/wood/reinforced //a reinforced version of the regular wooden table, primarily for use in solgov outposts or ships +/obj/structure/table/wood/reinforced //a reinforced version of the regular wooden table, primarily for use in terragov outposts or ships name = "reinforced wooden table" desc = "A reinforced version of the four-legged wooden table. Likely as easy to burn as a normal one." icon = 'icons/obj/smooth_structures/reinforced_wood_table.dmi' diff --git a/code/game/say.dm b/code/game/say.dm index 2d53eea65e75..6270c9a00969 100644 --- a/code/game/say.dm +++ b/code/game/say.dm @@ -13,8 +13,8 @@ GLOBAL_LIST_INIT(freqtospan, list( "[FREQ_AI_PRIVATE]" = "aiprivradio", "[FREQ_SYNDICATE]" = "syndradio", "[FREQ_CENTCOM]" = "centcomradio", - "[FREQ_SOLGOV]" = "solgovradio", //WS Edit - SolGov Rep - "[FREQ_WIDEBAND]" = "widebandradio", //WS Edit - Overmaps + "[FREQ_TERRAGOV]" = "terragovradio", + "[FREQ_WIDEBAND]" = "widebandradio", "[FREQ_CTF_RED]" = "redteamradio", "[FREQ_CTF_BLUE]" = "blueteamradio" )) diff --git a/code/modules/admin/verbs/randomverbs.dm b/code/modules/admin/verbs/randomverbs.dm index f189fdf6106d..87e0f43c68fd 100644 --- a/code/modules/admin/verbs/randomverbs.dm +++ b/code/modules/admin/verbs/randomverbs.dm @@ -65,7 +65,7 @@ return if (!sender) - sender = input("Who is the message from?", "Sender") as null|anything in list(RADIO_CHANNEL_CENTCOM, RADIO_CHANNEL_SYNDICATE, RADIO_CHANNEL_SOLGOV, RADIO_CHANNEL_INTEQ, RADIO_CHANNEL_MINUTEMEN, "Outpost") //WS Edit - SolGov Rep + sender = input("Who is the message from?", "Sender") as null|anything in list(RADIO_CHANNEL_CENTCOM, RADIO_CHANNEL_SYNDICATE, RADIO_CHANNEL_TERRAGOV, RADIO_CHANNEL_INTEQ, RADIO_CHANNEL_MINUTEMEN, "Outpost") if(!sender) return switch(sender) @@ -87,7 +87,7 @@ log_directed_talk(mob, H, input, LOG_ADMIN, "reply") message_admins("[key_name_admin(src)] replied to [key_name_admin(H)]'s [sender] message with: \"[input]\"") - to_chat(H, "You hear something crackle in your ears for a moment before a voice speaks. \"Please stand by for a message from [sender]. Message as follows: [input]. Message ends.\"", confidential = TRUE) //WS Edit - SolGov Rep + to_chat(H, "You hear something crackle in your ears for a moment before a voice speaks. \"Please stand by for a message from [sender]. Message as follows: [input]. Message ends.\"", confidential = TRUE) SSblackbox.record_feedback("tally", "admin_verb", 1, "Headset Message") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! diff --git a/code/modules/antagonists/ert/solgov.dm b/code/modules/antagonists/ert/solgov.dm index 6868fe9eb9bf..469de3ee6155 100644 --- a/code/modules/antagonists/ert/solgov.dm +++ b/code/modules/antagonists/ert/solgov.dm @@ -1,19 +1,19 @@ // ******************************************************************** -// ** SolGov ** +// ** TerraGov ** // ******************************************************************** -/datum/antagonist/ert/solgov - name = "SolGov Sonnensöldner" - outfit = /datum/outfit/job/solgov/ert +/datum/antagonist/ert/terragov + name = "terragov Sonnensöldner" + outfit = /datum/outfit/job/terragov/ert random_names = FALSE role = "Sonnensöldner" -/datum/antagonist/ert/official/solgov - name = "SolGov Inspector" - outfit = /datum/outfit/job/solgov/ert/inspector - role = "Solarian Inspector" +/datum/antagonist/ert/official/terragov + name = "TerraGov Inspector" + outfit = /datum/outfit/job/terragov/ert/inspector + role = "Terran Inspector" -/datum/antagonist/ert/official/solgov/greet() - to_chat(owner, "You are a Solarian Inspector.") +/datum/antagonist/ert/official/terragov/greet() + to_chat(owner, "You are a Terran Inspector.") if (ert_team) to_chat(owner, "The Department of Administrative Affairs is sending you to [station_name()] with the task: [ert_team.mission.explanation_text]") else diff --git a/code/modules/asset_cache/asset_list_items.dm b/code/modules/asset_cache/asset_list_items.dm index 83abc98ed990..45899286563f 100644 --- a/code/modules/asset_cache/asset_list_items.dm +++ b/code/modules/asset_cache/asset_list_items.dm @@ -112,7 +112,7 @@ "stamp-mime" = 'icons/stamp_icons/large_stamp-mime.png', "stamp-centcom" = 'icons/stamp_icons/large_stamp-centcom.png', "stamp-syndicate" = 'icons/stamp_icons/large_stamp-syndicate.png', - "stamp-solgov" = 'icons/stamp_icons/large_stamp-solgov.png', + "stamp-terragov" = 'icons/stamp_icons/large_stamp-solgov.png', "stamp-inteq" = 'icons/stamp_icons/large_stamp-inteq.png', "stamp-vanguard" = 'icons/stamp_icons/large_stamp-vanguard.png', "stamp-maa" = 'icons/stamp_icons/large_stamp-maa.png', diff --git a/code/modules/cargo/blackmarket/blackmarket_items/misc.dm b/code/modules/cargo/blackmarket/blackmarket_items/misc.dm index a5e2c67175af..c5be7939f3fa 100644 --- a/code/modules/cargo/blackmarket/blackmarket_items/misc.dm +++ b/code/modules/cargo/blackmarket/blackmarket_items/misc.dm @@ -93,7 +93,7 @@ /datum/blackmarket_item/misc/secret_docs/spawn_item(loc) var/docs = pick(list(/obj/item/documents/nanotrasen, - /obj/item/documents/solgov, + /obj/item/documents/terragov, /obj/item/documents/terragov, /obj/item/documents/syndicate/red)) return new docs(loc) diff --git a/code/modules/cargo/blackmarket/blackmarket_items/weapons.dm b/code/modules/cargo/blackmarket/blackmarket_items/weapons.dm index 11fef220ee01..9a88aeaa4dea 100644 --- a/code/modules/cargo/blackmarket/blackmarket_items/weapons.dm +++ b/code/modules/cargo/blackmarket/blackmarket_items/weapons.dm @@ -270,7 +270,7 @@ /datum/blackmarket_item/weapon/sgg name = "SSG-669C Rotary Sniper Rifle" desc = "I could tell you it's full name, but we'd be here all day. It's a sniper rifle. It shoots people from far away. Chambered in 8x58mm." - item = /obj/item/gun/ballistic/rifle/solgov + item = /obj/item/gun/ballistic/rifle/terragov pair_item = /datum/blackmarket_item/weapon/sgg_stripper price_min = 3000 @@ -292,7 +292,7 @@ /datum/blackmarket_item/weapon/pistole_c name = "Pistole C" desc = "Pistole Compact? Pistole Caseless? Pistole Cheese? Fuck if I know. All I know is these little numbers pack a nasty sting. Chambered in 5.56 caseless." - item = /obj/item/gun/ballistic/automatic/pistol/solgov/old + item = /obj/item/gun/ballistic/automatic/pistol/terragov/old pair_item = /datum/blackmarket_item/weapon/pistole_c_mag price_min = 900 diff --git a/code/modules/cargo/expressconsole.dm b/code/modules/cargo/expressconsole.dm index 81409d63d031..8e94b54ce6e5 100644 --- a/code/modules/cargo/expressconsole.dm +++ b/code/modules/cargo/expressconsole.dm @@ -35,10 +35,10 @@ icon_state = "computer-retro" deconpath = /obj/structure/frame/computer/retro -/obj/machinery/computer/cargo/express/solgov +/obj/machinery/computer/cargo/express/terragov icon = 'icons/obj/machines/retro_computer.dmi' icon_state = "computer-solgov" - deconpath = /obj/structure/frame/computer/solgov + deconpath = /obj/structure/frame/computer/terragov /obj/machinery/computer/cargo/express/Initialize() . = ..() diff --git a/code/modules/cargo/packs/ammo.dm b/code/modules/cargo/packs/ammo.dm index 714bab059f54..5c7a0d6c46d0 100644 --- a/code/modules/cargo/packs/ammo.dm +++ b/code/modules/cargo/packs/ammo.dm @@ -193,7 +193,7 @@ /datum/supply_pack/ammo/c556mmHITP_ammo_box name = "5.56 Caseless Ammo Box Crate" - desc = "Contains a fifty-round 5.56mm caseless box for SolGov sidearms like the Pistole C." + desc = "Contains a fifty-round 5.56mm caseless box for TerraGov sidearms like the Pistole C." contains = list(/obj/item/ammo_box/c556mmHITP) cost = 250 diff --git a/code/modules/client/loadout/loadout_hat.dm b/code/modules/client/loadout/loadout_hat.dm index d4ab1c858f26..224cade3e7d2 100644 --- a/code/modules/client/loadout/loadout_hat.dm +++ b/code/modules/client/loadout/loadout_hat.dm @@ -33,7 +33,7 @@ role_replacements = list( "Captain" = /obj/item/clothing/head/beret/captain, "Head of Personnel" = /obj/item/clothing/head/beret/hop, - "SolGov Representative" = /obj/item/clothing/head/beret/solgov, + "TerraGov Representative" = /obj/item/clothing/head/beret/terragov, "Head of Security" = /obj/item/clothing/head/beret/sec/hos, "Warden" = /obj/item/clothing/head/beret/sec/warden, diff --git a/code/modules/clothing/factions/srm.dm b/code/modules/clothing/factions/srm.dm index cd901306b7a7..325d5d0b6e22 100644 --- a/code/modules/clothing/factions/srm.dm +++ b/code/modules/clothing/factions/srm.dm @@ -77,9 +77,9 @@ //Spacesuits// ////////////// -/obj/item/clothing/head/helmet/space/hardsuit/solgov/roumain +/obj/item/clothing/head/helmet/space/hardsuit/terragov/roumain name = "\improper roumain hardsuit helmet" - desc = "An armored helmet with an unusual design that recalls both pre-industrial Solarian armor and iconography depicting the Ashen Huntsman. Though hand-made, it is surprisingly quite spaceworthy." + desc = "An armored helmet with an unusual design that recalls both pre-industrial Terran armor and iconography depicting the Ashen Huntsman. Though hand-made, it is surprisingly quite spaceworthy." icon = 'icons/obj/clothing/faction/srm/head.dmi' mob_overlay_icon = 'icons/mob/clothing/faction/srm/head.dmi' icon_state = "hardsuit0-roumain" @@ -87,14 +87,14 @@ hardsuit_type = "roumain" worn_y_offset = 4 -/obj/item/clothing/suit/space/hardsuit/solgov/roumain +/obj/item/clothing/suit/space/hardsuit/terragov/roumain name = "\improper roumain hardsuit" desc = "A hand-crafted suit of armor either modified from a set of normal plate armor or designed to resemble one. A powered exoskeleton has been cleverly integrated into the design and, surprisingly, it is completely vacuum-proof. Suits like this are a testament to what the master craftsmen of Hunter's Pride are capable of." icon = 'icons/obj/clothing/faction/srm/suits.dmi' mob_overlay_icon = 'icons/mob/clothing/faction/srm/suits.dmi' icon_state = "hardsuit-roumain" item_state = "hardsuit-roumain" - helmettype = /obj/item/clothing/head/helmet/space/hardsuit/solgov/roumain + helmettype = /obj/item/clothing/head/helmet/space/hardsuit/terragov/roumain slowdown = 0.5 ///////// diff --git a/code/modules/clothing/factions/suns.dm b/code/modules/clothing/factions/suns.dm index df6d831e479b..2cacd62f1b21 100644 --- a/code/modules/clothing/factions/suns.dm +++ b/code/modules/clothing/factions/suns.dm @@ -275,7 +275,7 @@ lefthand_file = 'icons/mob/inhands/faction/suns/suns_lefthand.dmi' righthand_file = 'icons/mob/inhands/faction/suns/suns_righthand.dmi' -/obj/item/clothing/head/helmet/space/hardsuit/solgov/suns +/obj/item/clothing/head/helmet/space/hardsuit/terragov/suns name = "\improper SUNS captain's hardsuit helmet" icon_state = "hardsuit0-suns_solgov" item_state = "hardsuit0-suns_solgov" @@ -284,15 +284,15 @@ hardsuit_type = "suns_solgov" desc = "An armored spaceproof helmet, the white glass on the side signifies a captain level rank." -/obj/item/clothing/suit/space/hardsuit/solgov/suns +/obj/item/clothing/suit/space/hardsuit/terragov/suns name = "\improper SUNS captain's hardsuit" - desc = "A well decorated spaceworthy suit. The design was co-created by SolGov and SUNS academics." + desc = "A well decorated spaceworthy suit. The design was co-created by TerraGov and SUNS academics." icon_state = "suns_commandsuit" item_state = "suns_commandsuit" icon = 'icons/obj/clothing/faction/suns/suits.dmi' mob_overlay_icon = 'icons/mob/clothing/faction/suns/suits.dmi' hardsuit_type = "suns_solgov" - helmettype = /obj/item/clothing/head/helmet/space/hardsuit/solgov/suns + helmettype = /obj/item/clothing/head/helmet/space/hardsuit/terragov/suns lefthand_file = 'icons/mob/inhands/faction/suns/suns_lefthand.dmi' righthand_file = 'icons/mob/inhands/faction/suns/suns_righthand.dmi' diff --git a/code/modules/clothing/head/berets.dm b/code/modules/clothing/head/berets.dm index 9d3ca21ed4f0..c299e73b4c4a 100644 --- a/code/modules/clothing/head/berets.dm +++ b/code/modules/clothing/head/berets.dm @@ -175,24 +175,24 @@ desc = "A modest blue command beret with a silver rank insignia. Smells of power and the sweat of assistants." icon_state = "beret_com" -// SolGov +// TerraGov -/obj/item/clothing/head/beret/solgov - name = "\improper SolGov beret" - desc = "A beret with SolGov's emblem emblazoned on it. Colored in SolGov blue." +/obj/item/clothing/head/beret/terragov + name = "\improper TerraGov beret" + desc = "A beret with TerraGov's emblem emblazoned on it. Colored in TerraGov blue." icon_state = "beret_solgov" -/obj/item/clothing/head/beret/solgov/plain - name = "\improper SolGov beret" +/obj/item/clothing/head/beret/terragov/plain + name = "\improper TerraGov beret" desc = "A plain blue beret. It looks like it's missing something." icon_state = "beret_solgovplain" -/obj/item/clothing/head/beret/solgov/terragov +/obj/item/clothing/head/beret/terragov/terragov name = "\improper TerraGov beret" - desc = "A beret with SolGov's emblem emblazoned on it. It's still colored in original TerraGov green." + desc = "A beret with TerraGov's emblem emblazoned on it. It's still colored in original TerraGov green." icon_state = "beret_terragov" -/obj/item/clothing/head/beret/solgov/terragov/plain +/obj/item/clothing/head/beret/terragov/terragov/plain name = "\improper TerraGov beret" desc = "A plain beret colored in original TerraGov green. It looks like it's missing something." icon_state = "beret_terragovplain" diff --git a/code/modules/clothing/head/hardhat.dm b/code/modules/clothing/head/hardhat.dm index dba4c2f80406..07b01e93ec91 100644 --- a/code/modules/clothing/head/hardhat.dm +++ b/code/modules/clothing/head/hardhat.dm @@ -101,7 +101,7 @@ icon_state = "hardhat_dblue" dog_fashion = null -/obj/item/clothing/head/hardhat/solgov +/obj/item/clothing/head/hardhat/terragov icon_state = "hardhat_solgov" dog_fashion = null diff --git a/code/modules/clothing/head/helmet.dm b/code/modules/clothing/head/helmet.dm index 352349783bae..0fffe349f56a 100644 --- a/code/modules/clothing/head/helmet.dm +++ b/code/modules/clothing/head/helmet.dm @@ -513,37 +513,37 @@ supports_variations = KEPORI_VARIATION content_overlays = TRUE -/obj/item/clothing/head/solgov - name = "\improper SolGov officer's cap" - desc = "A blue cap worn by high-ranking officers of SolGov." - icon_state = "cap_solgov" +/obj/item/clothing/head/terragov + name = "\improper TerraGov officer's cap" + desc = "A blue cap worn by high-ranking officers of TerraGov." + icon_state = "cap_terragov" item_state = "cap_solgov" strip_delay = 80 -/obj/item/clothing/head/solgov/terragov +/obj/item/clothing/head/terragov/terragov name = "\improper TerraGov officer's cap" - desc = "A cap worn by high-ranking officers of SolGov. This one is still in original TerraGov green." + desc = "A cap worn by high-ranking officers of TerraGov. This one is still in original TerraGov green." icon_state = "cap_terragov" item_state = "cap_terragov" -/obj/item/clothing/head/solgov/sonnensoldner +/obj/item/clothing/head/terragov/sonnensoldner name = "\improper Sonnensoldner Hat" - desc = "A standard-issue SolGov hat adorned with a feather, commonly used by Sonnensoldners." + desc = "A standard-issue terragov hat adorned with a feather, commonly used by Sonnensoldners." icon_state = "sonnensoldner_hat" item_state = "sonnensoldner_hat" worn_y_offset = 4 dog_fashion = null -/obj/item/clothing/head/solgov/captain - name = "\improper SolGov bicorne hat" - desc = "A unique bicorne hat given to Solarian Captains on expeditionary missions." +/obj/item/clothing/head/terragov/captain + name = "\improper TerraGov bicorne hat" + desc = "A unique bicorne hat given to Terran Captains on expeditionary missions." icon_state = "solgov_bicorne" item_state = "solgov_bicorne" worn_y_offset = 2 dog_fashion = null -/obj/item/clothing/head/helmet/space/plasmaman/solgov - name = "\improper SolGov envirosuit helmet" +/obj/item/clothing/head/helmet/space/plasmaman/terragov + name = "\improper TerraGov envirosuit helmet" desc = "A generic white envirohelmet with a secondary blue." icon_state = "solgov_envirohelm" item_state = "solgov_envirohelm" diff --git a/code/modules/clothing/head/misc.dm b/code/modules/clothing/head/misc.dm index 61f032b5ef61..d19e2779571e 100644 --- a/code/modules/clothing/head/misc.dm +++ b/code/modules/clothing/head/misc.dm @@ -223,11 +223,11 @@ icon_state = "fedora_beige" item_state = "fedora_beige" -/obj/item/clothing/head/fedora/solgov - name = "solarian hat" +/obj/item/clothing/head/fedora/terragov + name = "terran hat" icon_state = "hat_solgov" item_state = "hat_solgov" - desc = "A slick blue hat used by both solarian civilians and physicists." + desc = "A slick blue hat used by both terran civilians and physicists." /obj/item/clothing/head/sombrero name = "sombrero" @@ -263,9 +263,9 @@ icon_state = "flat_cap" item_state = "detective" -/obj/item/clothing/head/flatcap/solgov - name = "solarian flat cap" - desc = "A working solarian's hat, commonly used by Logistics Deck Officers." +/obj/item/clothing/head/flatcap/terragov + name = "terran flat cap" + desc = "A working terran's hat, commonly used by Logistics Deck Officers." icon_state = "flatcap_solgov" item_state = "detective" @@ -489,8 +489,8 @@ icon_state = "cowboy" item_state = "cowboy" -/obj/item/clothing/head/solgov_surgery - name = "SolGov surgery cap" - desc = "It's a surgery cap utilized by solarian doctors." +/obj/item/clothing/head/terragov_surgery + name = "TerraGov surgery cap" + desc = "It's a surgery cap utilized by Terran doctors." icon_state = "solgov_surgery" diff --git a/code/modules/clothing/neck/_neck.dm b/code/modules/clothing/neck/_neck.dm index 3f431df81ccb..5df8da840c21 100644 --- a/code/modules/clothing/neck/_neck.dm +++ b/code/modules/clothing/neck/_neck.dm @@ -286,8 +286,8 @@ icon_state = "stripedbluescarf" custom_price = 10 -/obj/item/clothing/neck/stripedsolgovscarf - name = "striped solgov scarf" +/obj/item/clothing/neck/stripedterragovscarf + name = "striped terragov scarf" icon_state = "stripedsolgovscarf" custom_price = 10 diff --git a/code/modules/clothing/outfits/ert/solgov_ert.dm b/code/modules/clothing/outfits/ert/solgov_ert.dm index da3a1146648d..55a2d11f2015 100644 --- a/code/modules/clothing/outfits/ert/solgov_ert.dm +++ b/code/modules/clothing/outfits/ert/solgov_ert.dm @@ -1,16 +1,16 @@ -/datum/outfit/job/solgov/ert - name = "ERT - SolGov Sonnensöldner" +/datum/outfit/job/terragov/ert + name = "ERT - terragov Sonnensöldner" id_assignment = "Sonnensöldner" jobtype = /datum/job/officer job_icon = "sonnensoldner" - id = /obj/item/card/id/solgov - uniform = /obj/item/clothing/under/solgov - suit = /obj/item/clothing/suit/armor/vest/bulletproof/solgov + id = /obj/item/card/id/terragov + uniform = /obj/item/clothing/under/terragov + suit = /obj/item/clothing/suit/armor/vest/bulletproof/terragov mask = null - ears = /obj/item/radio/headset/solgov/alt + ears = /obj/item/radio/headset/terragov/alt gloves = /obj/item/clothing/gloves/combat - head = /obj/item/clothing/head/solgov/sonnensoldner + head = /obj/item/clothing/head/terragov/sonnensoldner shoes = /obj/item/clothing/shoes/workboots back = /obj/item/storage/backpack @@ -18,17 +18,17 @@ l_hand = /obj/item/energyhalberd -/datum/outfit/job/solgov/ert/inspector - name = "ERT - Inspector (SolGov)" +/datum/outfit/job/terragov/ert/inspector + name = "ERT - Inspector (terragov)" id_assignment = "Inspector" jobtype = /datum/job/head_of_personnel job_icon = "solgovrepresentative" - uniform = /obj/item/clothing/under/solgov/formal + uniform = /obj/item/clothing/under/terragov/formal belt = /obj/item/clipboard - ears = /obj/item/radio/headset/solgov/captain + ears = /obj/item/radio/headset/terragov/captain back = /obj/item/storage/backpack/satchel/leather - head = /obj/item/clothing/head/solgov + head = /obj/item/clothing/head/terragov gloves = /obj/item/clothing/gloves/color/white shoes = /obj/item/clothing/shoes/laceup suit = null @@ -38,4 +38,4 @@ l_hand = null - backpack_contents = list(/obj/item/stamp/solgov=1) + backpack_contents = list(/obj/item/stamp/terragov=1) diff --git a/code/modules/clothing/outfits/factions/solgov.dm b/code/modules/clothing/outfits/factions/solgov.dm index 972b863bbbda..f37b3e43aad9 100644 --- a/code/modules/clothing/outfits/factions/solgov.dm +++ b/code/modules/clothing/outfits/factions/solgov.dm @@ -1,35 +1,35 @@ -/datum/outfit/job/solgov - name = "SolGov Base Outfit" +/datum/outfit/job/terragov + name = "terragov Base Outfit" - faction_icon = "bg_solgov" + faction_icon = "bg_terragov" -/datum/outfit/job/solgov/post_equip(mob/living/carbon/human/H, visualsOnly) +/datum/outfit/job/terragov/post_equip(mob/living/carbon/human/H, visualsOnly) . = ..() if(visualsOnly) return - H.faction |= list(FACTION_PLAYER_SOLGOV) + H.faction |= list(FACTION_PLAYER_TERRAGOV) -/datum/outfit/job/solgov/assistant - name = "SolGov - Scribe" +/datum/outfit/job/terragov/assistant + name = "terragov - Scribe" id_assignment = "Scribe" jobtype = /datum/job/assistant job_icon = "scribe" - head = /obj/item/clothing/head/beret/solgov/plain - uniform = /obj/item/clothing/under/solgov/formal + head = /obj/item/clothing/head/beret/terragov/plain + uniform = /obj/item/clothing/under/terragov/formal shoes = /obj/item/clothing/shoes/laceup - suit = /obj/item/clothing/suit/solgov + suit = /obj/item/clothing/suit/terragov -/datum/outfit/job/solgov/bureaucrat - name = "SolGov - Bureaucrat" +/datum/outfit/job/terragov/bureaucrat + name = "terragov - Bureaucrat" id_assignment = "Bureaucrat" jobtype = /datum/job/curator job_icon = "curator" - head = /obj/item/clothing/head/beret/solgov - uniform = /obj/item/clothing/under/solgov/formal + head = /obj/item/clothing/head/beret/terragov + uniform = /obj/item/clothing/under/terragov/formal shoes = /obj/item/clothing/shoes/laceup - suit = /obj/item/clothing/suit/solgov/bureaucrat + suit = /obj/item/clothing/suit/terragov/bureaucrat l_hand = /obj/item/storage/bag/books r_pocket = /obj/item/key/displaycase l_pocket = /obj/item/laser_pointer @@ -38,18 +38,18 @@ /obj/item/barcodescanner = 1 ) -/datum/outfit/job/solgov/captain - name = "SolGov - Captain" +/datum/outfit/job/terragov/captain + name = "terragov - Captain" jobtype = /datum/job/captain job_icon = "solgovrepresentative" // idk id = /obj/item/card/id/gold gloves = /obj/item/clothing/gloves/combat - ears = /obj/item/radio/headset/solgov/alt/captain - uniform = /obj/item/clothing/under/solgov/formal/captain - suit = /obj/item/clothing/suit/armor/vest/bulletproof/solgov/captain + ears = /obj/item/radio/headset/terragov/alt/captain + uniform = /obj/item/clothing/under/terragov/formal/captain + suit = /obj/item/clothing/suit/armor/vest/bulletproof/terragov/captain shoes = /obj/item/clothing/shoes/laceup - head = /obj/item/clothing/head/solgov/captain + head = /obj/item/clothing/head/terragov/captain backpack_contents = list(/obj/item/melee/classic_baton/telescopic=1) backpack = /obj/item/storage/backpack/captain @@ -61,18 +61,18 @@ chameleon_extras = list(/obj/item/gun/energy/e_gun, /obj/item/stamp/captain) -/datum/outfit/job/solgov/sonnensoldner - name = "SolGov - Sonnensöldner" +/datum/outfit/job/terragov/sonnensoldner + name = "terragov - Sonnensöldner" id_assignment = "Sonnensöldner" jobtype = /datum/job/officer job_icon = "sonnensoldner" - id = /obj/item/card/id/solgov - uniform = /obj/item/clothing/under/solgov - suit = /obj/item/clothing/suit/armor/vest/bulletproof/solgov - ears = /obj/item/radio/headset/solgov/alt + id = /obj/item/card/id/terragov + uniform = /obj/item/clothing/under/terragov + suit = /obj/item/clothing/suit/armor/vest/bulletproof/terragov + ears = /obj/item/radio/headset/terragov/alt gloves = /obj/item/clothing/gloves/combat - head = /obj/item/clothing/head/solgov/sonnensoldner + head = /obj/item/clothing/head/terragov/sonnensoldner r_pocket = null l_pocket = null shoes = /obj/item/clothing/shoes/workboots @@ -80,22 +80,22 @@ box = /obj/item/storage/box/survival backpack_contents = list(/obj/item/crowbar/power) -/datum/outfit/job/solgov/representative - name = "SolGov - Solarian Representative" - jobtype = /datum/job/solgov +/datum/outfit/job/terragov/representative + name = "terragov - Terran Representative" + jobtype = /datum/job/terragov job_icon = "solgovrepresentative" - id = /obj/item/card/id/solgov - head = /obj/item/clothing/head/solgov - uniform = /obj/item/clothing/under/solgov/formal - accessory = /obj/item/clothing/accessory/waistcoat/solgov - neck = /obj/item/clothing/neck/cloak/solgov - suit = /obj/item/clothing/suit/toggle/solgov - alt_suit = /obj/item/clothing/suit/armor/solgov_trenchcoat + id = /obj/item/card/id/terragov + head = /obj/item/clothing/head/terragov + uniform = /obj/item/clothing/under/terragov/formal + accessory = /obj/item/clothing/accessory/waistcoat/terragov + neck = /obj/item/clothing/neck/cloak/terragov + suit = /obj/item/clothing/suit/toggle/terragov + alt_suit = /obj/item/clothing/suit/armor/terragov_trenchcoat dcoat = /obj/item/clothing/suit/hooded/wintercoat gloves = /obj/item/clothing/gloves/color/white shoes = /obj/item/clothing/shoes/laceup - ears = /obj/item/radio/headset/solgov/captain + ears = /obj/item/radio/headset/terragov/captain glasses = /obj/item/clothing/glasses/sunglasses implants = list(/obj/item/implant/mindshield) @@ -104,18 +104,18 @@ /obj/item/kitchen/knife/letter_opener = 1 ) -/datum/outfit/job/solgov/overseer - name = "SolGov - Overseer" +/datum/outfit/job/terragov/overseer + name = "terragov - Overseer" id_assignment = "Overseer" jobtype = /datum/job/head_of_personnel job_icon = "headofpersonnel" - id = /obj/item/card/id/solgov - ears = /obj/item/radio/headset/solgov/captain - uniform = /obj/item/clothing/under/solgov/formal - head = /obj/item/clothing/head/solgov + id = /obj/item/card/id/terragov + ears = /obj/item/radio/headset/terragov/captain + uniform = /obj/item/clothing/under/terragov/formal + head = /obj/item/clothing/head/terragov neck = /obj/item/clothing/neck/cloak/overseer - suit = /obj/item/clothing/suit/armor/vest/bulletproof/solgov/overseer + suit = /obj/item/clothing/suit/armor/vest/bulletproof/terragov/overseer shoes = /obj/item/clothing/shoes/laceup backpack_contents = list(/obj/item/storage/box/ids=1,\ @@ -123,17 +123,17 @@ chameleon_extras = list(/obj/item/gun/energy/e_gun, /obj/item/stamp/head_of_personnel) -/datum/outfit/job/solgov/doctor - name = "SolGov - Medical Doctor" +/datum/outfit/job/terragov/doctor + name = "terragov - Medical Doctor" jobtype = /datum/job/doctor job_icon = "medicaldoctor" ears = /obj/item/radio/headset/headset_med - uniform = /obj/item/clothing/under/solgov/formal + uniform = /obj/item/clothing/under/terragov/formal accessory = /obj/item/clothing/accessory/armband/medblue shoes = /obj/item/clothing/shoes/laceup - head = /obj/item/clothing/head/solgov_surgery - suit = /obj/item/clothing/suit/solgov/jacket + head = /obj/item/clothing/head/terragov_surgery + suit = /obj/item/clothing/suit/terragov/jacket l_hand = /obj/item/storage/firstaid/medical backpack = /obj/item/storage/backpack/medic @@ -142,8 +142,8 @@ courierbag = /obj/item/storage/backpack/messenger/med box = /obj/item/storage/box/survival/medical -/datum/outfit/job/solgov/miner - name = "SolGov - Field Engineer" +/datum/outfit/job/terragov/miner + name = "terragov - Field Engineer" id_assignment = "Field Engineer" jobtype = /datum/job/mining job_icon = "shaftminer" @@ -151,10 +151,10 @@ ears = /obj/item/radio/headset/headset_cargo/mining shoes = /obj/item/clothing/shoes/workboots/mining gloves = /obj/item/clothing/gloves/explorer - uniform = /obj/item/clothing/under/solgov + uniform = /obj/item/clothing/under/terragov accessory = /obj/item/clothing/accessory/armband/cargo - head = /obj/item/clothing/head/hardhat/solgov - suit = /obj/item/clothing/suit/hazardvest/solgov + head = /obj/item/clothing/head/hardhat/terragov + suit = /obj/item/clothing/suit/hazardvest/terragov l_pocket = /obj/item/reagent_containers/hypospray/medipen/survival r_pocket = /obj/item/storage/bag/ore //causes issues if spawned in backpack backpack_contents = list( @@ -167,15 +167,15 @@ duffelbag = /obj/item/storage/backpack/duffelbag box = /obj/item/storage/box/survival/mining -/datum/outfit/job/solgov/psychologist - name = "SolGov - Psychologist" +/datum/outfit/job/terragov/psychologist + name = "terragov - Psychologist" jobtype = /datum/job/psychologist job_icon = "psychologist" - head = /obj/item/clothing/head/fedora/solgov - suit = /obj/item/clothing/suit/solgov/suit + head = /obj/item/clothing/head/fedora/terragov + suit = /obj/item/clothing/suit/terragov/suit ears = /obj/item/radio/headset/headset_srvmed - uniform = /obj/item/clothing/under/solgov/formal + uniform = /obj/item/clothing/under/terragov/formal shoes = /obj/item/clothing/shoes/laceup id = /obj/item/card/id l_hand = /obj/item/clipboard @@ -184,8 +184,8 @@ satchel = /obj/item/storage/backpack/satchel/med duffelbag = /obj/item/storage/backpack/duffelbag/med -/datum/outfit/job/solgov/patient - name = "SolGov - Attentive Care Patient" +/datum/outfit/job/terragov/patient + name = "terragov - Attentive Care Patient" id_assignment = "Attentive Care Patient" jobtype = /datum/job/prisoner job_icon = "assistant" // todo: bug rye for patient icon // rye. rye. give me 50 gazillion billion dollars paypal @@ -195,18 +195,18 @@ alt_suit = null shoes = /obj/item/clothing/shoes/sandal/slippers -/datum/outfit/job/solgov/engineer - name = "SolGov - Ship Engineer" +/datum/outfit/job/terragov/engineer + name = "terragov - Ship Engineer" id_assignment = "Ship Engineer" jobtype = /datum/job/engineer job_icon = "stationengineer" belt = /obj/item/storage/belt/utility/full/engi ears = /obj/item/radio/headset/headset_eng - uniform = /obj/item/clothing/under/solgov/formal + uniform = /obj/item/clothing/under/terragov/formal accessory = /obj/item/clothing/accessory/armband/engine - head = /obj/item/clothing/head/hardhat/solgov - suit = /obj/item/clothing/suit/hazardvest/solgov + head = /obj/item/clothing/head/hardhat/terragov + suit = /obj/item/clothing/suit/hazardvest/terragov shoes = /obj/item/clothing/shoes/workboots r_pocket = /obj/item/t_scanner @@ -218,17 +218,17 @@ box = /obj/item/storage/box/survival/engineer backpack_contents = list(/obj/item/modular_computer/tablet/preset/advanced=1) -/datum/outfit/job/solgov/quartermaster - name = "SolGov - Logistics Deck Officer" +/datum/outfit/job/terragov/quartermaster + name = "terragov - Logistics Deck Officer" id_assignment = "Logistics Deck Officer" jobtype = /datum/job/qm job_icon = "quartermaster" - ears = /obj/item/radio/headset/solgov/captain - uniform = /obj/item/clothing/under/solgov/formal - suit = /obj/item/clothing/suit/solgov/overcoat + ears = /obj/item/radio/headset/terragov/captain + uniform = /obj/item/clothing/under/terragov/formal + suit = /obj/item/clothing/suit/terragov/overcoat shoes = /obj/item/clothing/shoes/laceup - head = /obj/item/clothing/head/flatcap/solgov + head = /obj/item/clothing/head/flatcap/terragov glasses = /obj/item/clothing/glasses/sunglasses l_hand = /obj/item/clipboard backpack_contents = list(/obj/item/modular_computer/tablet/preset/cargo=1) diff --git a/code/modules/clothing/outfits/plasmaman.dm b/code/modules/clothing/outfits/plasmaman.dm index 05b8c0e1a42c..11a26436d1a5 100644 --- a/code/modules/clothing/outfits/plasmaman.dm +++ b/code/modules/clothing/outfits/plasmaman.dm @@ -212,10 +212,10 @@ mask = /obj/item/clothing/mask/gas/clown_hat gloves = /obj/item/clothing/gloves/color/plasmaman/clown -/datum/outfit/plasmaman/solgov //WS edit sgr - name = "Plasmasolgov" - head = /obj/item/clothing/head/helmet/space/plasmaman/solgov - uniform = /obj/item/clothing/under/plasmaman/solgov +/datum/outfit/plasmaman/terragov + name = "Plasmaterragov" + head = /obj/item/clothing/head/helmet/space/plasmaman/terragov + uniform = /obj/item/clothing/under/plasmaman/terragov gloves = /obj/item/clothing/gloves/color/plasmaman/white /datum/outfit/plasmaman/ngr diff --git a/code/modules/clothing/spacesuits/hardsuit.dm b/code/modules/clothing/spacesuits/hardsuit.dm index 4827186a95c5..cfea52d999a2 100644 --- a/code/modules/clothing/spacesuits/hardsuit.dm +++ b/code/modules/clothing/spacesuits/hardsuit.dm @@ -1202,21 +1202,21 @@ helmettype = /obj/item/clothing/head/helmet/space/hardsuit/security/independent/inteq supports_variations = DIGITIGRADE_VARIATION | VOX_VARIATION -/obj/item/clothing/head/helmet/space/hardsuit/solgov - name = "\improper SolGov hardsuit helmet" +/obj/item/clothing/head/helmet/space/hardsuit/terragov + name = "\improper terragov hardsuit helmet" desc = "An armored spaceproof helmet, its visor is reminiscent of knights of yore." icon_state = "hardsuit0-solgov" item_state = "hardsuit0-solgov" hardsuit_type = "solgov" armor = list("melee" = 50, "bullet" = 45, "laser" = 40, "energy" = 30, "bomb" = 60, "bio" = 100, "rad" = 60, "fire" = 90, "acid" = 75) -/obj/item/clothing/suit/space/hardsuit/solgov +/obj/item/clothing/suit/space/hardsuit/terragov icon_state = "hardsuit_solgov" - name = "\improper SolGov hardsuit" + name = "\improper terragov hardsuit" desc = "An armored spaceproof suit. A powered exoskeleton keeps the suit light and mobile." item_state = "hardsuit_solgov" armor = list("melee" = 50, "bullet" = 45, "laser" = 40, "energy" = 30, "bomb" = 60, "bio" = 100, "rad" = 60, "fire" = 90, "acid" = 75) //intentionally the fucking strong, this is master chief-tier armor //is this really what you call the strong?? is this the best solgov has to offer?????? - helmettype = /obj/item/clothing/head/helmet/space/hardsuit/solgov + helmettype = /obj/item/clothing/head/helmet/space/hardsuit/terragov slowdown = 0 supports_variations = DIGITIGRADE_VARIATION diff --git a/code/modules/clothing/spacesuits/miscellaneous.dm b/code/modules/clothing/spacesuits/miscellaneous.dm index 67dc7ce529b3..893ba2ccd0bc 100644 --- a/code/modules/clothing/spacesuits/miscellaneous.dm +++ b/code/modules/clothing/spacesuits/miscellaneous.dm @@ -513,17 +513,17 @@ Contains: allowed = list(/obj/item/gun, /obj/item/melee/baton, /obj/item/circular_saw, /obj/item/tank/internals, /obj/item/storage/box/pillbottles,\ /obj/item/storage/firstaid, /obj/item/stack/medical/gauze, /obj/item/stack/medical/suture, /obj/item/stack/medical/mesh, /obj/item/storage/bag/chemistry) -/obj/item/clothing/head/helmet/space/solgov - name = "\improper SolGov Vacuum Helmet" +/obj/item/clothing/head/helmet/space/terragov + name = "\improper TerraGov Vacuum Helmet" icon_state = "vachelmet_solgov" desc = "This space-proof helmet is meant to be worn with a matching T-MA suit." item_state = "vachelmet_solgov" armor = list("bio" = 100, "rad" = 50, "fire" = 60, "acid" = 75) -/obj/item/clothing/suit/space/solgov - name = "\improper SolGov Vacuum Suit" +/obj/item/clothing/suit/space/terragov + name = "\improper TerraGov Vacuum Suit" icon_state = "vacsuit_solgov" - desc = "Originally designed by independent contractors on Luna for the purposes of survival in hazardous environments, the lightweight Tortoise Microlite Armored Suit now sees widespread use by SolGov's exploration teams." + desc = "Originally designed by independent contractors on Luna for the purposes of survival in hazardous environments, the lightweight Tortoise Microlite Armored Suit now sees widespread use by TerraGov's exploration teams." item_state = "vacsuit_solgov" allowed = list(/obj/item/gun, /obj/item/ammo_box, /obj/item/ammo_casing, /obj/item/melee/baton, /obj/item/melee/transforming/energy, /obj/item/tank/internals) armor = list("bio" = 100, "rad" = 50, "fire" = 60, "acid" = 75) diff --git a/code/modules/clothing/suits/armor.dm b/code/modules/clothing/suits/armor.dm index 9dfd23210d9c..55d38814e2e3 100644 --- a/code/modules/clothing/suits/armor.dm +++ b/code/modules/clothing/suits/armor.dm @@ -360,28 +360,28 @@ /obj/item/melee/baton, ) -/obj/item/clothing/suit/armor/vest/bulletproof/solgov +/obj/item/clothing/suit/armor/vest/bulletproof/terragov name = "\improper Sonnensoldner gambison" - desc = "A standard armor vest fielded for SolGov's Sonnensoldners." + desc = "A standard armor vest fielded for TerraGov's Sonnensoldners." icon_state = "solgov_gambison" item_state = "solgov_gambison" supports_variations = DIGITIGRADE_VARIATION -/obj/item/clothing/suit/armor/vest/bulletproof/solgov/overseer - name = "\improper SolGov Overseer robe" - desc = "An elaborately designed robe utilized by SolGov overseers." +/obj/item/clothing/suit/armor/vest/bulletproof/terragov/overseer + name = "\improper TerraGov Overseer robe" + desc = "An elaborately designed robe utilized by TerraGov overseers." icon_state = "solgov_overseer_robe" item_state = "solgov_overseer_robe" supports_variations = DIGITIGRADE_VARIATION_NO_NEW_ICON -/obj/item/clothing/suit/armor/vest/bulletproof/solgov/captain - name = "\improper SolGov Captain coat" - desc = "An armored coat typically used by SolGov captains." +/obj/item/clothing/suit/armor/vest/bulletproof/terragov/captain + name = "\improper TerraGov Captain coat" + desc = "An armored coat typically used by TerraGov captains." icon_state = "solgov_coat" item_state = "solgov_coat" supports_variations = DIGITIGRADE_VARIATION_NO_NEW_ICON -/obj/item/clothing/suit/armor/vest/bulletproof/solgov/Initialize() +/obj/item/clothing/suit/armor/vest/bulletproof/terragov/Initialize() . = ..() allowed |= list(/obj/item/gun/ballistic/automatic/assault/swiss_cheese, /obj/item/tank) @@ -416,9 +416,9 @@ cold_protection = CHEST|ARMS heat_protection = CHEST|ARMS -/obj/item/clothing/suit/armor/solgov_trenchcoat - name = "\improper SolGov trenchcoat" - desc = "A solgov official's trenchcoat. Has a lot of pockets." +/obj/item/clothing/suit/armor/terragov_trenchcoat + name = "\improper TerraGov trenchcoat" + desc = "A terragov official's trenchcoat. Has a lot of pockets." icon_state = "armor_solgov_trenchcoat" item_state = "trenchcoat_solgov" body_parts_covered = CHEST|LEGS|ARMS diff --git a/code/modules/clothing/suits/cloaks.dm b/code/modules/clothing/suits/cloaks.dm index 4e3f6d5e3a9c..f38fbcb00936 100644 --- a/code/modules/clothing/suits/cloaks.dm +++ b/code/modules/clothing/suits/cloaks.dm @@ -48,18 +48,18 @@ icon_state = "hopcloak" /obj/item/clothing/neck/cloak/overseer - name = "SolGov overseer's cloak" + name = "TerraGov overseer's cloak" desc = "Worn by the Overseer. It smells faintly of bureaucracy." icon_state = "solgov_cloak" -/obj/item/clothing/neck/cloak/solgov - name = "SolGov weibel" - desc = "Worn by SolGov officials. It smells faintly of bureaucracy." +/obj/item/clothing/neck/cloak/terragov + name = "TerraGov weibel" + desc = "Worn by TerraGov officials. It smells faintly of bureaucracy." icon_state = "solgov_weibel" -/obj/item/clothing/neck/cloak/solgovcap - name = "SolGov captain's cloak" - desc = "Worn by SolGov captains. It smells faintly of bureaucracy." +/obj/item/clothing/neck/cloak/terragovcap + name = "TerraGov captain's cloak" + desc = "Worn by TerraGov captains. It smells faintly of bureaucracy." icon_state = "solgov_cap_cloak" /obj/item/clothing/neck/cloak/trans @@ -68,8 +68,8 @@ icon_state = "trans" /obj/item/clothing/neck/cloak/bi - name = "solarian marine biologist cloak" - desc = "Commonly worn by members of the Solarian Marine Biologist Society, dedicated to the study and preservation of marine wildlife." + name = "terran marine biologist cloak" + desc = "Commonly worn by members of the Terran Marine Biologist Society, dedicated to the study and preservation of marine wildlife." icon_state = "bi" /obj/item/clothing/suit/hooded/cloak/goliath diff --git a/code/modules/clothing/suits/jobs.dm b/code/modules/clothing/suits/jobs.dm index 56018c288b6a..afe6af479923 100644 --- a/code/modules/clothing/suits/jobs.dm +++ b/code/modules/clothing/suits/jobs.dm @@ -85,9 +85,9 @@ resistance_flags = NONE pocket_storage_component_path = /datum/component/storage/concrete/pockets/exo/large -/obj/item/clothing/suit/hazardvest/solgov - name = "SolGov hazard vest" - desc = "A high-visibility vest used in work zones by solarian engineers." +/obj/item/clothing/suit/hazardvest/terragov + name = "TerraGov hazard vest" + desc = "A high-visibility vest used in work zones by terran engineers." icon_state = "hazard_solgov" item_state = "hazard_solgov" blood_overlay_type = "armor" @@ -207,54 +207,54 @@ icon_state = "surgical" allowed = list(/obj/item/scalpel, /obj/item/cautery, /obj/item/hemostat, /obj/item/retractor) -//SolGov suits +//TerraGov suits -/obj/item/clothing/suit/solgov - name = "SolGov robe" - desc = "A set of plain SolGov robes, commonly used by civilians." +/obj/item/clothing/suit/terragov + name = "Terragov robe" + desc = "A set of plain Terragov robes, commonly used by civilians." body_parts_covered = CHEST|GROIN|ARMS icon_state = "solgov_robe" item_state = "solgov_robe" -/obj/item/clothing/suit/solgov/dress - name = "SolGov dress" - desc = "A plain SolGov dress, commonly used by civilians." +/obj/item/clothing/suit/terragov/dress + name = "Terragov dress" + desc = "A plain Terragov dress, commonly used by civilians." body_parts_covered = CHEST|GROIN icon_state = "solgov_dress" item_state = "solgov_dress" -/obj/item/clothing/suit/solgov/suit - name = "SolGov suit" - desc = "A formal SolGov suit, commonly used by civilians." +/obj/item/clothing/suit/terragov/suit + name = "Terragov suit" + desc = "A formal Terragov suit, commonly used by civilians." body_parts_covered = CHEST|GROIN icon_state = "solgov_suit" item_state = "solgov_suit" -/obj/item/clothing/suit/solgov/bureaucrat - name = "SolGov bureaucrat robe" - desc = "A set of unique SolGov robes, utilized by Solarian Bureaucrats." +/obj/item/clothing/suit/terragov/bureaucrat + name = "Terragov bureaucrat robe" + desc = "A set of unique Terragov robes, utilized by Terran Bureaucrats." body_parts_covered = CHEST|GROIN|ARMS icon_state = "solgov_bureaucrat_robe" item_state = "solgov_bureaucrat_robe" -/obj/item/clothing/suit/solgov/overcoat - name = "SolGov overcoat" - desc = "A traditional solarian overcoat, used by cilivians and ship crews alike." +/obj/item/clothing/suit/terragov/overcoat + name = "Terragov overcoat" + desc = "A traditional Terran overcoat, used by cilivians and ship crews alike." body_parts_covered = CHEST|GROIN|ARMS icon_state = "solgov_overcoat" item_state = "solgov_overcoat" supports_variations = DIGITIGRADE_VARIATION -/obj/item/clothing/suit/solgov/jacket - name = "SolGov jacket" - desc = "A plain SolGov jacket, commonly used by civilians." +/obj/item/clothing/suit/terragov/jacket + name = "Terragov jacket" + desc = "A plain Terragov jacket, commonly used by civilians." body_parts_covered = CHEST|GROIN|ARMS icon_state = "solgov_jacket" item_state = "solgov_jacket" -/obj/item/clothing/suit/toggle/solgov - name = "\improper SolGov coat" - desc = "An armored coat worn for special occasions. This one is dyed in SolGov blue." +/obj/item/clothing/suit/toggle/terragov + name = "\improper Terragov coat" + desc = "An armored coat worn for special occasions. This one is dyed in Terragov blue." body_parts_covered = CHEST|GROIN|ARMS|HANDS icon_state = "coat_solgov" item_state = "coat_solgov" @@ -262,7 +262,7 @@ togglename = "buttons" armor = list("melee" = 35, "bullet" = 30, "laser" = 30, "energy" = 40, "bomb" = 25, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 50) -/obj/item/clothing/suit/toggle/solgov/terragov +/obj/item/clothing/suit/toggle/terragov/terragov name = "\improper Terragov coat" desc = "An armored coat worn for special occasions. This one is still dyed in original TerraGov green." icon_state = "coat_terragov" diff --git a/code/modules/clothing/suits/wintercoats.dm b/code/modules/clothing/suits/wintercoats.dm index 9b141148e5a2..7d5244c751e0 100644 --- a/code/modules/clothing/suits/wintercoats.dm +++ b/code/modules/clothing/suits/wintercoats.dm @@ -251,14 +251,14 @@ /obj/item/clothing/head/hooded/winterhood/centcom icon_state = "hood_centcom" -// SolGov +// TerraGov -/obj/item/clothing/suit/hooded/wintercoat/solgov - name = "solgov winter coat" - desc = "An environment-resistant wintercoat in the colors of the Solarian Confederation." +/obj/item/clothing/suit/hooded/wintercoat/terragov + name = "terragov winter coat" + desc = "An environment-resistant wintercoat in the colors of the Terran Confederation." icon_state = "coatsolgov" item_state = "coatsolgov" - hoodtype = /obj/item/clothing/head/hooded/winterhood/solgov + hoodtype = /obj/item/clothing/head/hooded/winterhood/terragov -/obj/item/clothing/head/hooded/winterhood/solgov - icon_state = "hood_solgov" +/obj/item/clothing/head/hooded/winterhood/terragov + icon_state = "hood_terragov" diff --git a/code/modules/clothing/under/accessories.dm b/code/modules/clothing/under/accessories.dm index f7710d52a12d..d0524a9c8d95 100644 --- a/code/modules/clothing/under/accessories.dm +++ b/code/modules/clothing/under/accessories.dm @@ -464,9 +464,9 @@ new /obj/item/ammo_box/magazine/m45(src) new /obj/item/ammo_box/magazine/m45(src) -/obj/item/clothing/accessory/waistcoat/solgov - name = "solgov waistcoat" - desc = "A standard issue waistcoat in solgov colors." +/obj/item/clothing/accessory/waistcoat/terragov + name = "terragov waistcoat" + desc = "A standard issue waistcoat in terragov colors." icon_state = "solgov_waistcoat" ////////// diff --git a/code/modules/clothing/under/solgov.dm b/code/modules/clothing/under/solgov.dm index d9048be898f5..498c7b2308ef 100644 --- a/code/modules/clothing/under/solgov.dm +++ b/code/modules/clothing/under/solgov.dm @@ -1,5 +1,5 @@ -/obj/item/clothing/under/solgov - name = "\improper SolGov tunic" +/obj/item/clothing/under/terragov + name = "\improper Terragov tunic" desc = "Standard combat tunic used by Sonnensoldners." icon = 'icons/obj/clothing/under/solgov.dmi' mob_overlay_icon = 'icons/mob/clothing/under/solgov.dmi' @@ -10,7 +10,7 @@ can_adjust = FALSE supports_variations = DIGITIGRADE_VARIATION -/obj/item/clothing/under/solgov/terragov +/obj/item/clothing/under/terragov/terragov name = "\improper TerraGov tunic" desc = "Specialized combat tunic utilized by Sonnensoldners serving the Terran Regency." icon_state = "terragov_tunic" @@ -18,45 +18,45 @@ armor = list("melee" = 15, "fire" = 30, "acid" = 30) can_adjust = FALSE -/obj/item/clothing/under/solgov/dress - name = "\improper SolGov dress" - desc = "A formal SolGov white dress, used by civilians and officials alike." +/obj/item/clothing/under/terragov/dress + name = "\improper Terragov dress" + desc = "A formal Terragov white dress, used by civilians and officials alike." icon_state = "solgov_dress" item_state = "solgov_dress" -/obj/item/clothing/under/solgov/formal - name = "\improper SolGov formal suit" - desc = "A formal SolGov uniform, commonly used by representatives and officials." +/obj/item/clothing/under/terragov/formal + name = "\improper Terragov formal suit" + desc = "A formal Terragov uniform, commonly used by representatives and officials." icon_state = "formal_solgov" item_state = "formal_solgov" can_adjust = FALSE -/obj/item/clothing/under/solgov/formal/skirt - name = "\improper SolGov formal suitskirt" - desc = "A formal SolGov uniform, commonly used by representatives and officials." +/obj/item/clothing/under/terragov/formal/skirt + name = "\improper Terragov formal suitskirt" + desc = "A formal Terragov uniform, commonly used by representatives and officials." icon_state = "formal_solgov_skirt" item_state = "formal_solgov_skirt" can_adjust = FALSE -/obj/item/clothing/under/solgov/formal/terragov +/obj/item/clothing/under/terragov/formal/terragov name = "\improper TerraGov formal uniform" - desc = "A formal SolGov uniform, for special occasions. This one is colored in original TerraGov green." + desc = "A formal Terragov uniform, for special occasions. This one is colored in original TerraGov green." icon_state = "formal_terragov" item_state = "formal_terragov" can_adjust = FALSE -/obj/item/clothing/under/plasmaman/solgov - name = "\improper SolGov envirosuit" - desc = "The pride of Solarian plasmamen everywhere- though this tends to be a somewhat exclusive club, due to Sol's agressive workplace safety regulations." - icon = 'icons/obj/clothing/under/solgov.dmi' //ogan i am going to kill you i stg +/obj/item/clothing/under/plasmaman/terragov + name = "\improper Terragov envirosuit" + desc = "The pride of Terran plasmamen everywhere- though this tends to be a somewhat exclusive club, due to Terras agressive workplace safety regulations." + icon = 'icons/obj/clothing/under/solgov.dmi' //ogan i am going to kill you i stg //lol??? mob_overlay_icon = 'icons/mob/clothing/under/solgov.dmi' icon_state = "plasma_solgov" item_state = "plasma_solgov" can_adjust = FALSE -/obj/item/clothing/under/solgov/formal/captain - name = "\improper SolGov captain uniform" - desc = "A formal SolGov uniform, utilized by captains of SolGov vessels." +/obj/item/clothing/under/terragov/formal/captain + name = "\improper Terragov captain uniform" + desc = "A formal Terragov uniform, utilized by captains of Terragov vessels." icon_state = "solgov_captain" item_state = "solgov_captain" can_adjust = FALSE diff --git a/code/modules/jobs/access.dm b/code/modules/jobs/access.dm index a63b345a1f3b..204064b934d2 100644 --- a/code/modules/jobs/access.dm +++ b/code/modules/jobs/access.dm @@ -186,8 +186,8 @@ ACCESS_THEATRE, ACCESS_RESEARCH, ACCESS_MINING, ACCESS_MAILSORTING, ACCESS_WEAPONS, ACCESS_MECH_MINING, ACCESS_MECH_ENGINE, ACCESS_MECH_SCIENCE, ACCESS_MECH_SECURITY, ACCESS_MECH_MEDICAL, ACCESS_VAULT, ACCESS_MINING_STATION, ACCESS_XENOBIOLOGY, ACCESS_CE, ACCESS_HOP, ACCESS_HOS, ACCESS_PHARMACY, ACCESS_RC_ANNOUNCE, - ACCESS_KEYCARD_AUTH, ACCESS_TCOMSAT, ACCESS_GATEWAY, ACCESS_MINERAL_STOREROOM, ACCESS_MINISAT, ACCESS_NETWORK, ACCESS_CLONING, ACCESS_SOLGOV - ) //WS Edit - SolGov Rep + ACCESS_KEYCARD_AUTH, ACCESS_TCOMSAT, ACCESS_GATEWAY, ACCESS_MINERAL_STOREROOM, ACCESS_MINISAT, ACCESS_NETWORK, ACCESS_CLONING, ACCESS_TERRAGOV + ) /proc/get_all_centcom_access() return list(ACCESS_CENT_GENERAL, ACCESS_CENT_THUNDER, ACCESS_CENT_SPECOPS, ACCESS_CENT_MEDICAL, ACCESS_CENT_LIVING, ACCESS_CENT_STORAGE, ACCESS_CENT_TELEPORTER, ACCESS_CENT_CAPTAIN) @@ -223,7 +223,7 @@ if(6) //supply return list(ACCESS_MAILSORTING, ACCESS_MINING, ACCESS_MINING_STATION, ACCESS_MECH_MINING, ACCESS_MINERAL_STOREROOM, ACCESS_CARGO, ACCESS_QM, ACCESS_VAULT) if(7) //command - return list(ACCESS_HEADS, ACCESS_RC_ANNOUNCE, ACCESS_KEYCARD_AUTH, ACCESS_CHANGE_IDS, ACCESS_AI_UPLOAD, ACCESS_TELEPORTER, ACCESS_EVA, ACCESS_GATEWAY, ACCESS_ALL_PERSONAL_LOCKERS, ACCESS_HOP, ACCESS_CAPTAIN, ACCESS_VAULT, ACCESS_SOLGOV) + return list(ACCESS_HEADS, ACCESS_RC_ANNOUNCE, ACCESS_KEYCARD_AUTH, ACCESS_CHANGE_IDS, ACCESS_AI_UPLOAD, ACCESS_TELEPORTER, ACCESS_EVA, ACCESS_GATEWAY, ACCESS_ALL_PERSONAL_LOCKERS, ACCESS_HOP, ACCESS_CAPTAIN, ACCESS_VAULT, ACCESS_TERRAGOV) /proc/get_region_accesses_name(code) switch(code) @@ -382,8 +382,8 @@ //WS Begin if(ACCESS_CLONING) return "Cloning Room" - if(ACCESS_SOLGOV) - return "SolGov Office" + if(ACCESS_TERRAGOV) + return "TerraGov Office" //WS End /proc/get_centcom_access_desc(A) @@ -410,8 +410,8 @@ /proc/get_all_jobs() return list("Assistant", "Captain", "Head of Personnel", "Bartender", "Cook", "Botanist", "Quartermaster", "Cargo Technician", "Shaft Miner", "Clown", "Mime", "Janitor", "Curator", "Lawyer", "Chaplain", "Chief Engineer", "Station Engineer", - "Atmospheric Technician", "Chief Medical Officer", "Medical Doctor", "Chemist", "Geneticist", "Virologist", "Paramedic", "Prisoner", "Psychologist", //WS Edit - Brig Phys / SolGov Rep - "Research Director", "Scientist", "Roboticist", "Head of Security", "Warden", "Detective", "Security Officer", "Brig Physician", "SolGov Representative") //WS Edit - Brig Phys / SolGov Rep + "Atmospheric Technician", "Chief Medical Officer", "Medical Doctor", "Chemist", "Geneticist", "Virologist", "Paramedic", "Prisoner", "Psychologist", + "Research Director", "Scientist", "Roboticist", "Head of Security", "Warden", "Detective", "Security Officer", "Brig Physician", "TerraGov Representative") /proc/get_all_job_icons() //For all existing HUD icons return get_all_jobs() + list("Emergency Response Team Commander", "Security Response Officer", "Engineering Response Officer", "Medical Response Officer", "Entertainment Response Officer", "Religious Response Officer", "Janitorial Response Officer", "Death Commando") diff --git a/code/modules/jobs/job_types/solgov_rep.dm b/code/modules/jobs/job_types/solgov_rep.dm index f95b520e2850..dec50819679b 100644 --- a/code/modules/jobs/job_types/solgov_rep.dm +++ b/code/modules/jobs/job_types/solgov_rep.dm @@ -1,17 +1,17 @@ /* -SolGov Representative +Terragov Representative */ -/datum/job/solgov - name = "SolGov Representative" +/datum/job/terragov + name = "TerraGov Representative" wiki_page = "Government_Attaché" minimal_player_age = 7 officer = TRUE access = list(ACCESS_LAWYER, ACCESS_COURT, ACCESS_SECURITY, ACCESS_BRIG, ACCESS_SEC_DOORS, ACCESS_WEAPONS, - ACCESS_HEADS, ACCESS_MAINT_TUNNELS, ACCESS_RC_ANNOUNCE, ACCESS_KEYCARD_AUTH, ACCESS_SOLGOV) + ACCESS_HEADS, ACCESS_MAINT_TUNNELS, ACCESS_RC_ANNOUNCE, ACCESS_KEYCARD_AUTH, ACCESS_TERRAGOV) minimal_access = list(ACCESS_LAWYER, ACCESS_COURT, ACCESS_SECURITY, ACCESS_BRIG, ACCESS_SEC_DOORS, ACCESS_WEAPONS, - ACCESS_HEADS, ACCESS_MAINT_TUNNELS, ACCESS_RC_ANNOUNCE, ACCESS_KEYCARD_AUTH, ACCESS_SOLGOV) + ACCESS_HEADS, ACCESS_MAINT_TUNNELS, ACCESS_RC_ANNOUNCE, ACCESS_KEYCARD_AUTH, ACCESS_TERRAGOV) - display_order = JOB_DISPLAY_ORDER_SOLGOV + display_order = JOB_DISPLAY_ORDER_TERRAGOV diff --git a/code/modules/jobs/jobs.dm b/code/modules/jobs/jobs.dm index a5ff698fcfc9..4ca62c4072a7 100644 --- a/code/modules/jobs/jobs.dm +++ b/code/modules/jobs/jobs.dm @@ -1,7 +1,7 @@ GLOBAL_LIST_INIT(command_positions, list( "Captain", "Head of Personnel", - "SolGov Representative", //WS edit - SolGov Rep + "TerraGov Representative", "Head of Security", "Chief Engineer", "Research Director", @@ -37,7 +37,7 @@ GLOBAL_LIST_INIT(supply_positions, list( GLOBAL_LIST_INIT(service_positions, list( "Head of Personnel", - "SolGov Representative", //WS Edit - SolGov Rep + "TerraGov Representative", "Bartender", "Botanist", "Cook", diff --git a/code/modules/mob/living/carbon/human/species_types/plasmamen.dm b/code/modules/mob/living/carbon/human/species_types/plasmamen.dm index d3c900c56786..c223f25bc943 100644 --- a/code/modules/mob/living/carbon/human/species_types/plasmamen.dm +++ b/code/modules/mob/living/carbon/human/species_types/plasmamen.dm @@ -166,8 +166,8 @@ if("Clown") O = new /datum/outfit/plasmaman/clown - if("SolGov Representative") //WS edit sgr - O = new /datum/outfit/plasmaman/solgov + if("TerraGov Representative") + O = new /datum/outfit/plasmaman/terragov var/holder //WS Edit Begin - Plasma skirtsuit prefs switch(H.jumpsuit_style) diff --git a/code/modules/mob/living/living_say.dm b/code/modules/mob/living/living_say.dm index 1e40ddf76704..2ee0ac800dbc 100644 --- a/code/modules/mob/living/living_say.dm +++ b/code/modules/mob/living/living_say.dm @@ -13,7 +13,7 @@ GLOBAL_LIST_INIT(department_radio_keys, list( // Faction RADIO_KEY_SYNDICATE = RADIO_CHANNEL_SYNDICATE, RADIO_KEY_CENTCOM = RADIO_CHANNEL_CENTCOM, - RADIO_KEY_SOLGOV = RADIO_CHANNEL_SOLGOV, //WS Edit - SolGov Rep + RADIO_KEY_TERRAGOV = RADIO_CHANNEL_TERRAGOV, RADIO_KEY_NANOTRASEN = RADIO_CHANNEL_NANOTRASEN, RADIO_KEY_MINUTEMEN = RADIO_CHANNEL_MINUTEMEN, RADIO_KEY_PGF = RADIO_CHANNEL_PGF, diff --git a/code/modules/mob/living/simple_animal/corpse.dm b/code/modules/mob/living/simple_animal/corpse.dm index 1b8004cbd5b5..5428b7905f62 100644 --- a/code/modules/mob/living/simple_animal/corpse.dm +++ b/code/modules/mob/living/simple_animal/corpse.dm @@ -246,8 +246,8 @@ id = /obj/item/card/id glasses = /obj/item/clothing/glasses/hud/health -/obj/effect/mob_spawn/human/corpse/solgov/sonnensoldner - name = "SolGov Sonnensoldner" - id_job = "SolGov Sonnensoldner" - outfit = /datum/outfit/job/solgov/sonnensoldner - id_access_list = list(ACCESS_SOLGOV) +/obj/effect/mob_spawn/human/corpse/terragov/sonnensoldner + name = "Terragov Sonnensoldner" + id_job = "Terragov Sonnensoldner" + outfit = /datum/outfit/job/terragov/sonnensoldner + id_access_list = list(ACCESS_TERRAGOV) diff --git a/code/modules/mob/living/simple_animal/parrot.dm b/code/modules/mob/living/simple_animal/parrot.dm index bc22f78ae7a3..08ccc35e4912 100644 --- a/code/modules/mob/living/simple_animal/parrot.dm +++ b/code/modules/mob/living/simple_animal/parrot.dm @@ -266,8 +266,8 @@ available_channels.Add(RADIO_TOKEN_MINUTEMEN) if(RADIO_CHANNEL_INTEQ) available_channels.Add(RADIO_TOKEN_INTEQ) - if(RADIO_CHANNEL_SOLGOV) - available_channels.Add(RADIO_TOKEN_SOLGOV) + if(RADIO_CHANNEL_TERRAGOV) + available_channels.Add(RADIO_TOKEN_TERRAGOV) if(RADIO_CHANNEL_SYNDICATE) available_channels.Add(RADIO_TOKEN_SYNDICATE) if(RADIO_CHANNEL_PIRATE) diff --git a/code/modules/overmap/helm.dm b/code/modules/overmap/helm.dm index 5b1f27fa2cb9..0b48f08b6289 100644 --- a/code/modules/overmap/helm.dm +++ b/code/modules/overmap/helm.dm @@ -39,10 +39,10 @@ icon_state = "computer-retro" deconpath = /obj/structure/frame/computer/retro -/obj/machinery/computer/helm/solgov +/obj/machinery/computer/helm/terragov icon = 'icons/obj/machines/retro_computer.dmi' icon_state = "computer-solgov" - deconpath = /obj/structure/frame/computer/solgov + deconpath = /obj/structure/frame/computer/terragov /datum/config_entry/number/bluespace_jump_wait default = 30 MINUTES diff --git a/code/modules/overmap/missions/acquire_mission.dm b/code/modules/overmap/missions/acquire_mission.dm index de60174081db..5d38399dff00 100644 --- a/code/modules/overmap/missions/acquire_mission.dm +++ b/code/modules/overmap/missions/acquire_mission.dm @@ -127,7 +127,7 @@ Acquire: Anomaly "CMM-GOLD", "Nanotrasen Anomalous Studies Division", "The Naturalienwissenschaftlicher Studentenverbindungs-Verband", - "The Central Solarian Anomaly Research Agency", + "The Central Terran Anomaly Research Agency", "DeForest Medical R&D", "A strange lizard on the outpost" )) diff --git a/code/modules/paperwork/fax.dm b/code/modules/paperwork/fax.dm index bce7a3f322c5..a3fbfee4ecc2 100644 --- a/code/modules/paperwork/fax.dm +++ b/code/modules/paperwork/fax.dm @@ -62,7 +62,7 @@ list(fax_name = "Nanotrasen Central Command", fax_id = "nanotrasen", color = "green", emag_needed = FALSE), list(fax_name = "Outpost Authority", fax_id = "outpost", color = "orange", emag_needed = FALSE), list(fax_name = "IRMG Mothership", fax_id = "inteq", color = "yellow", emag_needed = FALSE), - list(fax_name = "Solarian Confederation Frontier Affairs", fax_id = "solgov", color = "teal", emag_needed = FALSE), + list(fax_name = "Terran Confederation Frontier Affairs", fax_id = "terragov", color = "teal", emag_needed = FALSE), list(fax_name = "Roumain Council of Huntsmen", fax_id = "roumain", color = "brown", emag_needed = FALSE), list(fax_name = "Confederated League Leadership", fax_id = "minutemen", color = "blue", emag_needed = FALSE), list(fax_name = "Syndicate Coalition Coordination Center", fax_id = "syndicate", color = "red", emag_needed = FALSE), @@ -544,10 +544,10 @@ list(fax_name = "Frontiersmen Communications Quartermaster", fax_id = "frontiersmen", color = "black", emag_needed = TRUE) ) -/obj/machinery/fax/solgov +/obj/machinery/fax/terragov special_networks = list( list(fax_name = "Outpost Authority", fax_id = "outpost", color = "orange", emag_needed = FALSE), - list(fax_name = "Solarian Confederation Frontier Affairs", fax_id = "solgov", color = "teal", emag_needed = FALSE), + list(fax_name = "Terran Confederation Frontier Affairs", fax_id = "terragov", color = "teal", emag_needed = FALSE), list(fax_name = "Frontiersmen Communications Quartermaster", fax_id = "frontiersmen", color = "black", emag_needed = TRUE) ) @@ -571,10 +571,10 @@ fax_name = "Outpost Authority" admin_fax_id = "outpost" -/obj/machinery/fax/admin/solgov - name = "SolGov Frontier Affairs Fax Machine" - fax_name = "Solarian Confederation Frontier Affairs" - admin_fax_id = "solgov" +/obj/machinery/fax/admin/terragov + name = "TerraGov Frontier Affairs Fax Machine" + fax_name = "Terran Confederation Frontier Affairs" + admin_fax_id = "terragov" /obj/machinery/fax/admin/syndicate name = "Syndicate Coordination Fax Machine" diff --git a/code/modules/paperwork/folders_premade.dm b/code/modules/paperwork/folders_premade.dm index 3c9dbb89feae..de020a3a6b2f 100644 --- a/code/modules/paperwork/folders_premade.dm +++ b/code/modules/paperwork/folders_premade.dm @@ -14,9 +14,9 @@ desc = "A white folder." icon_state = "folder_white" -/obj/item/folder/solgov - desc = "A blue folder with a SolGov seal." - icon_state = "folder_solgov" +/obj/item/folder/terragov + desc = "A blue folder with a Terragov seal." + icon_state = "folder_terragov" /obj/item/folder/terragov desc = "A green folder with a Terran Regency seal." @@ -52,9 +52,9 @@ /obj/item/folder/documents/syndicate/mining document = /obj/item/documents/syndicate/mining -/obj/item/folder/documents/solgov - document = /obj/item/documents/solgov - desc = "A blue folder with a SolGov seal." +/obj/item/folder/documents/terragov + document = /obj/item/documents/terragov + desc = "A blue folder with a TerraGov seal." icon_state = "folder_solgovred" /obj/item/folder/documents/terragov diff --git a/code/modules/paperwork/pen.dm b/code/modules/paperwork/pen.dm index cd913c57fb0a..9a33bcf2c4dd 100644 --- a/code/modules/paperwork/pen.dm +++ b/code/modules/paperwork/pen.dm @@ -257,10 +257,20 @@ /obj/item/pen/solgov name = "\improper SolGov pen" - desc = "A pen with SolGov's insignia on the side." + desc = "A pen with SolGov's insignia on the side. You feel like stealing it..." + icon_state = "pen-sg" + +/obj/item/pen/terragov + name = "\improper TerraGov pen" + desc = "A pen with TerraGov's insignia on the side." icon_state = "pen-sg" /obj/item/pen/fountain/solgov name = "\improper SolGov fountain pen" - desc = "A fancy fountain pen with SolGov's insignia emblazoned onto the wood." + desc = "A fancy fountain pen with SolGov's insignia emblazoned onto the wood. It feels powerful. You feel like stealing it... You won't get in trouble for picking it up, will you? It is totally safe to take. The gods won't banish you permanently for this, I am sure!" + icon_state = "pen-fountain-sg" + +/obj/item/pen/fountain/terragov + name = "\improper TerraGov fountain pen" + desc = "A fancy fountain pen with TerraGov's insignia emblazoned onto the wood." icon_state = "pen-fountain-sg" diff --git a/code/modules/paperwork/stamps.dm b/code/modules/paperwork/stamps.dm index 45893f8d5fc5..10f3c95f6bcf 100644 --- a/code/modules/paperwork/stamps.dm +++ b/code/modules/paperwork/stamps.dm @@ -101,8 +101,8 @@ icon_state = "stamp-cybersun" dye_color = DYE_SYNDICATE -/obj/item/stamp/solgov - name = "SolGov rubber stamp" +/obj/item/stamp/terragov + name = "Terragov rubber stamp" icon_state = "stamp-solgov" /obj/item/stamp/inteq diff --git a/code/modules/power/cell.dm b/code/modules/power/cell.dm index 1a2f87c70dd9..366dc041ff35 100644 --- a/code/modules/power/cell.dm +++ b/code/modules/power/cell.dm @@ -459,8 +459,8 @@ charge = 0 update_appearance() -/obj/item/stock_parts/cell/gun/solgov - name = "SolGov power cell" +/obj/item/stock_parts/cell/gun/terragov + name = "Terragov power cell" icon_state = "g-sg-cell" /obj/item/stock_parts/cell/gun/large diff --git a/code/modules/power/monitor.dm b/code/modules/power/monitor.dm index debdba4946bf..c3c5f524e6ae 100644 --- a/code/modules/power/monitor.dm +++ b/code/modules/power/monitor.dm @@ -26,10 +26,10 @@ icon_state = "computer-retro" deconpath = /obj/structure/frame/computer/retro -/obj/machinery/computer/monitor/solgov +/obj/machinery/computer/monitor/terragov icon = 'icons/obj/machines/retro_computer.dmi' icon_state = "computer-solgov" - deconpath = /obj/structure/frame/computer/solgov + deconpath = /obj/structure/frame/computer/terragov /obj/machinery/computer/monitor/secret //Hides the power monitor (such as ones on ruins & CentCom) from PDA's to prevent metagaming. name = "outdated power monitoring console" diff --git a/code/modules/projectiles/boxes_magazines/ammo_boxes.dm b/code/modules/projectiles/boxes_magazines/ammo_boxes.dm index 6246f8f9bf32..0e13c2fc8694 100644 --- a/code/modules/projectiles/boxes_magazines/ammo_boxes.dm +++ b/code/modules/projectiles/boxes_magazines/ammo_boxes.dm @@ -335,7 +335,7 @@ /obj/item/ammo_box/c556mmHITP name = "ammo box (5.56mm HITP caseless)" - desc = "A box of 5.56mm HITP caseless ammo, a SolGov standard." + desc = "A box of 5.56mm HITP caseless ammo, a Terragov standard." icon_state = "556mmHITPbox" ammo_type = /obj/item/ammo_casing/caseless/c556mm max_ammo = 50 diff --git a/code/modules/projectiles/boxes_magazines/external/rifle.dm b/code/modules/projectiles/boxes_magazines/external/rifle.dm index 548350f20415..6f844881d2e7 100644 --- a/code/modules/projectiles/boxes_magazines/external/rifle.dm +++ b/code/modules/projectiles/boxes_magazines/external/rifle.dm @@ -22,7 +22,7 @@ multiple_sprites = AMMO_BOX_FULL_EMPTY /obj/item/ammo_box/magazine/rifle47x33mm - name = "\improper Solarian LMG magazine (4.73x33mm caseless)" + name = "\improper Terran LMG magazine (4.73x33mm caseless)" desc = "A large, 50-round magazine for the Solar machine gun. These rounds do moderate damage with good armor penetration." icon_state = "47x33mm-50" base_icon_state = "47x33mm" diff --git a/code/modules/projectiles/boxes_magazines/internal/rifle.dm b/code/modules/projectiles/boxes_magazines/internal/rifle.dm index 4f2f8c537958..be73b16fbf0f 100644 --- a/code/modules/projectiles/boxes_magazines/internal/rifle.dm +++ b/code/modules/projectiles/boxes_magazines/internal/rifle.dm @@ -6,7 +6,7 @@ max_ammo = 5 instant_load = TRUE -/obj/item/ammo_box/magazine/internal/boltaction/solgov +/obj/item/ammo_box/magazine/internal/boltaction/terragov name = "SSG-669C internal magazine" ammo_type = /obj/item/ammo_casing/caseless/a858 caliber = "a858" diff --git a/code/modules/projectiles/guns/ballistic/gauss.dm b/code/modules/projectiles/guns/ballistic/gauss.dm index c50f906e4eba..910227627d65 100644 --- a/code/modules/projectiles/guns/ballistic/gauss.dm +++ b/code/modules/projectiles/guns/ballistic/gauss.dm @@ -29,13 +29,13 @@ /obj/item/gun/ballistic/automatic/powered/gauss/modelh name = "Model H" - desc = "A standard-issue pistol exported from the Solarian Confederation. It fires slow flesh-rending ferromagnetic slugs at a high energy cost, however they are ineffective on any armor." + desc = "A standard-issue pistol exported from the Terran Confederation. It fires slow flesh-rending ferromagnetic slugs at a high energy cost, however they are ineffective on any armor." mag_type = /obj/item/ammo_box/magazine/modelh icon_state = "model-h" item_state = "model-h" fire_sound = 'sound/weapons/gun/gauss/modelh.ogg' load_sound = 'sound/weapons/gun/gauss/pistol_reload.ogg' - cell_type = /obj/item/stock_parts/cell/gun/solgov + cell_type = /obj/item/stock_parts/cell/gun/terragov slot_flags = ITEM_SLOT_BELT w_class = WEIGHT_CLASS_SMALL fire_delay = 0.6 SECONDS //pistol, but heavy caliber. @@ -49,21 +49,21 @@ fire_select_icon_state_prefix = "slug_" /obj/item/gun/ballistic/automatic/powered/gauss/modelh/suns - desc = "A standard-issue pistol exported from the Solarian Confederation. It fires slow flesh-rending ferromagnetic slugs at a high energy cost, however they are ineffective on any armor. It is painted in the colors of SUNS." + desc = "A standard-issue pistol exported from the Terran Confederation. It fires slow flesh-rending ferromagnetic slugs at a high energy cost, however they are ineffective on any armor. It is painted in the colors of SUNS." mag_type = /obj/item/ammo_box/magazine/modelh icon_state = "model-h_suns" item_state = "model-h_suns" /obj/item/gun/ballistic/automatic/powered/gauss/claris name = "Claris" - desc = "An antiquated Solarian rifle. Chambered in ferromagnetic pellets, just as the founding Solarians intended." + desc = "An antiquated Terran rifle. Chambered in ferromagnetic pellets, just as the founding Terrans intended." mag_type = /obj/item/ammo_box/magazine/internal/claris icon = 'icons/obj/guns/48x32guns.dmi' icon_state = "claris" item_state = "claris" fire_sound = 'sound/weapons/gun/gauss/claris.ogg' load_sound = 'sound/weapons/gun/gauss/sniper_reload.ogg' - cell_type = /obj/item/stock_parts/cell/gun/solgov + cell_type = /obj/item/stock_parts/cell/gun/terragov fire_delay = 0.4 SECONDS bolt_type = BOLT_TYPE_NO_BOLT internal_magazine = TRUE @@ -73,20 +73,20 @@ fire_select_icon_state_prefix = "pellet_" /obj/item/gun/ballistic/automatic/powered/gauss/claris/suns - desc = "An antiquated Solarian rifle. Chambered in ferromagnetic pellets, just as the founding Solarians intended. Evidently, SUNS' founders echo the sentiment, as it appears to be painted in their colors." + desc = "An antiquated Terran rifle. Chambered in ferromagnetic pellets, just as the founding Terrans intended. Evidently, SUNS' founders echo the sentiment, as it appears to be painted in their colors." icon_state = "claris_suns" item_state = "claris_suns" /obj/item/gun/ballistic/automatic/powered/gauss/gar name = "Solar 'GAR' Carbine" - desc = "A Solarian carbine, unusually modern for its producers. Launches ferromagnetic lances at alarming speeds." + desc = "A Terran carbine, unusually modern for its producers. Launches ferromagnetic lances at alarming speeds." mag_type = /obj/item/ammo_box/magazine/gar icon = 'icons/obj/guns/48x32guns.dmi' icon_state = "gar" item_state = "gar" fire_sound = 'sound/weapons/gun/gauss/gar.ogg' load_sound = 'sound/weapons/gun/gauss/rifle_reload.ogg' - cell_type = /obj/item/stock_parts/cell/gun/solgov + cell_type = /obj/item/stock_parts/cell/gun/terragov burst_size = 1 fire_delay = 0.2 SECONDS @@ -102,6 +102,6 @@ fire_select_icon_state_prefix = "lance_" /obj/item/gun/ballistic/automatic/powered/gauss/gar/suns - desc = "A Solarian carbine, unusually modern for its producers. It's just modern enough for SUNS, however, who have painted the weapon in their colors. Launches ferromagnetic lances at alarming speeds." + desc = "A Terran carbine, unusually modern for its producers. It's just modern enough for SUNS, however, who have painted the weapon in their colors. Launches ferromagnetic lances at alarming speeds." icon_state = "gar_suns" item_state = "gar_suns" diff --git a/code/modules/projectiles/guns/ballistic/launchers.dm b/code/modules/projectiles/guns/ballistic/launchers.dm index 5619b039d488..ad7bdc89da45 100644 --- a/code/modules/projectiles/guns/ballistic/launchers.dm +++ b/code/modules/projectiles/guns/ballistic/launchers.dm @@ -71,9 +71,9 @@ /obj/item/gun/ballistic/rocketlauncher/attack_self_tk(mob/user) return //too difficult to remove the rocket with TK -/obj/item/gun/ballistic/rocketlauncher/solgov +/obj/item/gun/ballistic/rocketlauncher/terragov name = "Panzerfaust XII" - desc = "The standard recoiless rifle of the Solarian Confederation. Barely varies from previous models." + desc = "The standard recoiless rifle of the Terran Confederation. Barely varies from previous models." icon = 'icons/obj/guns/48x32guns.dmi' icon_state = "panzerfaust" item_state = "panzerfaust" diff --git a/code/modules/projectiles/guns/ballistic/pistol.dm b/code/modules/projectiles/guns/ballistic/pistol.dm index c4d505bcb10c..7327734b8120 100644 --- a/code/modules/projectiles/guns/ballistic/pistol.dm +++ b/code/modules/projectiles/guns/ballistic/pistol.dm @@ -211,9 +211,9 @@ EMPTY_GUN_HELPER(automatic/pistol/commander/inteq) if(funnysounds) . += "Alt-click to use \the [src] vox hailer." -/obj/item/gun/ballistic/automatic/pistol/solgov +/obj/item/gun/ballistic/automatic/pistol/terragov name = "\improper Pistole C" - desc = "A favorite of the Terran Regency that is despised by the Solarian bureaucracy. Shifted out of military service centuries ago, though still popular among civilians. Chambered in 5.56mm caseless." + desc = "A favorite of the Terran Regency that is despised by the Terran bureaucracy. Shifted out of military service centuries ago, though still popular among civilians. Chambered in 5.56mm caseless." icon_state = "pistole-c" weapon_weight = WEAPON_LIGHT w_class = WEIGHT_CLASS_SMALL @@ -227,7 +227,7 @@ EMPTY_GUN_HELPER(automatic/pistol/commander/inteq) fire_select_icon_state_prefix = "caseless_" -/obj/item/gun/ballistic/automatic/pistol/solgov/old +/obj/item/gun/ballistic/automatic/pistol/terragov/old icon_state = "pistole-c-old" /obj/item/gun/ballistic/automatic/pistol/tec9 diff --git a/code/modules/projectiles/guns/ballistic/revolver.dm b/code/modules/projectiles/guns/ballistic/revolver.dm index 034e12ca65cd..310a0d4019f6 100644 --- a/code/modules/projectiles/guns/ballistic/revolver.dm +++ b/code/modules/projectiles/guns/ballistic/revolver.dm @@ -603,7 +603,7 @@ EMPTY_GUN_HELPER(revolver/detective) /obj/item/gun/ballistic/revolver/russian name = "\improper Russian revolver" - desc = "A Solarian revolver for particularly lethal drinking games. It has a mechanism requiring you to spin the chamber before each trigger pull. Uses .357 ammo." + desc = "A Terran revolver for particularly lethal drinking games. It has a mechanism requiring you to spin the chamber before each trigger pull. Uses .357 ammo." icon_state = "russianrevolver" mag_type = /obj/item/ammo_box/magazine/internal/cylinder/rus357 var/spun = FALSE diff --git a/code/modules/projectiles/guns/ballistic/rifle.dm b/code/modules/projectiles/guns/ballistic/rifle.dm index 336c8a07dce6..462b2ac8d7a9 100644 --- a/code/modules/projectiles/guns/ballistic/rifle.dm +++ b/code/modules/projectiles/guns/ballistic/rifle.dm @@ -121,10 +121,10 @@ w_class = WEIGHT_CLASS_NORMAL slot_flags = ITEM_SLOT_BELT -/obj/item/gun/ballistic/rifle/solgov +/obj/item/gun/ballistic/rifle/terragov name = "SSG-669C" - desc = "A bolt-action sniper rifle used by Solarian troops. Beloved for its rotary design and accuracy. Chambered in 8x58mm Caseless." - mag_type = /obj/item/ammo_box/magazine/internal/boltaction/solgov + desc = "A bolt-action sniper rifle used by Terran troops. Beloved for its rotary design and accuracy. Chambered in 8x58mm Caseless." + mag_type = /obj/item/ammo_box/magazine/internal/boltaction/terragov icon_state = "ssg669c" item_state = "ssg669c" fire_sound = 'sound/weapons/gun/rifle/ssg669c.ogg' diff --git a/code/modules/research/designs/weapon_designs.dm b/code/modules/research/designs/weapon_designs.dm index 3353dcfb3289..05516ffe4fad 100644 --- a/code/modules/research/designs/weapon_designs.dm +++ b/code/modules/research/designs/weapon_designs.dm @@ -280,7 +280,7 @@ /datum/design/m9cammo name = "M9C magazine (5.56mm HITP caseless)" - desc = "A double stack M9C magazine, designed to chamber 5.56mm HITP caseless and fit into SolGov's M9C sidearms." + desc = "A double stack M9C magazine, designed to chamber 5.56mm HITP caseless and fit into TerraGov's M9C sidearms." id = "m9cammo" build_type = PROTOLATHE materials = list(/datum/material/iron = 18000) diff --git a/code/modules/research/rdconsole.dm b/code/modules/research/rdconsole.dm index 8b6acd39ae34..b6be351441fa 100644 --- a/code/modules/research/rdconsole.dm +++ b/code/modules/research/rdconsole.dm @@ -1256,10 +1256,10 @@ Nothing else in the console has ID requirements. icon_state = "computer-retro" deconpath = /obj/structure/frame/computer/retro -/obj/machinery/computer/rdconsole/robotics/solgov +/obj/machinery/computer/rdconsole/robotics/terragov icon = 'icons/obj/machines/retro_computer.dmi' icon_state = "computer-solgov" - deconpath = /obj/structure/frame/computer/solgov + deconpath = /obj/structure/frame/computer/terragov /obj/machinery/computer/rdconsole/robotics/Initialize() . = ..() diff --git a/code/modules/ruins/lavalandruin_code/biodome_winter.dm b/code/modules/ruins/lavalandruin_code/biodome_winter.dm index 85fed2a74324..1548bbe86161 100644 --- a/code/modules/ruins/lavalandruin_code/biodome_winter.dm +++ b/code/modules/ruins/lavalandruin_code/biodome_winter.dm @@ -1,6 +1,6 @@ /obj/item/paper/pamphlet/biodomelore - name = "Solarian Frontier Project Pamphlet" + name = "Terran Frontier Project Pamphlet" default_raw_text = "

Extrasolar Biodome Project



The Most Serene Solar and Intersolar Confederation welcomes you to one of our many experimental biodomes out in the frontier.
These facilities are developed and built as a collaboration with the Pionierskompanien and are to serve as extrasolar research bases for our most accomplished scientists and scribes. These facilities utilize breakthroughs in terraforming technology to create a comfortable, habitable environment in even the harshest of locales. Your purpose here is to research and report on the effectiveness of the technology utilized within the central dome, as well as maintain and protect the facility." /obj/item/paper/crumpled/bloody/winterbiodome diff --git a/shiptest.dme b/shiptest.dme index 33de1de85273..0f00c3516f9e 100644 --- a/shiptest.dme +++ b/shiptest.dme @@ -1706,7 +1706,7 @@ #include "code\modules\antagonists\ert\inteq.dm" #include "code\modules\antagonists\ert\minutemen.dm" #include "code\modules\antagonists\ert\nanotrasen.dm" -#include "code\modules\antagonists\ert\solgov.dm" +#include "code\modules\antagonists\ert\terragov.dm" #include "code\modules\antagonists\ert\syndicate.dm" #include "code\modules\antagonists\gang\outfits.dm" #include "code\modules\antagonists\greentext\greentext.dm" @@ -2006,7 +2006,7 @@ #include "code\modules\clothing\outfits\ert\inteq_ert.dm" #include "code\modules\clothing\outfits\ert\minutemen_ert.dm" #include "code\modules\clothing\outfits\ert\nanotrasen_ert.dm" -#include "code\modules\clothing\outfits\ert\solgov_ert.dm" +#include "code\modules\clothing\outfits\ert\terragov_ert.dm" #include "code\modules\clothing\outfits\ert\syndicate_ert.dm" #include "code\modules\clothing\outfits\factions\frontiersmen.dm" #include "code\modules\clothing\outfits\factions\gezena.dm" @@ -2015,7 +2015,7 @@ #include "code\modules\clothing\outfits\factions\minutemen.dm" #include "code\modules\clothing\outfits\factions\nanotrasen.dm" #include "code\modules\clothing\outfits\factions\roumain.dm" -#include "code\modules\clothing\outfits\factions\solgov.dm" +#include "code\modules\clothing\outfits\factions\terragov.dm" #include "code\modules\clothing\outfits\factions\syndicate.dm" #include "code\modules\clothing\shoes\_shoes.dm" #include "code\modules\clothing\shoes\bananashoes.dm" @@ -2050,7 +2050,7 @@ #include "code\modules\clothing\under\pants.dm" #include "code\modules\clothing\under\shorts.dm" #include "code\modules\clothing\under\skirt_dress.dm" -#include "code\modules\clothing\under\solgov.dm" +#include "code\modules\clothing\under\terragov.dm" #include "code\modules\clothing\under\suits.dm" #include "code\modules\clothing\under\syndicate.dm" #include "code\modules\clothing\under\jobs\cargo.dm" @@ -2333,7 +2333,7 @@ #include "code\modules\jobs\job_types\scientist.dm" #include "code\modules\jobs\job_types\security_officer.dm" #include "code\modules\jobs\job_types\shaft_miner.dm" -#include "code\modules\jobs\job_types\solgov_rep.dm" +#include "code\modules\jobs\job_types\terragov_rep.dm" #include "code\modules\jobs\job_types\station_engineer.dm" #include "code\modules\jobs\job_types\virologist.dm" #include "code\modules\jobs\job_types\warden.dm" diff --git a/strings/ship_names.json b/strings/ship_names.json index 3ba64b050a09..1f1c98a62eec 100644 --- a/strings/ship_names.json +++ b/strings/ship_names.json @@ -1157,7 +1157,7 @@ "While True Do" ], - "SOLGOV": [ + "TERRAGOV": [ "Audience", "Ball Point Pen", diff --git a/tgui/packages/tgui-panel/styles/tgchat/chat-dark.scss b/tgui/packages/tgui-panel/styles/tgchat/chat-dark.scss index 8e734f25da41..737eb1b0b666 100644 --- a/tgui/packages/tgui-panel/styles/tgchat/chat-dark.scss +++ b/tgui/packages/tgui-panel/styles/tgchat/chat-dark.scss @@ -366,7 +366,7 @@ em { color: #199943; } -.solgovradio { +.terragovradio { color: #7589af; } diff --git a/tgui/packages/tgui-panel/styles/tgchat/chat-light.scss b/tgui/packages/tgui-panel/styles/tgchat/chat-light.scss index ae52ba0bfd88..4e25a23ad182 100644 --- a/tgui/packages/tgui-panel/styles/tgchat/chat-light.scss +++ b/tgui/packages/tgui-panel/styles/tgchat/chat-light.scss @@ -386,7 +386,7 @@ em { color: #686868; } -.solgovradio { +.terragovradio { color: #444e5f; } diff --git a/tgui/packages/tgui/interfaces/PosterPrinter.js b/tgui/packages/tgui/interfaces/PosterPrinter.js index 8851c9b3afec..aa74566166ce 100644 --- a/tgui/packages/tgui/interfaces/PosterPrinter.js +++ b/tgui/packages/tgui/interfaces/PosterPrinter.js @@ -87,7 +87,7 @@ const Options = (props, context) => { 'Nanotrasen', 'Nanotrasen (Retro)', 'RILENA', - 'SolGov', + 'TerraGov', ]; const selectedType = poster_type ?? 'No Poster Selected'; From b52396bddcca73163080ef36edd4294b139fde28 Mon Sep 17 00:00:00 2001 From: Constellado <64122807+Constellado@users.noreply.github.com> Date: Sat, 27 Jul 2024 17:52:02 +1200 Subject: [PATCH 02/12] fixes a bracket. --- code/game/gamemodes/traitor/traitor.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/gamemodes/traitor/traitor.dm b/code/game/gamemodes/traitor/traitor.dm index ca9b166498ce..c5fdd5d59d07 100644 --- a/code/game/gamemodes/traitor/traitor.dm +++ b/code/game/gamemodes/traitor/traitor.dm @@ -12,7 +12,7 @@ antag_flag = ROLE_TRAITOR false_report_weight = 20 //Reports of traitors are pretty common. restricted_jobs = list("Cyborg")//They are part of the AI if he is traitor so are they, they use to get double chances - protected_jobs = list("Security Officer", "Warden", "Detective", "Head of Security", "Captain", "Head of Personnel", "Brig Physician", "Prisoner", "TerraGov Representative" + protected_jobs = list("Security Officer", "Warden", "Detective", "Head of Security", "Captain", "Head of Personnel", "Brig Physician", "Prisoner", "TerraGov Representative") required_players = 0 required_enemies = 1 recommended_enemies = 4 From d443463ff964bbe9b42778b65842dcbe77f77c74 Mon Sep 17 00:00:00 2001 From: Constellado <64122807+Constellado@users.noreply.github.com> Date: Sat, 27 Jul 2024 17:56:03 +1200 Subject: [PATCH 03/12] file namesss fix --- code/modules/antagonists/ert/{solgov.dm => terragov.dm} | 0 .../clothing/outfits/ert/{solgov_ert.dm => terragov_ert.dm} | 0 code/modules/clothing/outfits/factions/{solgov.dm => terragov.dm} | 0 code/modules/clothing/under/{solgov.dm => terragov.dm} | 0 code/modules/jobs/job_types/{solgov_rep.dm => terragov_rep.dm} | 0 5 files changed, 0 insertions(+), 0 deletions(-) rename code/modules/antagonists/ert/{solgov.dm => terragov.dm} (100%) rename code/modules/clothing/outfits/ert/{solgov_ert.dm => terragov_ert.dm} (100%) rename code/modules/clothing/outfits/factions/{solgov.dm => terragov.dm} (100%) rename code/modules/clothing/under/{solgov.dm => terragov.dm} (100%) rename code/modules/jobs/job_types/{solgov_rep.dm => terragov_rep.dm} (100%) diff --git a/code/modules/antagonists/ert/solgov.dm b/code/modules/antagonists/ert/terragov.dm similarity index 100% rename from code/modules/antagonists/ert/solgov.dm rename to code/modules/antagonists/ert/terragov.dm diff --git a/code/modules/clothing/outfits/ert/solgov_ert.dm b/code/modules/clothing/outfits/ert/terragov_ert.dm similarity index 100% rename from code/modules/clothing/outfits/ert/solgov_ert.dm rename to code/modules/clothing/outfits/ert/terragov_ert.dm diff --git a/code/modules/clothing/outfits/factions/solgov.dm b/code/modules/clothing/outfits/factions/terragov.dm similarity index 100% rename from code/modules/clothing/outfits/factions/solgov.dm rename to code/modules/clothing/outfits/factions/terragov.dm diff --git a/code/modules/clothing/under/solgov.dm b/code/modules/clothing/under/terragov.dm similarity index 100% rename from code/modules/clothing/under/solgov.dm rename to code/modules/clothing/under/terragov.dm diff --git a/code/modules/jobs/job_types/solgov_rep.dm b/code/modules/jobs/job_types/terragov_rep.dm similarity index 100% rename from code/modules/jobs/job_types/solgov_rep.dm rename to code/modules/jobs/job_types/terragov_rep.dm From e54544bb20cc288707355b72912cf4e4006230ff Mon Sep 17 00:00:00 2001 From: Constellado <64122807+Constellado@users.noreply.github.com> Date: Sat, 27 Jul 2024 18:20:42 +1200 Subject: [PATCH 04/12] pen description funiii --- code/modules/paperwork/pen.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/paperwork/pen.dm b/code/modules/paperwork/pen.dm index 9a33bcf2c4dd..a6985cab77fc 100644 --- a/code/modules/paperwork/pen.dm +++ b/code/modules/paperwork/pen.dm @@ -267,7 +267,7 @@ /obj/item/pen/fountain/solgov name = "\improper SolGov fountain pen" - desc = "A fancy fountain pen with SolGov's insignia emblazoned onto the wood. It feels powerful. You feel like stealing it... You won't get in trouble for picking it up, will you? It is totally safe to take. The gods won't banish you permanently for this, I am sure!" + desc = "A fancy fountain pen with SolGov's insignia emblazoned onto the wood. It feels powerful. You feel like stealing it... You won't get in trouble for picking it up, will you? It is totally safe to take. The gods won't banish you permanently for this heinous crime of stealing a fancy pen, I am sure!" icon_state = "pen-fountain-sg" /obj/item/pen/fountain/terragov From d17d4974c30fcf95438f20bd9bb42aad34c878b6 Mon Sep 17 00:00:00 2001 From: Constellado <64122807+Constellado@users.noreply.github.com> Date: Sat, 27 Jul 2024 18:37:13 +1200 Subject: [PATCH 05/12] more lore fixes for terragov and solgov. --- _maps/configs/terragov_chronicle.json | 2 +- _maps/configs/terragov_inkwell.json | 2 +- _maps/configs/terragov_paracelsus.json | 2 +- code/game/objects/effects/contraband.dm | 2 +- code/game/objects/structures/bedsheet_bin.dm | 4 ++-- code/modules/clothing/suits/wintercoats.dm | 2 +- code/modules/paperwork/fax.dm | 6 +++--- code/modules/projectiles/guns/ballistic/assault.dm | 2 +- code/modules/projectiles/guns/ballistic/gauss.dm | 4 ++-- code/modules/projectiles/guns/ballistic/launchers.dm | 2 +- 10 files changed, 14 insertions(+), 14 deletions(-) diff --git a/_maps/configs/terragov_chronicle.json b/_maps/configs/terragov_chronicle.json index 497c19f2f6bb..9b45fc127790 100644 --- a/_maps/configs/terragov_chronicle.json +++ b/_maps/configs/terragov_chronicle.json @@ -1,7 +1,7 @@ { "$schema": "https://raw.githubusercontent.com/shiptest-ss13/Shiptest/master/_maps/ship_config_schema.json", "map_name": "Chronicle-class Sensor Frigate", - "prefix": "SCSV", + "prefix": "TGSV", "namelists": [ "TERRAGOV", "SPACE", diff --git a/_maps/configs/terragov_inkwell.json b/_maps/configs/terragov_inkwell.json index f1a611ad76ac..f765f8411912 100644 --- a/_maps/configs/terragov_inkwell.json +++ b/_maps/configs/terragov_inkwell.json @@ -1,7 +1,7 @@ { "$schema": "https://raw.githubusercontent.com/shiptest-ss13/Shiptest/master/_maps/ship_config_schema.json", "map_name": "Inkwell-class Supply Freighter", - "prefix": "SCSV", + "prefix": "TGSV", "namelists": [ "TERRAGOV", "SPACE", diff --git a/_maps/configs/terragov_paracelsus.json b/_maps/configs/terragov_paracelsus.json index cf4628efc04e..bdc6779fc1e0 100644 --- a/_maps/configs/terragov_paracelsus.json +++ b/_maps/configs/terragov_paracelsus.json @@ -1,7 +1,7 @@ { "$schema": "https://raw.githubusercontent.com/shiptest-ss13/Shiptest/master/_maps/ship_config_schema.json", "map_name": "Paracelsus-class Medical Corvette", - "prefix": "SCSV", + "prefix": "TGSV", "namelists": [ "TERRAGOV", "SPACE", diff --git a/code/game/objects/effects/contraband.dm b/code/game/objects/effects/contraband.dm index bb2f4d741866..148eb06f623a 100644 --- a/code/game/objects/effects/contraband.dm +++ b/code/game/objects/effects/contraband.dm @@ -867,7 +867,7 @@ /obj/structure/sign/poster/terragov/terragov_logo name = "Terragov" - desc = "The coat of arms of TerraGov and the Terran Regency, which the latter still exists to this day." + desc = "There are two alternate Versions of the Terragov coat of arms. The scars of the referendum can still be seen today." icon_state = "poster-terragov" /obj/structure/sign/poster/terragov/terra diff --git a/code/game/objects/structures/bedsheet_bin.dm b/code/game/objects/structures/bedsheet_bin.dm index fd4392cdb063..5a458d094095 100644 --- a/code/game/objects/structures/bedsheet_bin.dm +++ b/code/game/objects/structures/bedsheet_bin.dm @@ -230,7 +230,7 @@ LINEN BINS /obj/item/bedsheet/terragov name = "\improper TerraGov bedsheet" - desc = "It has the emblem of the Terran Confederation emblazoned upon it!" + desc = "It has the emblem of the TeraGov emblazoned upon it!" icon_state = "sheetsolgov" item_state = "sheetsolgov" dream_messages = list("bureaucracy", "laws", "papers", "writing") @@ -361,7 +361,7 @@ LINEN BINS icon_state = "double_sheetsolgov" item_state = "double_sheetsolgov" dream_messages = list("bureaucracy", "laws", "papers", "writing") - desc = "It has the emblem of the Solar Confederation emblazoned upon it!" + desc = "It has the emblem of TerraGov emblazoned upon it!" /obj/item/bedsheet/double/suns name = "double SUNS bedsheet" diff --git a/code/modules/clothing/suits/wintercoats.dm b/code/modules/clothing/suits/wintercoats.dm index 7d5244c751e0..c075fffd4e97 100644 --- a/code/modules/clothing/suits/wintercoats.dm +++ b/code/modules/clothing/suits/wintercoats.dm @@ -255,7 +255,7 @@ /obj/item/clothing/suit/hooded/wintercoat/terragov name = "terragov winter coat" - desc = "An environment-resistant wintercoat in the colors of the Terran Confederation." + desc = "An environment-resistant wintercoat in the colors of the Terran Republic." icon_state = "coatsolgov" item_state = "coatsolgov" hoodtype = /obj/item/clothing/head/hooded/winterhood/terragov diff --git a/code/modules/paperwork/fax.dm b/code/modules/paperwork/fax.dm index a3fbfee4ecc2..6a8d30608e83 100644 --- a/code/modules/paperwork/fax.dm +++ b/code/modules/paperwork/fax.dm @@ -62,7 +62,7 @@ list(fax_name = "Nanotrasen Central Command", fax_id = "nanotrasen", color = "green", emag_needed = FALSE), list(fax_name = "Outpost Authority", fax_id = "outpost", color = "orange", emag_needed = FALSE), list(fax_name = "IRMG Mothership", fax_id = "inteq", color = "yellow", emag_needed = FALSE), - list(fax_name = "Terran Confederation Frontier Affairs", fax_id = "terragov", color = "teal", emag_needed = FALSE), + list(fax_name = "Terran Frontier Affairs", fax_id = "terragov", color = "teal", emag_needed = FALSE), list(fax_name = "Roumain Council of Huntsmen", fax_id = "roumain", color = "brown", emag_needed = FALSE), list(fax_name = "Confederated League Leadership", fax_id = "minutemen", color = "blue", emag_needed = FALSE), list(fax_name = "Syndicate Coalition Coordination Center", fax_id = "syndicate", color = "red", emag_needed = FALSE), @@ -547,7 +547,7 @@ /obj/machinery/fax/terragov special_networks = list( list(fax_name = "Outpost Authority", fax_id = "outpost", color = "orange", emag_needed = FALSE), - list(fax_name = "Terran Confederation Frontier Affairs", fax_id = "terragov", color = "teal", emag_needed = FALSE), + list(fax_name = "Terran Frontier Affairs", fax_id = "terragov", color = "teal", emag_needed = FALSE), list(fax_name = "Frontiersmen Communications Quartermaster", fax_id = "frontiersmen", color = "black", emag_needed = TRUE) ) @@ -573,7 +573,7 @@ /obj/machinery/fax/admin/terragov name = "TerraGov Frontier Affairs Fax Machine" - fax_name = "Terran Confederation Frontier Affairs" + fax_name = "Terran Frontier Affairs" admin_fax_id = "terragov" /obj/machinery/fax/admin/syndicate diff --git a/code/modules/projectiles/guns/ballistic/assault.dm b/code/modules/projectiles/guns/ballistic/assault.dm index 9d97dc627bd4..c7b8ef958611 100644 --- a/code/modules/projectiles/guns/ballistic/assault.dm +++ b/code/modules/projectiles/guns/ballistic/assault.dm @@ -105,7 +105,7 @@ /obj/item/gun/ballistic/automatic/assault/swiss_cheese name = "\improper Swiss Cheese" - desc = "An ancient longarm famous for its boxy, modular design. Mass produced by the Terran Confederation in ages past, these often mutiple century old designs have survied due to their sheer ruggedness. The DMA on this unit is sadly broken, but these rifles are known for their excellent burst fire. Uses 5.56mm ammunition for Matter mode." + desc = "An ancient longarm famous for its boxy, modular design. Mass produced by the Terran Replublic in ages past, these often mutiple century old designs have survied due to their sheer ruggedness. The DMA on this unit is sadly broken, but these rifles are known for their excellent burst fire. Uses 5.56mm ammunition for Matter mode." icon = 'icons/obj/guns/48x32guns.dmi' fire_sound = 'sound/weapons/gun/rifle/swiss.ogg' icon_state = "swiss" diff --git a/code/modules/projectiles/guns/ballistic/gauss.dm b/code/modules/projectiles/guns/ballistic/gauss.dm index 910227627d65..e965733a0fdc 100644 --- a/code/modules/projectiles/guns/ballistic/gauss.dm +++ b/code/modules/projectiles/guns/ballistic/gauss.dm @@ -29,7 +29,7 @@ /obj/item/gun/ballistic/automatic/powered/gauss/modelh name = "Model H" - desc = "A standard-issue pistol exported from the Terran Confederation. It fires slow flesh-rending ferromagnetic slugs at a high energy cost, however they are ineffective on any armor." + desc = "A standard-issue pistol exported from the Terran Replublic. It fires slow flesh-rending ferromagnetic slugs at a high energy cost, however they are ineffective on any armor." mag_type = /obj/item/ammo_box/magazine/modelh icon_state = "model-h" item_state = "model-h" @@ -49,7 +49,7 @@ fire_select_icon_state_prefix = "slug_" /obj/item/gun/ballistic/automatic/powered/gauss/modelh/suns - desc = "A standard-issue pistol exported from the Terran Confederation. It fires slow flesh-rending ferromagnetic slugs at a high energy cost, however they are ineffective on any armor. It is painted in the colors of SUNS." + desc = "A standard-issue pistol exported from the Terran Replublic. It fires slow flesh-rending ferromagnetic slugs at a high energy cost, however they are ineffective on any armor. It is painted in the colors of SUNS." mag_type = /obj/item/ammo_box/magazine/modelh icon_state = "model-h_suns" item_state = "model-h_suns" diff --git a/code/modules/projectiles/guns/ballistic/launchers.dm b/code/modules/projectiles/guns/ballistic/launchers.dm index ad7bdc89da45..8e49bc09e0be 100644 --- a/code/modules/projectiles/guns/ballistic/launchers.dm +++ b/code/modules/projectiles/guns/ballistic/launchers.dm @@ -73,7 +73,7 @@ /obj/item/gun/ballistic/rocketlauncher/terragov name = "Panzerfaust XII" - desc = "The standard recoiless rifle of the Terran Confederation. Barely varies from previous models." + desc = "The standard recoiless rifle from TerraGov. Barely varies from previous models." icon = 'icons/obj/guns/48x32guns.dmi' icon_state = "panzerfaust" item_state = "panzerfaust" From e7772d2be2fc7f9c5ca9c77ae2dc4e43dc1f549b Mon Sep 17 00:00:00 2001 From: Constellado <64122807+Constellado@users.noreply.github.com> Date: Sat, 27 Jul 2024 18:46:05 +1200 Subject: [PATCH 06/12] renames more files to fit lore --- .../solgov_chronicle.dmm => terragov/terragov_chronicle.dmm} | 0 .../{solgov/solgov_inkwell.dmm => terragov/terragov_inkwell.dmm} | 0 .../solgov_paracelsus.dmm => terragov/terragov_paracelsus.dmm} | 0 3 files changed, 0 insertions(+), 0 deletions(-) rename _maps/shuttles/{solgov/solgov_chronicle.dmm => terragov/terragov_chronicle.dmm} (100%) rename _maps/shuttles/{solgov/solgov_inkwell.dmm => terragov/terragov_inkwell.dmm} (100%) rename _maps/shuttles/{solgov/solgov_paracelsus.dmm => terragov/terragov_paracelsus.dmm} (100%) diff --git a/_maps/shuttles/solgov/solgov_chronicle.dmm b/_maps/shuttles/terragov/terragov_chronicle.dmm similarity index 100% rename from _maps/shuttles/solgov/solgov_chronicle.dmm rename to _maps/shuttles/terragov/terragov_chronicle.dmm diff --git a/_maps/shuttles/solgov/solgov_inkwell.dmm b/_maps/shuttles/terragov/terragov_inkwell.dmm similarity index 100% rename from _maps/shuttles/solgov/solgov_inkwell.dmm rename to _maps/shuttles/terragov/terragov_inkwell.dmm diff --git a/_maps/shuttles/solgov/solgov_paracelsus.dmm b/_maps/shuttles/terragov/terragov_paracelsus.dmm similarity index 100% rename from _maps/shuttles/solgov/solgov_paracelsus.dmm rename to _maps/shuttles/terragov/terragov_paracelsus.dmm From 7ddc8b46b23763c1b2a48cf4145ac6294e901d4f Mon Sep 17 00:00:00 2001 From: Constellado <64122807+Constellado@users.noreply.github.com> Date: Sat, 27 Jul 2024 18:47:33 +1200 Subject: [PATCH 07/12] undoes name changes to icon states so that they work. --- code/game/objects/effects/contraband.dm | 2 +- code/modules/clothing/suits/wintercoats.dm | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/code/game/objects/effects/contraband.dm b/code/game/objects/effects/contraband.dm index 148eb06f623a..64b8a2045d51 100644 --- a/code/game/objects/effects/contraband.dm +++ b/code/game/objects/effects/contraband.dm @@ -927,7 +927,7 @@ /obj/structure/sign/poster/terragov/terragov_enlist //much better. name = "Enlist" desc = "Enlist to be a part of the TerraGov Exploration Forces!" - icon_state = "poster_terragov_enlist_legit" + icon_state = "poster_solgov_enlist_legit" /obj/structure/sign/poster/terragov/nanomichi_ad name = "Nanomichi Ad" diff --git a/code/modules/clothing/suits/wintercoats.dm b/code/modules/clothing/suits/wintercoats.dm index c075fffd4e97..36fb72b31b50 100644 --- a/code/modules/clothing/suits/wintercoats.dm +++ b/code/modules/clothing/suits/wintercoats.dm @@ -261,4 +261,4 @@ hoodtype = /obj/item/clothing/head/hooded/winterhood/terragov /obj/item/clothing/head/hooded/winterhood/terragov - icon_state = "hood_terragov" + icon_state = "hood_solgov" From 8a59729b8e605272f67d954264cd78be34b7d8c4 Mon Sep 17 00:00:00 2001 From: Constellado <64122807+Constellado@users.noreply.github.com> Date: Sat, 27 Jul 2024 19:02:23 +1200 Subject: [PATCH 08/12] missed some spots to fix lore --- code/game/objects/effects/contraband.dm | 6 +++--- code/modules/ruins/lavalandruin_code/biodome_winter.dm | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/code/game/objects/effects/contraband.dm b/code/game/objects/effects/contraband.dm index 64b8a2045d51..3a11ab44414d 100644 --- a/code/game/objects/effects/contraband.dm +++ b/code/game/objects/effects/contraband.dm @@ -875,14 +875,14 @@ desc = "Terra, or Earth as it's called by inhabitants, the third planet in the Sol system. Home to the only life as humans knew it, until contact with the outside universe. This poster in particular is trying to attract tourists to Terra, listing attractions like the Grand Orrery and Neue Waldstätte." icon_state = "poster-solgov-terra" -/obj/structure/sign/poster/terragov/ares +/obj/structure/sign/poster/terragov/mars name = "Mars" desc = "Mars, the fourth planet in the Sol system. While evidence suggests that Venus and Mars may have once had life, Terra was the only one that kept it. This poster in particular is trying to attract tourists to Mars, listing attractions like skiing resorts and ancient robot exhibits." icon_state = "poster-solgov-ares" /obj/structure/sign/poster/terragov/luna name = "Luna" - desc = "Luna, the only moon of Terra. Culturally significant to the Terrans historically as a symbol of time, harvest, and new frontiers. This poster in particular is trying to attract tourists to Luna, listing attractions like the massive spaceport and white flags scattered across the surface, a relic from ages past." + desc = "Luna, the only moon of Terra. Culturally significant to the terrans historically as a symbol of time, harvest, and new frontiers. This poster in particular is trying to attract tourists to Luna, listing attractions like the massive spaceport and white flags scattered across the surface, a relic from ages past." icon_state = "poster-solgov-luna" /obj/structure/sign/poster/terragov/kepler @@ -892,7 +892,7 @@ /obj/structure/sign/poster/terragov/skiing name = "Lo-Fly Skiing Advert" - desc = "An advertisement for some low-gravity skiing resort on Ares. \"Popular with SUNS groups!\"" + desc = "An advertisement for some low-gravity skiing resort on Mars. \"Popular with SUNS groups!\"" icon_state = "poster-solgov-loskiing" /obj/structure/sign/poster/terragov/recyle diff --git a/code/modules/ruins/lavalandruin_code/biodome_winter.dm b/code/modules/ruins/lavalandruin_code/biodome_winter.dm index 1548bbe86161..69cfe4501857 100644 --- a/code/modules/ruins/lavalandruin_code/biodome_winter.dm +++ b/code/modules/ruins/lavalandruin_code/biodome_winter.dm @@ -1,7 +1,7 @@ /obj/item/paper/pamphlet/biodomelore name = "Terran Frontier Project Pamphlet" - default_raw_text = "

Extrasolar Biodome Project



The Most Serene Solar and Intersolar Confederation welcomes you to one of our many experimental biodomes out in the frontier.
These facilities are developed and built as a collaboration with the Pionierskompanien and are to serve as extrasolar research bases for our most accomplished scientists and scribes. These facilities utilize breakthroughs in terraforming technology to create a comfortable, habitable environment in even the harshest of locales. Your purpose here is to research and report on the effectiveness of the technology utilized within the central dome, as well as maintain and protect the facility." + default_raw_text = "

Extrasolar Biodome Project



The Terran Government welcomes you to one of our many experimental biodomes out in the frontier.
These facilities are developed and built as a collaboration with the Pionierskompanien and are to serve as extrasolar research bases for our most accomplished scientists and scribes. These facilities utilize breakthroughs in terraforming technology to create a comfortable, habitable environment in even the harshest of locales. Your purpose here is to research and report on the effectiveness of the technology utilized within the central dome, as well as maintain and protect the facility." /obj/item/paper/crumpled/bloody/winterbiodome name = "hastily written note" From 39cbd58a80c83231e1a6e6a16b9930a68249a023 Mon Sep 17 00:00:00 2001 From: Constellado <64122807+Constellado@users.noreply.github.com> Date: Sat, 27 Jul 2024 19:08:39 +1200 Subject: [PATCH 09/12] How do you spell confederation? confideration? i dont think the shiptest codebase knew it, because I missed one of them. --- _maps/configs/solgov_inkwell.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_maps/configs/solgov_inkwell.json b/_maps/configs/solgov_inkwell.json index f765f8411912..5042d43b87d0 100644 --- a/_maps/configs/solgov_inkwell.json +++ b/_maps/configs/solgov_inkwell.json @@ -10,7 +10,7 @@ ], "map_short_name": "Inkwell-class", "map_path": "_maps/shuttles/terragov/terragov_inkwell.dmm", - "description": "One of the few Sol-designed hulls used outside of official contexts by non-Confederation parties, the Inkwell is a freighter respected for its engineering and loved for its lavish crew accommodations. \n The Inkwell-class seen in numerous contexts, perhaps most notably among the Verwaltungskompanien, where they are essential in solving the logistic concerns of any proper military-administration-for-hire. Additionally, they are often commissioned and sold to non-Terran parties for use in interstellar shipping. \n The usage of the Inkwell-class to move illicit or untracked cargo is known by any seasoned (or even half-cooked) port authority; \"...such regrettable actions by an outlier minority are mere part-and-parcel of the realities of interstellar shipping,\" goes the official reply.", + "description": "One of the few Sol-designed hulls used outside of official contexts by non-Terran parties, the Inkwell is a freighter respected for its engineering and loved for its lavish crew accommodations. \n The Inkwell-class seen in numerous contexts, perhaps most notably among the Verwaltungskompanien, where they are essential in solving the logistic concerns of any proper military-administration-for-hire. Additionally, they are often commissioned and sold to non-Terran parties for use in interstellar shipping. \n The usage of the Inkwell-class to move illicit or untracked cargo is known by any seasoned (or even half-cooked) port authority; \"...such regrettable actions by an outlier minority are mere part-and-parcel of the realities of interstellar shipping,\" goes the official reply.", "tags": ["RP Focus", "Combat", "Cargo", "Mining"], "limit": 1, "job_slots": { From 3714f5838c603e2079dfbdc48774e09a3bc98112 Mon Sep 17 00:00:00 2001 From: Constellado <64122807+Constellado@users.noreply.github.com> Date: Sat, 27 Jul 2024 19:10:46 +1200 Subject: [PATCH 10/12] schemaa --- _maps/configs/solgov_inkwell.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_maps/configs/solgov_inkwell.json b/_maps/configs/solgov_inkwell.json index 5042d43b87d0..633e5f2d6b2e 100644 --- a/_maps/configs/solgov_inkwell.json +++ b/_maps/configs/solgov_inkwell.json @@ -1,5 +1,5 @@ { - "$schema": "https://raw.githubusercontent.com/shiptest-ss13/Shiptest/master/_maps/ship_config_schema.json", + "$schema": "https://raw.githubusercontent.com/Constellado/Pentest/master/_maps/ship_config_schema.json", "map_name": "Inkwell-class Supply Freighter", "prefix": "TGSV", "namelists": [ From 23e99f9ec3fea29c39baba05220d7b282b885122 Mon Sep 17 00:00:00 2001 From: Constellado <64122807+Constellado@users.noreply.github.com> Date: Sat, 27 Jul 2024 19:13:17 +1200 Subject: [PATCH 11/12] nevermind it causes merge conflicts --- _maps/configs/solgov_inkwell.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_maps/configs/solgov_inkwell.json b/_maps/configs/solgov_inkwell.json index 633e5f2d6b2e..5042d43b87d0 100644 --- a/_maps/configs/solgov_inkwell.json +++ b/_maps/configs/solgov_inkwell.json @@ -1,5 +1,5 @@ { - "$schema": "https://raw.githubusercontent.com/Constellado/Pentest/master/_maps/ship_config_schema.json", + "$schema": "https://raw.githubusercontent.com/shiptest-ss13/Shiptest/master/_maps/ship_config_schema.json", "map_name": "Inkwell-class Supply Freighter", "prefix": "TGSV", "namelists": [ From 235f92a1ff20934e8c4bb0b4c93b5a7a9ca064e3 Mon Sep 17 00:00:00 2001 From: Constellado <64122807+Constellado@users.noreply.github.com> Date: Sat, 27 Jul 2024 19:24:24 +1200 Subject: [PATCH 12/12] tests why? --- code/modules/ruins/lavalandruin_code/biodome_winter.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/ruins/lavalandruin_code/biodome_winter.dm b/code/modules/ruins/lavalandruin_code/biodome_winter.dm index 69cfe4501857..35f5b517e2e2 100644 --- a/code/modules/ruins/lavalandruin_code/biodome_winter.dm +++ b/code/modules/ruins/lavalandruin_code/biodome_winter.dm @@ -5,5 +5,5 @@ /obj/item/paper/crumpled/bloody/winterbiodome name = "hastily written note" - default_raw_text = "Scheiße, I knew this would happen eventually. Legions have been piling up outside for days, and one of my former coworkers was unwise enough to let them in.

...They're all dead. I can hear the legions outside. The display case with the Claris is locked tight, and I cant find anything to break the glass with.

Please forgive me. My time is up. If anyone finds this, the Claris is yours. Just avenge us." + default_raw_text = "Shit, I knew this would happen eventually. Legions have been piling up outside for days, and one of my former coworkers was unwise enough to let them in.

...They're all dead. I can hear the legions outside. The display case with the Claris is locked tight, and I cant find anything to break the glass with.

Please forgive me. My time is up. If anyone finds this, the Claris is yours. Just avenge us."