Renames all mentions of Solfed to TerraGov (#2334)

<!-- Write **BELOW** The Headers and **ABOVE** The comments else it may
not be viewable. -->
<!-- You can view Contributing.MD for a detailed description of the pull
request process. -->

## About The Pull Request
Renames SolFed/SolGov/Solar Goverment/Solar Federation to
TerraGov/Terran Goverment
<!-- Describe The Pull Request. Please be sure every change is
documented or this can delay review and even discourage maintainers from
merging your PR! -->

<!-- Please make sure to actually test your PRs. If you have not tested
your PR mention it. -->

## Why It's Good For The Game
Requested by the loremins
<!-- Argue for the merits of your changes and how they benefit the game,
especially if they are controversial and/or far reaching. If you can't
actually explain WHY what you are doing will improve the game, then it
probably isn't good for the game in the first place. -->

## Proof Of Testing
It compiles, nothing seems broken ingame (please TM this)
<!-- Compile and run your code locally. Make sure it works. This is the
place to show off your changes! We are not responsible for testing your
features. -->

</details>

## Changelog

<!-- If your PR modifies aspects of the game that can be concretely
observed by players or admins you should add a changelog. If your change
does NOT meet this description, remove this section. Be sure to properly
mark your PRs to prevent unnecessary GBP loss. You can read up on GBP
and its effects on PRs in the tgstation guides for contributors. Please
note that maintainers freely reserve the right to remove and add tags
should they deem it appropriate. You can attempt to finagle the system
all you want, but it's best to shoot for clear communication right off
the bat. -->

🆑
add: Renames all mentions of the Solar Goverment/Federation to the
Terran Goverment
/🆑

<!-- Both 🆑's are required for the changelog to work! You can put
your name to the right of the first 🆑 if you want to overwrite your
GitHub username as author ingame. -->
<!-- You can use multiple of the same prefix (they're only used for the
icon ingame) and delete the unneeded ones. Despite some of the tags,
changelogs should generally represent how a player might be affected by
the changes rather than a summary of the PR's contents. -->

<!-- By opening a pull request. You have read and understood the
repository rules located on the main README.md on this project. -->

---------

Co-authored-by: Waterpig <49160555+Majkl-J@users.noreply.github.com>
Co-authored-by: lessthanthree <83487515+lessthnthree@users.noreply.github.com>
This commit is contained in:
Arturlang
2024-11-20 04:10:08 +00:00
committed by GitHub
co-authored by Waterpig lessthanthree
parent 2e3831b219
commit 3bde496dc3
90 changed files with 344 additions and 321 deletions
+2 -2
View File
@@ -144,8 +144,8 @@
#define JOB_NAVAL_FLEET_ADMIRAL "Fleet Admiral"
// Off-Station
#define JOB_SPACE_POLICE "Space Police"
#define JOB_SOLFED "SolFed"
#define JOB_SOLFED_LIASON "SolFed Liason"
#define JOB_TERRAGOV "TerraGov"
#define JOB_TERRAGOV_LIASON "TerraGov Liason"
// SKYRAT EDIT ADDITION END
#define JOB_GROUP_ENGINEERS list( \
+3 -3
View File
@@ -21,10 +21,10 @@
#define SECHUD_DS2_MININGOFFICER "hud_ds2miningofficer"
#define SECHUD_DS2_GENSTAFF "hud_ds2generalstaff"
#define SECHUD_DS2_PRISONER "hud_ds2prisoner"
//SR SolFed
//SR TerraGov
#define SECHUD_SPACE_POLICE "hudspacepolice"
#define SECHUD_SOLFED "hudsolfed"
#define SECHUD_SOLFED_LIASON "hudsolfedliasion"
#define SECHUD_TERRAGOV "hudterragov"
#define SECHUD_TERRAGOV_LIASON "hudterragovliasion"
//SR Misc
#define SECHUD_BARBER "hudbarber"
#define SECHUD_SCRAMBLED "hudscrambled"
+1 -1
View File
@@ -1,5 +1,5 @@
#define LIGHT_COLOR_CLOCKWORK "#BE8700"
#define COLOR_SOLFED_GOLD "#FFD900"
#define COLOR_TERRAGOV_GOLD "#FFD900"
#define LIGHT_COLOR_YELLOW "#E1E17D"
#define COLOR_NRI_POLICE_BLUE "#1f3347"
#define COLOR_NRI_POLICE_SILVER "#c0c0c0"
-5
View File
@@ -1,5 +0,0 @@
#define RADIO_CHANNEL_SOLFED "SolFed"
#define RADIO_KEY_SOLFED "l"
#define RADIO_TOKEN_SOLFED ":l"
#define FREQ_SOLFED 1377
@@ -0,0 +1,5 @@
#define RADIO_CHANNEL_TERRAGOV "TerraGov"
#define RADIO_KEY_TERRAGOV "l"
#define RADIO_TOKEN_TERRAGOV ":l"
#define FREQ_TERRAGOV 1377
+1 -1
View File
@@ -6,7 +6,7 @@
"Nakamura Engineering",
"Robust Industries, LLC",
"MODular Solutions",
"SolGov",
"TerraGov",
"Australicus Industrial Mining",
"Vey-Medical",
"Aussec Armory",
+2 -2
View File
@@ -104,7 +104,7 @@ GLOBAL_LIST_INIT(radiochannels, list(
RADIO_CHANNEL_INTERDYNE = FREQ_INTERDYNE, //SKYRAT EDIT ADDITION - MAPPING
RADIO_CHANNEL_GUILD = FREQ_GUILD, //SKYRAT EDIT ADDITION - ASSAULT OPS
RADIO_CHANNEL_TARKON = FREQ_TARKON, //SKYRAT EDIT ADDITION - MAPPING
RADIO_CHANNEL_SOLFED = FREQ_SOLFED, //SKYRAT EDIT ADDITION - SOLFED
RADIO_CHANNEL_TERRAGOV = FREQ_TERRAGOV, //BUBBER EDIT ADDITION - TERRAGOV
RADIO_CHANNEL_SYNDICATE = FREQ_SYNDICATE,
RADIO_CHANNEL_UPLINK = FREQ_UPLINK,
RADIO_CHANNEL_SUPPLY = FREQ_SUPPLY,
@@ -129,7 +129,7 @@ GLOBAL_LIST_INIT(reverseradiochannels, list(
"[FREQ_CYBERSUN]" = RADIO_CHANNEL_CYBERSUN, //SKYRAT EDIT ADDITION - MAPPING
"[FREQ_INTERDYNE]" = RADIO_CHANNEL_INTERDYNE, //SKYRAT EDIT ADDITION - MAPPING
"[FREQ_TARKON]" = RADIO_CHANNEL_TARKON, //SKYRAT EDIT ADDITION - MAPPING
"[FREQ_SOLFED]" = RADIO_CHANNEL_SOLFED, //SKYRAT EDIT ADDITION - SOLFED
"[FREQ_TERRAGOV]" = RADIO_CHANNEL_TERRAGOV, //BUBBER EDIT ADDITION - TERRAGOV
"[FREQ_SYNDICATE]" = RADIO_CHANNEL_SYNDICATE,
"[FREQ_UPLINK]" = RADIO_CHANNEL_UPLINK,
"[FREQ_SUPPLY]" = RADIO_CHANNEL_SUPPLY,
@@ -12,7 +12,7 @@ GLOBAL_LIST_INIT(channel_tokens, list(
RADIO_CHANNEL_INTERDYNE = RADIO_TOKEN_INTERDYNE, //SKYRAT EDIT ADDITION - Mapping
RADIO_CHANNEL_GUILD = RADIO_TOKEN_GUILD, //SKYRAT EDIT ADDITION - Mapping
RADIO_CHANNEL_TARKON = RADIO_TOKEN_TARKON, //SKYRAT EDIT ADDITION - MAPPING
RADIO_CHANNEL_SOLFED = RADIO_TOKEN_SOLFED, //SKYRAT EDIT ADDITION - SOLFED
RADIO_CHANNEL_TERRAGOV = RADIO_TOKEN_TERRAGOV, //SKYRAT EDIT ADDITION - TERRAGOV
RADIO_CHANNEL_SYNDICATE = RADIO_TOKEN_SYNDICATE,
RADIO_CHANNEL_SUPPLY = RADIO_TOKEN_SUPPLY,
RADIO_CHANNEL_SERVICE = RADIO_TOKEN_SERVICE,
@@ -341,7 +341,7 @@
var/datum/signal/subspace/vocal/signal = new(src, freq, speaker, language, radio_message, spans, message_mods)
// Independent radios, on the CentCom frequency, reach all independent radios
if (special_channels & RADIO_SPECIAL_CENTCOM && (freq == FREQ_CENTCOM || freq == FREQ_CTF_RED || freq == FREQ_CTF_BLUE || freq == FREQ_CTF_GREEN || freq == FREQ_CTF_YELLOW || freq == FREQ_FACTION || freq == FREQ_CYBERSUN || freq == FREQ_INTERDYNE || freq == FREQ_GUILD || freq == FREQ_TARKON || freq == FREQ_SOLFED)) //SKYRAT EDIT CHANGE - FACTION, MAPPING, SOLFED
if (special_channels & RADIO_SPECIAL_CENTCOM && (freq == FREQ_CENTCOM || freq == FREQ_CTF_RED || freq == FREQ_CTF_BLUE || freq == FREQ_CTF_GREEN || freq == FREQ_CTF_YELLOW || freq == FREQ_FACTION || freq == FREQ_CYBERSUN || freq == FREQ_INTERDYNE || freq == FREQ_GUILD || freq == FREQ_TARKON || freq == FREQ_TERRAGOV)) //SKYRAT EDIT CHANGE - FACTION, MAPPING, TERRAGOV
signal.data["compression"] = 0
signal.transmission_method = TRANSMISSION_SUPERSPACE
signal.levels = list(0)
+1 -1
View File
@@ -21,7 +21,7 @@ GLOBAL_LIST_INIT(freqtospan, list(
"[FREQ_INTERDYNE]" = "syndradio", //SKYRAT EDIT ADDITION - MAPPING
"[FREQ_GUILD]" = "syndradio", //SKYRAT EDIT ADDITION - MAPPING
"[FREQ_TARKON]" = "engradio", //SKYRAT EDIT ADDITION - MAPPING
"[FREQ_SOLFED]" = "medradio", //SKYRAT EDIT ADDITION - SOLFED
"[FREQ_TERRAGOV]" = "medradio", //BUBBER EDIT ADDITION - TERRAGOV
"[FREQ_CTF_RED]" = "redteamradio",
"[FREQ_CTF_BLUE]" = "blueteamradio",
"[FREQ_CTF_GREEN]" = "greenteamradio",
+1 -1
View File
@@ -334,7 +334,7 @@
/turf/open/floor/iron/tgmcemblem
name = "TGMC Emblem"
desc = "The symbol of the Terran Goverment."
desc = "The symbol of the Terran Government."
icon_state = "tgmc_emblem"
/turf/open/floor/iron/tgmcemblem/center
+1 -1
View File
@@ -23,7 +23,7 @@
var/list/poss_reasons = list("the alignment of the moon and the sun",\
"some risky housing market outcomes",\
"the B.E.P.I.S. team's untimely downfall",\
"speculative SolFed grants backfiring", /*SKYRAT EDIT CHANGE; original was "speculative Terragov grants backfiring"*/\
"speculative TerraGov grants backfiring",\
"greatly exaggerated reports of Nanotrasen accountancy personnel being \"laid off\"",\
"a \"great investment\" into \"non-fungible tokens\" by a \"moron\"",\
"a number of raids from Tiger Cooperative agents",\
+1 -1
View File
@@ -36,7 +36,7 @@ ALERT_EPSILON_UPTO Central Command has ordered the Epsilon security level on the
ALERT_EPSILON_DOWNTO Central Command has ordered the Epsilon security level on the station. Consider all contracts terminated.
ALERT_DELTA_UPTO Destruction of the station is imminent. All crew are instructed to obey all instructions given by heads of staff. Any violations of these orders can be punished by death. This is not a drill.
ALERT_DELTA_DOWNTO Destruction of the station is still imminent. All crew are instructed to obey all instructions given by heads of staff. Any violations of these orders can be punished by death. This is not a drill.
ALERT_GAMMA The Solar Federation has placed this system under Gamma Alert status. This galactic system is facing a ZK-Class Reality Failure Scenario. Security Personnel is authorized full access to lethal equipment to enforce Martial Law. Failure to follow emergency procedures is punishable by death. This is not a drill.
ALERT_GAMMA The Terran Government has placed this system under Gamma Alert status. This galactic system is facing a ZK-Class Reality Failure Scenario. Security Personnel is authorized full access to lethal equipment to enforce Martial Law. Failure to follow emergency procedures is punishable by death. This is not a drill.
## How long until someone can be put in cryo if they are SSD
CRYO_MIN_SSD_TIME 1
@@ -1,13 +1,13 @@
/datum/id_trim/solfed
/datum/id_trim/terragov
trim_icon = 'modular_skyrat/master_files/icons/obj/card.dmi'
assignment = "SolFed"
trim_state = "trim_solfed"
department_color = COLOR_SOLFED_GOLD
subdepartment_color = COLOR_SOLFED_GOLD
sechud_icon_state = SECHUD_SOLFED
threat_modifier = -5 // Solfed Count as a police force
assignment = "TerraGov"
trim_state = "trim_terragov"
department_color = COLOR_TERRAGOV_GOLD
subdepartment_color = COLOR_TERRAGOV_GOLD
sechud_icon_state = SECHUD_TERRAGOV
threat_modifier = -5 // Terragov Count as a police force
/datum/id_trim/solfed/atmos/New()
/datum/id_trim/terragov/atmos/New()
. = ..()
access = list(
ACCESS_ATMOSPHERICS,
@@ -29,13 +29,13 @@
ACCESS_TELEPORTER,
)
/datum/id_trim/solgov/New()
/datum/id_trim/terragov/New()
. = ..()
access = SSid_access.get_region_access_list(list(REGION_CENTCOM, REGION_ALL_STATION))
/datum/id_trim/solfed/liasion
assignment = "SolFed Liasion"
sechud_icon_state = SECHUD_SOLFED_LIASON
/datum/id_trim/terragov/liasion
assignment = "TerraGov Liasion"
sechud_icon_state = SECHUD_TERRAGOV_LIASON
/datum/id_trim/space_police // Overrides the normal /tg/ ERTSEC Icon, these guys aren't NT!
trim_icon = 'modular_skyrat/master_files/icons/obj/card.dmi'
@@ -17,9 +17,9 @@
icon = 'modular_skyrat/master_files/icons/obj/card.dmi'
icon_state = "card_ds2prisoner"
// SOLFED
/obj/item/card/id/advanced/solfed
name = "solfed identification card"
// TERRAGOV
/obj/item/card/id/advanced/terragov
name = "terragov identification card"
icon = 'modular_skyrat/master_files/icons/obj/card.dmi'
icon_state = "card_solfed"
assigned_icon_state = "assigned_solfed"
icon_state = "card_terragov"
assigned_icon_state = "assigned_terragov"
@@ -45,7 +45,7 @@
// Emag E-N so it overloads
if(istype(target_pet, /mob/living/basic/pet/dog/corgi/borgi))
name = "Emag the roboticist's most-prized borgi, E-N"
description = "We received an untracable contract from someone addressed 'ianfan2489@solfed.nt', they want the robotic clone of Ian dead- and it has to be dramatic. We will supply you with a cryptographic sequencer from our basic loadout options to shortcircuit E-N's safety, it will give you a single attempt to use it. Oh, and remember to run like hell when you do... "
description = "We received an untracable contract from someone addressed 'ianfan2489@terragov.nt', they want the robotic clone of Ian dead- and it has to be dramatic. We will supply you with a cryptographic sequencer from our basic loadout options to shortcircuit E-N's safety, it will give you a single attempt to use it. Oh, and remember to run like hell when you do... "
telecrystal_reward = 3 // Because these are more complicated than 'kill the pet', the reward is bigger
telecrystal_penalty = 3 // Same cost as an emag on sale
@@ -18,7 +18,7 @@
/obj/item/clothing/under/rank/captain/skyrat/shipdress
name = "captain's dress"
desc = "A blue dress adorned with a gold trim. Perfect for a formal dinner."
icon_state = "solgov_dress"
icon_state = "terragov_dress"
can_adjust = FALSE
/obj/item/clothing/under/rank/captain/skyrat/imperial
@@ -38,7 +38,7 @@
/*
* BLUESHIELD
*/
//Why is this in command.dm? Simple: Centcom.dmi will already be packed with CC/NTNavy/AD/LL/SOL/FTU - all of them more event-based clothes, while this will appear
//Why is this in command.dm? Simple: Centcom.dmi will already be packed with CC/NTNavy/AD/LL/TERRA/FTU - all of them more event-based clothes, while this will appear
//on-station often.
/obj/item/clothing/under/rank/blueshield
@@ -52,8 +52,8 @@
name = "Folded Kingdom Of Agurkrral Flag"
item_path = /obj/item/sign/flag/ssc
/datum/loadout_item/inhand/flag_solfed
name = "Folded Sol Federation Flag"
/datum/loadout_item/inhand/flag_terragov
name = "Folded Terran Government Flag"
item_path = /obj/item/sign/flag/terragov
/datum/loadout_item/inhand/flag_moghes
@@ -37,7 +37,7 @@
<br><br>In case of lack of necessary skills to perform required tasks before the employment, the <i><u>employee</u></i> agrees to perform a skillchip installment and/or \
memory upload with qualifications/skills programs necessary to perform their duties, and a skillchip removal and/or memory wipe after their contract's over. The following procedures' \
medical fees, as well as the skillchip and/or memory altering procedures cost will be deducted from the <i><u>employee</u></i>'s payment at the end of the contract.\
<br><br>To note for the aforementioned, any ongoing or pending criminal investigations, if originated from the Sol Federation, are to be halted for the duration of work contract, \
<br><br>To note for the aforementioned, any ongoing or pending criminal investigations, if originated from the Terran Government, are to be halted for the duration of work contract, \
with any possible crimes occuring within the <i><u>employer</u></i>'s facilities punished by the contracted or corporate paramilitary and security forces.\
<br>Finally, the <i><u>employee</u></i> understands that the <i><u>employer</u></i> is not bound by the same contract principles as them and may terminate the contract at any time, \
for any reason, and without warning if need be. The <i><u>employee</u></i> agrees to approach any and all employment disputes through the assigned Head of Personnel \
Binary file not shown.

Before

Width:  |  Height:  |  Size: 36 KiB

After

Width:  |  Height:  |  Size: 32 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 16 KiB

After

Width:  |  Height:  |  Size: 34 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 31 KiB

After

Width:  |  Height:  |  Size: 28 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 6.2 KiB

After

Width:  |  Height:  |  Size: 6.2 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 21 KiB

After

Width:  |  Height:  |  Size: 19 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 6.5 KiB

After

Width:  |  Height:  |  Size: 13 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 4.1 KiB

After

Width:  |  Height:  |  Size: 4.1 KiB

@@ -10,11 +10,11 @@ Adds some new high tier engineering gear for use by ERTs.
None
### Defines
#define RADIO_CHANNEL_SOLFED "SolFed"
#define RADIO_KEY_SOLFED "l"
#define RADIO_TOKEN_SOLFED ":l"
#define RADIO_CHANNEL_TERRAGOV "Terragov"
#define RADIO_KEY_TERRAGOV "l"
#define RADIO_TOKEN_TERRAGOV ":l"
#define FREQ_SOLFED 1377
#define FREQ_TERRAGOV 1377
### Credits:
LT3
@@ -56,9 +56,9 @@
item_flag = /obj/item/sign/flag/mars
/obj/structure/sign/flag/terragov
name = "flag of Sol Federation"
desc = "The flag of Sol Federation. It's a symbol of humanity no matter where they go, or how much they wish it wasn't."
icon_state = "flag_solfed"
name = "flag of Terran Government"
desc = "The flag of Terran Government. It's a symbol of humanity no matter where they go, or how much they wish it wasn't."
icon_state = "flag_terragov"
item_flag = /obj/item/sign/flag/terragov
/obj/structure/sign/flag/nri
@@ -129,9 +129,9 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/structure/sign/flag/syndicate, 32)
sign_path = /obj/structure/sign/flag/ssc
/obj/item/sign/flag/terragov
name = "folded flag of the Sol Federation"
desc = "The folded flag of Sol Federation."
icon_state = "folded_solfed"
name = "folded flag of the Terran Government"
desc = "The folded flag of Terran Government."
icon_state = "folded_terragov"
sign_path = /obj/structure/sign/flag/terragov
/obj/item/sign/flag/tizira
Binary file not shown.

Before

Width:  |  Height:  |  Size: 6.8 KiB

After

Width:  |  Height:  |  Size: 16 KiB

@@ -124,7 +124,7 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/structure/sign/poster/contraband/nri_engineer,
/obj/structure/sign/poster/contraband/nri_radar
name = "Imperial navy enlistment poster"
desc = "Enlist with the imperial navy today! See the galaxy, shoot solarians, get PTSD!"
desc = "Enlist with the imperial navy today! See the galaxy, shoot terrans, get PTSD!"
icon = 'modular_skyrat/modules/aesthetics/posters/contraband.dmi'
icon_state = "nri_radar"
+1 -1
View File
@@ -44,4 +44,4 @@
config_entry_value = "Central Command has ordered the Epsilon security level on the station. Consider all contracts terminated."
/datum/config_entry/string/alert_gamma
config_entry_value = "The Solar Federation has placed this system under Gamma Alert status. This galactic system is facing a ZK-Class Reality Failure Scenario. Security Personnel is authorized full access to lethal equipment to enforce Martial Law. Failure to follow emergency procedures is punishable by death. This is not a drill."
config_entry_value = "The Terran Government has placed this system under Gamma Alert status. This galactic system is facing a ZK-Class Reality Failure Scenario. Security Personnel is authorized full access to lethal equipment to enforce Martial Law. Failure to follow emergency procedures is punishable by death. This is not a drill."
@@ -15,7 +15,7 @@
4 = "<span class='game say'><span class='name'>Leon Gardner</span> <span class='message'>clarifies, \"<span class=' '>In the following pre-release beta test, you'll be completing the intro level of the game, detailing the early stages of the Border War, and introducing you to the new mechanics like Smart NPCs and full molecular simulation.</span>\"</span></span>",
5 = "<span class='game say'><span class='name'>Leon Gardner</span> <span class='message'>echoes, \"<span class=' '>The setting has been chosen to be so early in the Border War as it complemented the prequel's story. Some of the lore pieces haven't been properly explained nor were entirely comprehensible by the players, so we've taken an extra effort to make it easier for a new player to follow the story.</span>\"</span></span>",
6 = "<span class='game say'><span class='name'>Leon Gardner</span> <span class='message'>states, \"<span class=' '>As such, most of the NPCs and items included have been cross-compared with their real life equivalents, via publicly available documents, interviews with the war veterans, and other means.</span>\"</span></span>",
7 = "<span class='game say'><span class='name'>Leon Gardner</span> <span class='message'>warns, \"<span class=' '>This particular map, 'intro-underscore-two', is a shortened representation of the many covert SolFed operations launched around the first few months of the war.</span>\"</span></span>",
7 = "<span class='game say'><span class='name'>Leon Gardner</span> <span class='message'>warns, \"<span class=' '>This particular map, 'intro-underscore-two', is a shortened representation of the many covert TerraGov operations launched around the first few months of the war.</span>\"</span></span>",
8 = "<span class='game say'><span class='name'>The universal recorder</span> <span class='message'>says, \"<span class='tape_recorder '>Recording stopped.</span>\"</span></span>",
)
@@ -1,6 +1,6 @@
/obj/machinery/iv_drip/health_station
name = "health station"
desc = "A wall-mounted healing mixture dispenser designed for stationary first-aid application. Old Solarian tech that got silently deprecated \
desc = "A wall-mounted healing mixture dispenser designed for stationary first-aid application. Old Terran tech that got silently deprecated \
due to a massive healthcare privatization; still utilized by the CIN-backed states."
icon = 'modular_skyrat/modules/bitrunning/icons/health_station.dmi'
icon_state = "health_station"
@@ -1,6 +1,6 @@
/mob/living/basic/trooper/cin_soldier
name = "Coalition Operative"
desc = "Death to SolFed."
desc = "Death to TerraGov."
melee_damage_lower = 15
melee_damage_upper = 20
attack_verb_continuous = "cuts"
@@ -1,5 +1,5 @@
/datum/outfit/solfed_bitrun
name = "Bitrunning SolFed Marine"
/datum/outfit/terragov_bitrun
name = "Bitrunning TerraGov Marine"
uniform = /obj/item/clothing/under/rank/security/officer/hecu
head = null
@@ -10,20 +10,20 @@
back = /obj/item/storage/backpack/ert/odst/hecu
glasses = null
ears = /obj/item/radio/headset/headset_faction/bowman
id = /obj/item/card/id/advanced/solfed
id = /obj/item/card/id/advanced/terragov
r_hand = null
l_hand = null
backpack_contents = null
belt = null
id_trim = /datum/id_trim/solfed_bitrun
id_trim = /datum/id_trim/terragov_bitrun
/datum/id_trim/solfed_bitrun
/datum/id_trim/terragov_bitrun
trim_icon = 'modular_skyrat/master_files/icons/obj/card.dmi'
assignment = "SolFed Marine"
trim_state = "trim_solfed"
department_color = COLOR_SOLFED_GOLD
subdepartment_color = COLOR_SOLFED_GOLD
sechud_icon_state = SECHUD_SOLFED
assignment = "TerraGov Marine"
trim_state = "trim_terragov"
department_color = COLOR_TERRAGOV_GOLD
subdepartment_color = COLOR_TERRAGOV_GOLD
sechud_icon_state = SECHUD_TERRAGOV
/datum/outfit/cin_soldier_corpse
name = "Coalition Operative Corpse"
@@ -2,13 +2,14 @@
/datum/lazy_template/virtual_domain/ancient_milsim
name = "Ancient Military Simulator"
cost = BITRUNNER_COST_HIGH
desc = "Recreate the events of the Border War's 'hot' part-long-gone as a Solarian strike team sweeping CIN compounds; sponsored by the SolFed recreation enthusiasts. \
desc = "Recreate the events of the Border War's 'hot' part-long-gone as a Terran strike team sweeping CIN compounds; sponsored by the SolFed recreation enthusiasts. \
Multiplayer playthrough and proper preparation highly recommended."
completion_loot = list(/obj/item/bitrunning_disk/item/ancient_milsim = 1)
difficulty = BITRUNNER_DIFFICULTY_HIGH
help_text = "The last part of this domain has a chance to be very PvP-centric. It's best if you don't come alone, and smuggle some ability and gear disks."
forced_outfit = /datum/outfit/solfed_bitrun
forced_outfit = /datum/outfit/terragov_bitrun
key = "ancient_milsim"
map_name = "skyrat_ancientmilsim"
mob_modules = list(/datum/modular_mob_segment/cin_mobs)
reward_points = BITRUNNER_REWARD_HIGH
+1 -1
View File
@@ -147,7 +147,7 @@
if(CME_ARMAGEDDON)
addtimer(CALLBACK(src, PROC_REF(cme_level_callback), SEC_LEVEL_GAMMA, TRUE, TRUE), (round((start_when * SSevents.wait) * 0.1, 0.1)) SECONDS)
priority_announce("Neutron Mass Ejection Detected! Expected intensity: [uppertext(cme_intensity)]. Impact in: [round((start_when * SSevents.wait) * 0.1, 0.1)] seconds. \
All personnel should proceed to their nearest warpgate for evacuation, the Solar Federation has issued this mandatory alert.", "Solar Event", sound('modular_skyrat/modules/cme/sound/cme_warning.ogg'))
All personnel should proceed to their nearest warpgate for evacuation, the Terran Government has issued this mandatory alert.", "Solar Event", sound('modular_skyrat/modules/cme/sound/cme_warning.ogg'))
/datum/round_event/cme/tick(seconds_between_ticks)
if(ISMULTIPLE(activeFor, rand(cme_frequency_lower, cme_frequency_upper)))
@@ -83,8 +83,8 @@
cost = PAYCHECK_CREW
/datum/armament_entry/company_import/nri_surplus/misc/food_replicator
description = "Once widespread technology used by numerous fringe colonies of NRI origin and even in some SolFed territories, that ultimately went out of fashion due to \
SolFed propaganda deeming it unprofitable and imposing severe trading fees on anyone trying to sell them. A small portion of government-backed manufacturers still produce \
description = "Once widespread technology used by numerous fringe colonies of NRI origin and even in some TerraGov territories, that ultimately went out of fashion due to \
TerraGov propaganda deeming it unprofitable and imposing severe trading fees on anyone trying to sell them. A small portion of government-backed manufacturers still produce \
'food replicators' for private and government use; a few of them is selling this via us."
item_type = /obj/item/circuitboard/machine/biogenerator/food_replicator
cost = CARGO_CRATE_VALUE * 9
@@ -2,7 +2,7 @@
category = COMPANY_NAME_SOL_DEFENSE_DEFENSE
company_bitflag = CARGO_COMPANY_SOL_DEFENSE
// Beautiful SolFed clothing
// Beautiful TerraGov clothing
/datum/armament_entry/company_import/sol_defense/clothing
subcategory = "Surplus Clothing"
@@ -33,7 +33,7 @@
item_type = /obj/item/clothing/suit/armor/sf_peacekeeper
/datum/armament_entry/company_import/sol_defense/armor/flak_jacket
item_type = /obj/item/clothing/suit/armor/vest/det_suit/sol
item_type = /obj/item/clothing/suit/armor/vest/det_suit/terra
/datum/armament_entry/company_import/sol_defense/armor/slim_vest
name = "type I vest"
@@ -261,7 +261,7 @@
icon = 'modular_skyrat/master_files/icons/obj/clothing/hats.dmi'
worn_icon = 'modular_skyrat/master_files/icons/mob/clothing/head.dmi'
desc = "It's good overthrowing the king."
icon_state = "solgov_bicorne"
icon_state = "terragov_bicorne"
worn_y_offset = 2
/obj/item/clothing/head/hats/caphat/sonnensoldner
@@ -36,7 +36,7 @@
desc = "A lightweight armored robe in the Captain's colors. For when you want something classy, but regal."
icon = 'modular_skyrat/master_files/icons/obj/clothing/suits/armor.dmi'
worn_icon = 'modular_skyrat/master_files/icons/mob/clothing/suits/armor.dmi'
icon_state = "solgov_robe"
icon_state = "terragov_robe"
body_parts_covered = CHEST|ARMS
/obj/item/clothing/suit/armor/vest/capcarapace/robe/overseer
@@ -44,14 +44,14 @@
desc = "An armored robe in the Captain's colors. For when you want to lead a cult."
icon = 'modular_skyrat/master_files/icons/obj/clothing/suits/armor.dmi'
worn_icon = 'modular_skyrat/master_files/icons/mob/clothing/suits/armor.dmi'
icon_state = "solgov_overseer_robe"
icon_state = "terragov_overseer_robe"
/obj/item/clothing/suit/armor/vest/capcarapace/bathrobe
name = "captain's bathrobe"
desc = "Well that's just like, your opinion man."
icon = 'modular_skyrat/master_files/icons/obj/clothing/suits/armor.dmi'
worn_icon = 'modular_skyrat/master_files/icons/mob/clothing/suits/armor.dmi'
icon_state = "solgov_jacket"
icon_state = "terragov_jacket"
body_parts_covered = CHEST|ARMS
/obj/item/clothing/suit/armor/vest/capcarapace/bathrobe/Initialize(mapload)
@@ -63,7 +63,7 @@
desc = "For the humble Captain."
icon = 'modular_skyrat/master_files/icons/obj/clothing/suits/armor.dmi'
worn_icon = 'modular_skyrat/master_files/icons/mob/clothing/suits/armor.dmi'
icon_state = "solgov_suit"
icon_state = "terragov_suit"
body_parts_covered = CHEST|ARMS
/obj/item/clothing/suit/armor/vest/capcarapace/gambison
@@ -71,7 +71,7 @@
desc = "Unrelated to that other Bison fellow. Our lawyers say No! No!"
icon = 'modular_skyrat/master_files/icons/obj/clothing/suits/armor.dmi'
worn_icon = 'modular_skyrat/master_files/icons/mob/clothing/suits/armor.dmi'
icon_state = "solgov_gambison"
icon_state = "terragov_gambison"
body_parts_covered = CHEST|ARMS
/obj/item/clothing/suit/armor/vest/capcarapace/winterovercoat
@@ -79,7 +79,7 @@
desc = "Not as warm as it looks, especially since it was stol- err, borrowed from the Head of Security."
icon = 'modular_skyrat/master_files/icons/obj/clothing/suits/armor.dmi'
worn_icon = 'modular_skyrat/master_files/icons/mob/clothing/suits/armor.dmi'
icon_state = "solgov_coat"
icon_state = "terragov_coat"
body_parts_covered = CHEST|ARMS
/obj/item/clothing/suit/armor/vest/capcarapace/overcoat
@@ -87,7 +87,7 @@
desc = "Bid our father the Sea King rise from the depths full foul in his fury!"
icon = 'modular_skyrat/master_files/icons/obj/clothing/suits/armor.dmi'
worn_icon = 'modular_skyrat/master_files/icons/mob/clothing/suits/armor.dmi'
icon_state = "solgov_overcoat"
icon_state = "terragov_overcoat"
body_parts_covered = CHEST|ARMS
/obj/item/clothing/suit/armor/vest/bridge
@@ -95,7 +95,7 @@
desc = "For those big enough to live on the bridge, but not so big they can reach the buttons."
icon = 'modular_skyrat/master_files/icons/obj/clothing/suits/armor.dmi'
worn_icon = 'modular_skyrat/master_files/icons/mob/clothing/suits/armor.dmi'
icon_state = "coat_solgov"
icon_state = "coat_terragov"
/obj/item/clothing/suit/armor/vest/bridge/Initialize(mapload)
. = ..()
@@ -1354,10 +1354,10 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/structure/sign/poster/contraband/korpstech, 32)
/obj/item/coin/donator/marsoc
name = "MARSOC Challenge Coin"
desc = "This is a challenge coin given to all MARSOC members upon honorable separation from the Corps. \
The coin has the insignia of the Marine Special Operations Command on one side, and the Sol Federation Marine Corps logo on the other. \
The coin has the insignia of the Marine Special Operations Command on one side, and the Terran Government Marine Corps logo on the other. \
This one has an engraving on the Marine Corps logo side, etched in a circle around it: \
\"To Staff Sargent Henry Rockwell, for his exemplary service to the Special Operations community and his outstanding moral fiber \
and shining example to the core values of the Sol Federation Marine Corps.\""
and shining example to the core values of the Terran Government Marine Corps.\""
icon = 'modular_skyrat/master_files/icons/donator/obj/custom.dmi'
sideslist = list("MARSOC", "SFMC")
@@ -1590,8 +1590,11 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/structure/sign/poster/contraband/korpstech, 32)
icon_state = "digicoat_interdyne"
/obj/item/clothing/suit/armor/hos/elofy
name = "solar admiral coat"
desc = "A traditional naval officer uniform of the late 63rd Expeditionary Fleet. This faithful recreation bears the admiral's crest of the Luna Wolves Legion. It is uniquely tailored to the form of a certain wolf girl."
name = "anime admiral coat"
desc = "This coat is a near perfect replica of the one worn by Admiral Yi Sun-Sin, main character from \"Heroes of the Galactic Conflict\", \
an animated war drama set between the Free Planetary Trade Union and the Second Galactic Empire. \
It proved to be a sensational piece among those who appreciate animated cartoons and period war dramas, \
but hasn't had much spread outside of the Terran Government."
icon = 'modular_skyrat/master_files/icons/donator/obj/clothing/suits.dmi'
worn_icon = 'modular_skyrat/master_files/icons/donator/mob/clothing/suit.dmi'
icon_state = "coat_blackblue"
@@ -1626,7 +1629,11 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/structure/sign/poster/contraband/korpstech, 32)
/obj/item/clothing/head/hats/hos/elofy
name = "solar admiral hat"
name = "anime admiral hat"
desc = "This hat is a near perfect replica of the one worn by Admiral Yi Sun-Sin, main character from \"Heroes of the Galactic Conflict\", \
an animated war drama set between the Free Planetary Trade Union and the Second Galactic Empire. \
It proved to be a sensational piece among those who appreciate animated cartoons and period war dramas, \
but hasn't had much spread outside of the Terran Government."
icon ='modular_skyrat/master_files/icons/donator/obj/clothing/hats.dmi'
worn_icon = 'modular_skyrat/master_files/icons/donator/mob/clothing/head.dmi'
icon_state = "hat_black"
@@ -1644,7 +1651,11 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/structure/sign/poster/contraband/korpstech, 32)
/obj/item/clothing/gloves/elofy
name = "solar admiral gloves"
name = "anime admiral gloves"
desc = "These gloves are a near perfect replica of those worn by Admiral Yi Sun-Sin, main character from \"Heroes of the Galactic Conflict\", \
an animated war drama set between the Free Planetary Trade Union and the Second Galactic Empire. \
It proved to be a sensational piece among those who appreciate animated cartoons and period war dramas, \
but hasn't had much spread outside of the Terran Government."
icon = 'modular_skyrat/master_files/icons/donator/obj/clothing/gloves.dmi'
worn_icon = 'modular_skyrat/master_files/icons/donator/mob/clothing/hands.dmi'
icon_state = "gloves_black"
@@ -1661,7 +1672,11 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/structure/sign/poster/contraband/korpstech, 32)
)
/obj/item/clothing/shoes/jackboots/elofy
name = "solar admiral boots"
name = "anime admiral boots"
desc = "These boots are a near perfect replica of those worn by Admiral Yi Sun-Sin, main character from \"Heroes of the Galactic Conflict\", \
an animated war drama set between the Free Planetary Trade Union and the Second Galactic Empire. \
It proved to be a sensational piece among those who appreciate animated cartoons and period war dramas, \
but hasn't had much spread outside of the Terran Government."
icon = 'modular_skyrat/master_files/icons/donator/obj/clothing/shoes.dmi'
worn_icon = 'modular_skyrat/master_files/icons/donator/mob/clothing/feet.dmi'
icon_state = "boots_blackblue"
@@ -1,6 +1,6 @@
/datum/language/common
name = "Sol Common"
desc = "And when contact was established, the Admiral waved at the screen and said, \"Mi parolas la lingvon de la Homines!\" - I speak the language of Mankind. A simplified mix of Esperanto and Modern Latin, and the only recognized official language of the Sol Federation. This peculiar constructed language became popular during SolFed's earliest days, and was almost entirely overtaken by other popular tongues - it became widespread through heavy-handed political maneuvering with the help of corporate bureaucrats and other undesirables. Nowadays, it's a near-universal tongue and a must-know for any sentient being that plans to leap forward into space."
desc = "And when contact was established, the Admiral waved at the screen and said, \"Mi parolas la lingvon de la Homines!\" - I speak the language of Mankind. A simplified mix of Esperanto and Modern Latin, and the only recognized official language of the Terran Government. This peculiar constructed language became popular during TerraGov's earliest days, and was almost entirely overtaken by other popular tongues - it became widespread through heavy-handed political maneuvering with the help of corporate bureaucrats and other undesirables. Nowadays, it's a near-universal tongue and a must-know for any sentient being that plans to leap forward into space."
space_chance = 60
syllables = list(
"al", "an", "ar", "as", "at", "ed", "er", "ha", "he", "hi", "is", "le", "me", "on", "se", "ti",
@@ -1,11 +1,11 @@
/datum/language/gutter
name = "Plutonian"
desc = "Plutonian Franco-Castilian is a constructed Romance language that was developed early on in the Sol Federation's colonization history out of necessity for communication between its first Plutonian colonists. It heavily borrows from Spanish and French, with minor influence from other tongues the likes of Italian and Portuguese, despite coming off as elegant it carries a heavy amount of slang and idioms correlated to certain criminal groups. Today, it stands heavily engrained in the planet's culture - and almost every citizen will speak at least some of it on top of Sol."
desc = "Plutonian Franco-Castilian is a constructed Romance language that was developed early on in the Terran Government's colonization history out of necessity for communication between its first Plutonian colonists. It heavily borrows from Spanish and French, with minor influence from other tongues the likes of Italian and Portuguese, despite coming off as elegant it carries a heavy amount of slang and idioms correlated to certain criminal groups. Today, it stands heavily engrained in the planet's culture - and almost every citizen will speak at least some of it on top of Sol."
key = "G"
flags = TONGUELESS_SPEECH
syllables = list (
"bai", "cai", "jai", "quai", "vai", "dei", "lei", "quei", "sei", "noi", "quoi", "voi", "beu", "queu", "seu", "gan", "zan", "quan", "len", "ten",
"ba", "be", "bi", "bo", "bu", "ca", "ce", "ci", "co", "cu", "da", "de", "di", "do", "du", "fa", "fe", "fi", "fo", "fu", "ga", "gue", "gui", "go",
"ba", "be", "bi", "bo", "bu", "ca", "ce", "ci", "co", "cu", "da", "de", "di", "do", "du", "fa", "fe", "fi", "fo", "fu", "ga", "gue", "gui", "go",
"gu", "ña", "ñe", "ñi", "ño", "ñu", "que", "qui", "cha", "che", "chi", "cho", "chu", "lla", "lle", "lli", "llo", "llu",
"tá", "vé", "sál", "fáb", "l'e", "seu", "deu", "meu", "vai", "ción", "tá"
)
@@ -1,6 +1,6 @@
/datum/language/panslavic
name = "Pan-Slavic"
desc = "An elaborate mix of various Slavic languages with similar properties that has long since become the official language of the NRI, with a steady amount of relevance in SolFed colonies with Slavic descendants and various types of trading posts and spaceports across Human space - it even managed to find a niche in communication with other species."
desc = "An elaborate mix of various Slavic languages with similar properties that has long since become the official language of the NRI, with a steady amount of relevance in TerraGov colonies with Slavic descendants and various types of trading posts and spaceports across Human space - it even managed to find a niche in communication with other species."
key = "P"
flags = TONGUELESS_SPEECH
syllables = list(
@@ -1,6 +1,6 @@
/datum/language/yangyu
name = "Yangyu"
desc = "Also popularly known as \"Konjin\", this language group formally regarded as Orbital Sino-Tibetan is a result of a genetic relationship between Chinese, Tibetan, Burmese, and other Human languages of similar characteristics that was first proposed in the early 19th century and is extremely popular even in the space age. Originating from Asia, this group of tongues is the second most spoken by Human and Human-derived populations since the birth of Sol Common - and was a primary contender to be the Sol Federation's official language. Many loanwords, idioms, and cultural relics of Japanese, Ryukyuan, Korean, and other societies have managed to persist within it, especially in the daily lives of speakers coming from Martian cities."
desc = "Also popularly known as \"Konjin\", this language group formally regarded as Orbital Sino-Tibetan is a result of a genetic relationship between Chinese, Tibetan, Burmese, and other Human languages of similar characteristics that was first proposed in the early 19th century and is extremely popular even in the space age. Originating from Asia, this group of tongues is the second most spoken by Human and Human-derived populations since the birth of Sol Common - and was a primary contender to be the Terran Government's official language. Many loanwords, idioms, and cultural relics of Japanese, Ryukyuan, Korean, and other societies have managed to persist within it, especially in the daily lives of speakers coming from Martian cities."
key = "Y"
flags = TONGUELESS_SPEECH
space_chance = 70
@@ -56,13 +56,13 @@
return placeholder_description
/datum/species/akula/get_species_lore()
return list("The Azuleans, known as 'Akulas' or 'Akulans' to humans, are a strong-willed and monarchist culture. A vast nation, the Kingdom of Agurkrral has achieved its status largely by sheer tenacity; Azuleans forcing themselves upwards from the depths of their home seas all the way to a monarchy that even dwarfs the Sol Federation. They are known to be an expansionist culture, collectivist opportunists that are driven by history and culture to push further, and to push onward. To keep moving, or to suffocate and stagnate.",
return list("The Azuleans, known as 'Akulas' or 'Akulans' to humans, are a strong-willed and monarchist culture. A vast nation, the Kingdom of Agurkrral has achieved its status largely by sheer tenacity; Azuleans forcing themselves upwards from the depths of their home seas all the way to a monarchy that even dwarfs the Terran Government. They are known to be an expansionist culture, collectivist opportunists that are driven by history and culture to push further, and to push onward. To keep moving, or to suffocate and stagnate.",
"Beginning their prehistory with total defeat of another intelligent species set to keep them in their waters forever, the Azuleans have forged themselves into a pioneering people willing to exploit even the most hostile lands; and turn foreign places, flora and fauna, and even people to their advantage. New colonies are being terraformed into 'Agurkrral-A-Likes' every day, strange bioengineered creatures released into the wilds and massive treatment machines being ran in the waters to accomodate the new biosphere. Even some foreign citizens have been forcibly turned into Azuleans through genemodding, before having their genes locked and unable to be altered by anyone else.",
"Their drive for constant expansion and 'the next great thing' has made the Kingdom a divided one; a culture split in two. Generations of Azuleans are separated not by age-based cohorts, but by distance; the 'Near' generations growing up in the Old Principalities, and the 'Far' generations growing up in the New Principalities.",
"The Old Principalities, coreward around their Homeworld, are a burgeoning place slowly falling victim to stagnation. The core worlds still cling to ancient traditions, ceremonies and expectation; old aristocratic houses, tracing their power from ancient ancestors placed to protect and shepherd their assigned lands, still thrive; and the King still rules over many systems of old. Constant reforms and false shake-ups of the status quo demand more and more. Longer bouts of service to achieve citizenship, reformation camps to 'iron out' those with physical and mental defects, and high reliance on exams, education, and pomp to create a hierarchy within its society.",
"The New Principalities, created and commandeered by edgerunning 'border princes' dwelling around the furthest reaches of the Kingdom, embody the Azulean spirit of opportunism and adventurism. Warlord-style nobles reign free, able to outswim any checks meant to control their power and influence. A laissez-faire approach is taken here, where anyone can do anything to become somebody; ambition and self-evolution valued far more than any birthright. Sprawling casino cities, pirate ports, and even luxurious resorts are known to be built up overnight, anyone being able to make money and become wealthy and even command naval ships on charisma and strength alone; fear being the second state currency right behind credits. Even some SolFed citizens are known to come here and profit as mercenaries, investors, gamblers, or even 'border princes.'",
"The New Principalities, created and commandeered by edgerunning 'border princes' dwelling around the furthest reaches of the Kingdom, embody the Azulean spirit of opportunism and adventurism. Warlord-style nobles reign free, able to outswim any checks meant to control their power and influence. A laissez-faire approach is taken here, where anyone can do anything to become somebody; ambition and self-evolution valued far more than any birthright. Sprawling casino cities, pirate ports, and even luxurious resorts are known to be built up overnight, anyone being able to make money and become wealthy and even command naval ships on charisma and strength alone; fear being the second state currency right behind credits. Even some TerraGov citizens are known to come here and profit as mercenaries, investors, gamblers, or even 'border princes.'",
"These generations split apart by distance are known for their animosity towards the other. To those in the New Principalities, their coreward cousins have lost the 'Azulean spirit;' rotting apart in their palaces, sitting in waters choked with ennui. Their forever expansion into the frontier colonies, their use of every useful material and lifeform is what they believe their Kingdom is fueled by. But to those in the Old Principalities, their edgeward descendants have lost their minds. They believe the spiritual and societal importance of their Homeworld has fallen on deaf ears, and the lackadaisical attitude about the core mechanisms and noble structures holding the Kingdom together has become nothing short of infuriating. It is the belief of many high-ranking members of the Monarchy that the ongoing terraforming processes in the frontiers are proof of the arrogance of the 'border princes' controlling them; each and every world made in the image of a planet the King himself is meant to protect.",
"Yet, despite their differences, all Agurkrral citizens swim freely in their kingdom's waters. Even the most controlling border princes, even those in the Old Principalities working the slave trade, know better than to openly erode a citizen's right to life, property, and speech. Any alien species can become an Agurkrral citizen, and even non-citizens enjoy the right to life, with executions outright banned. The aristocracy remains well-educated, even the edgerunner warlords of the New Principalities, and the Kingdom as a whole enjoys its status as a nation that's now a true rival to Sol. Larger, more populated, and better developed; though, having to 'integrate' Solarian technologies, goods, and peoples to fully succeed. The Azuleans are even known as an environmentally-focused people; although they hold no care for lands they cannot make use of, modern nobles are still in charge of maintaining the biosphere of lands they control, to allow their strangely engineered flora and fauna to thrive, and for the people to have healthy and clean waters to live in.",
"Yet, despite their differences, all Agurkrral citizens swim freely in their kingdom's waters. Even the most controlling border princes, even those in the Old Principalities working the slave trade, know better than to openly erode a citizen's right to life, property, and speech. Any alien species can become an Agurkrral citizen, and even non-citizens enjoy the right to life, with executions outright banned. The aristocracy remains well-educated, even the edgerunner warlords of the New Principalities, and the Kingdom as a whole enjoys its status as a nation that's now a true rival to Sol. Larger, more populated, and better developed; though, having to 'integrate' Terran technologies, goods, and peoples to fully succeed. The Azuleans are even known as an environmentally-focused people; although they hold no care for lands they cannot make use of, modern nobles are still in charge of maintaining the biosphere of lands they control, to allow their strangely engineered flora and fauna to thrive, and for the people to have healthy and clean waters to live in.",
)
/datum/species/akula/randomize_features()
@@ -70,13 +70,13 @@ GLOBAL_VAR(first_officer)
"Interdyne Pharmaceuticals Chemical Factory" = 5,
"Free Teshari League Engineering Station" = 5,
"Agurkrral Military Base" = 5,
"Sol Federation Embassy" = 5,
"Terran Government Embassy" = 5,
"Novaya Rossiyskaya Imperiya Civilian Port" = 5,
))
///"right" = Right for the raiders to use as an argument; usually pretty difficult to avoid.
var/right_pick = pick(
"high probability of NRI-affiliated civilian casualties aboard the facility",
"highly increased funding by the SolFed authorities; neglected NRI-backed subsidiaries' contracts",
"highly increased funding by the TerraGov authorities; neglected NRI-backed subsidiaries' contracts",
"unethical hiring practices and unfair payment allocation for the NRI citizens",
"recently discovered BSA-[number] or similar model in close proximity to the neutral space aboard this or nearby affiliated facility",
)
@@ -84,7 +84,7 @@ GLOBAL_VAR(first_officer)
var/wrong_pick = pick(
"inadequate support of the local producer",
"unregulated production of Gauss weaponry aboard this installation",
"SolFed-backed stationary military formation on the surface of Indecipheres",
"TerraGov-backed stationary military formation on the surface of Indecipheres",
"AUTOMATED REGULATORY VIOLATION DETECTION SYSTEM CRITICAL FAILURE. PLEASE CONTACT AND INFORM THE DISPATCHED AUTHORITIES TO RESOLVE THE ISSUE. \
ANY POSSIBLE INDENTURE HAS BEEN CLEARED. WE APOLOGIZE FOR THE INCONVENIENCE",
)
@@ -450,7 +450,7 @@ GLOBAL_VAR(first_officer)
<br> It was not designed for any kind of long-term deployments and anything more aggressive than shooting up a bunch of punks, so expect frequent power outages and a significant lack of raiding machinery.
<br> We have done some quick modifications to make it more suitable for military use, and smuggled you some defensive and military-grade medical equipment to balance it out. And some SMGs that were so convenient to \"go out of service and get scrapped". It should do the job for now.
<br> It is worth mentioning that your fourth marine, the maintenance crew man, went on a vacation. Dude's been pretty nervous as of late so it's only fair to let him get some well deserved rest - he has been maintaining this ship the whole time you've been in cryosleep. This should not affect your performance anyways.
<br> As for the broken Krinkov, there is nothing we can do for now. Will have to use the policemen's, not like you're here to fight the solarians anyways.
<br> As for the broken Krinkov, there is nothing we can do for now. Will have to use the policemen's, not like you're here to fight the terrans anyways.
<br> And, please, for the love of God and the Eternal Empress - do not make this mission into a shootout. We can't afford any more casualties in this sector, especially with the most of our military being on the frontline.
<br>
<br> Don't screw this up,
@@ -1,7 +1,7 @@
#define SOLFED_AMT "amount"
#define SOLFED_VOTES "votes"
#define SOLFED_DECLARED "declared"
#define SOLFED_FINE_AMOUNT -20000
#define TERRAGOV_AMT "amount"
#define TERRAGOV_VOTES "votes"
#define TERRAGOV_DECLARED "declared"
#define TERRAGOV_FINE_AMOUNT -20000
#define EMERGENCY_RESPONSE_POLICE "WOOP WOOP THAT'S THE SOUND OF THE POLICE"
#define EMERGENCY_RESPONSE_ATMOS "DISCO INFERNO"
@@ -11,7 +11,7 @@
GLOBAL_VAR(caller_of_911)
GLOBAL_VAR(call_911_msg)
GLOBAL_VAR(pizza_order)
GLOBAL_VAR_INIT(solfed_tech_charge, -7500)
GLOBAL_VAR_INIT(terragov_tech_charge, -7500)
GLOBAL_LIST_INIT(pizza_names, list(
"Dixon Buttes",
"I. C. Weiner",
@@ -41,31 +41,31 @@ GLOBAL_LIST_INIT(pizza_names, list(
"Joe Mama"
))
GLOBAL_LIST_INIT(emergency_responders, list())
GLOBAL_LIST_INIT(solfed_responder_info, list(
GLOBAL_LIST_INIT(terragov_responder_info, list(
"911_responders" = list(
SOLFED_AMT = 0,
SOLFED_VOTES = 0,
SOLFED_DECLARED = FALSE
TERRAGOV_AMT = 0,
TERRAGOV_VOTES = 0,
TERRAGOV_DECLARED = FALSE
),
"swat" = list(
SOLFED_AMT = 0,
SOLFED_VOTES = 0,
SOLFED_DECLARED = FALSE
TERRAGOV_AMT = 0,
TERRAGOV_VOTES = 0,
TERRAGOV_DECLARED = FALSE
),
"national_guard" = list(
SOLFED_AMT = 0,
SOLFED_VOTES = 0,
SOLFED_DECLARED = FALSE
TERRAGOV_AMT = 0,
TERRAGOV_VOTES = 0,
TERRAGOV_DECLARED = FALSE
),
"dogginos" = list(
SOLFED_AMT = 0,
SOLFED_VOTES = 0,
SOLFED_DECLARED = FALSE
TERRAGOV_AMT = 0,
TERRAGOV_VOTES = 0,
TERRAGOV_DECLARED = FALSE
),
"dogginos_manager" = list(
SOLFED_AMT = 0,
SOLFED_VOTES = 0,
SOLFED_DECLARED = FALSE
TERRAGOV_AMT = 0,
TERRAGOV_VOTES = 0,
TERRAGOV_DECLARED = FALSE
)
))
GLOBAL_LIST_INIT(call911_do_and_do_not, list(
@@ -76,7 +76,7 @@ GLOBAL_LIST_INIT(call911_do_and_do_not, list(
Are you sure you want to call EMTs?",
EMERGENCY_RESPONSE_POLICE = "You SHOULD call Marshals for:\n\
Security ignoring Command, Security violating civil rights, Security engaging in Mutiny, \
General Violation of Sol Federation Citizen Rights by Command/Security, etc.\n\
General Violation of Terran Government Citizen Rights by Command/Security, etc.\n\
You SHOULD NOT call Marshals for:\n\
Corporate affairs, manhunts, settling arguments, etc.\n\
Are you sure you want to call Marshals?",
@@ -84,7 +84,7 @@ GLOBAL_LIST_INIT(call911_do_and_do_not, list(
Stationwide atmospherics loss, wide-scale supermatter delamination related repairs, unending fires filling the hallways, or department-sized breaches with Engineering and Atmospherics unable to handle it, etc. \n\
You SHOULD NOT call Advanced Atmospherics for:\n\
A trashcan on fire in the library, a single breached room, heating issues, etc. - especially with capable Engineers/Atmos Techs.\n\
There is a response fee of [abs(GLOB.solfed_tech_charge)] credits per emergency responder.\n\
There is a response fee of [abs(GLOB.terragov_tech_charge)] credits per emergency responder.\n\
Are you sure you want to call Advanced Atmospherics?"
))
@@ -93,7 +93,7 @@ GLOBAL_LIST_INIT(call911_do_and_do_not, list(
var/team_size
var/cops_to_send
var/announcement_message = "sussus amogus"
var/announcer = "Sol Federation Marshal Department"
var/announcer = "Terran Government Marshal Department"
var/poll_question = "fuck you leatherman"
var/cell_phone_number = "911"
var/list_to_use = "911_responders"
@@ -101,34 +101,34 @@ GLOBAL_LIST_INIT(call911_do_and_do_not, list(
if(EMERGENCY_RESPONSE_POLICE)
team_size = 8
cops_to_send = /datum/antagonist/ert/request_911/police
announcement_message = "Crewmembers of [station_name()]. this is the Sol Federation. We've received a request for immediate marshal support, and we are \
announcement_message = "Crewmembers of [station_name()]. this is the Terran Government. We've received a request for immediate marshal support, and we are \
sending our best marshals to support your station.\n\n\
If the first responders request that they need SWAT support to do their job, or to report a faulty 911 call, we will send them in at additional cost to your station to the \
tune of $20,000.\n\n\
The transcript of the call is as follows:\n\
[GLOB.call_911_msg]"
announcer = "Sol Federation Marshal Department"
announcer = "Terran Government Marshal Department"
poll_question = "The station has called for the Marshals. Will you respond?"
if(EMERGENCY_RESPONSE_ATMOS)
team_size = tgui_input_number(usr, "How many techs would you like dispatched?", "How badly did you screw up?", 3, 3, 1)
cops_to_send = /datum/antagonist/ert/request_911/atmos
announcement_message = "Crewmembers of [station_name()]. this is the Sol Federation's 811 dispatch. We've received a report of stationwide structural damage, atmospherics loss, fire, or otherwise, and we are \
announcement_message = "Crewmembers of [station_name()]. this is the Terran Government's 811 dispatch. We've received a report of stationwide structural damage, atmospherics loss, fire, or otherwise, and we are \
sending an Advanced Atmospherics team to support your station.\n\n\
The transcript of the call is as follows:\n\
[GLOB.call_911_msg]"
announcer = "Sol Federation 811 Dispatch - Advanced Atmospherics"
announcer = "Terran Government 811 Dispatch - Advanced Atmospherics"
poll_question = "The station has called for an advanced engineering support team. Will you respond?"
cell_phone_number = "911" //This needs to stay so they can communicate with SWAT
if(EMERGENCY_RESPONSE_EMT)
team_size = 8
cops_to_send = /datum/antagonist/ert/request_911/emt
announcement_message = "Crewmembers of [station_name()]. this is the Sol Federation. We've received a request for immediate medical support, and we are \
announcement_message = "Crewmembers of [station_name()]. this is the Terran Government. We've received a request for immediate medical support, and we are \
sending our best emergency medical technicians to support your station.\n\n\
If the first responders request that they need SWAT support to do their job, or to report a faulty 911 call, we will send them in at additional cost to your station to the \
tune of $20,000.\n\n\
The transcript of the call is as follows:\n\
[GLOB.call_911_msg]"
announcer = "Sol Federation EMTs"
announcer = "Terran Government EMTs"
poll_question = "The station has called for medical support. Will you respond?"
if(EMERGENCY_RESPONSE_EMAG)
team_size = 8
@@ -143,7 +143,7 @@ GLOBAL_LIST_INIT(call911_do_and_do_not, list(
cell_phone_number = "Dogginos"
list_to_use = "dogginos"
priority_announce(announcement_message, announcer, 'sound/effects/families_police.ogg', has_important_message=TRUE, color_override = "yellow")
var/list/candidates = SSpolling.poll_ghost_candidates(poll_question, check_jobban = "deathsquad", alert_pic = /obj/item/card/id/advanced/solfed, role_name_text = "solfed response team")
var/list/candidates = SSpolling.poll_ghost_candidates(poll_question, check_jobban = "deathsquad", alert_pic = /obj/item/card/id/advanced/terragov, role_name_text = "Terran Government response team")
if(candidates.len)
//Pick the (un)lucky players
@@ -151,7 +151,7 @@ GLOBAL_LIST_INIT(call911_do_and_do_not, list(
var/list/spawnpoints = GLOB.emergencyresponseteamspawn
var/index = 0
GLOB.solfed_responder_info[list_to_use][SOLFED_AMT] = agents_number
GLOB.terragov_responder_info[list_to_use][TERRAGOV_AMT] = agents_number
while(agents_number && candidates.len)
var/spawn_loc = spawnpoints[index + 1]
//loop through spawnpoints one at a time
@@ -176,7 +176,7 @@ GLOBAL_LIST_INIT(call911_do_and_do_not, list(
if(cops_to_send == /datum/antagonist/ert/request_911/atmos) // charge for atmos techs
var/datum/bank_account/station_balance = SSeconomy.get_dep_account(ACCOUNT_CAR)
station_balance?.adjust_money(GLOB.solfed_tech_charge)
station_balance?.adjust_money(GLOB.terragov_tech_charge)
else
var/obj/item/gangster_cellphone/phone = new() // biggest gang in the city
phone.gang_id = cell_phone_number
@@ -190,7 +190,7 @@ GLOBAL_LIST_INIT(call911_do_and_do_not, list(
//Logging and cleanup
log_game("[key_name(cop)] has been selected as an [ert_antag.name]")
if(cops_to_send == /datum/antagonist/ert/request_911/atmos)
log_game("[abs(GLOB.solfed_tech_charge)] has been charged from the station budget for [key_name(cop)]")
log_game("[abs(GLOB.terragov_tech_charge)] has been charged from the station budget for [key_name(cop)]")
agents_number--
GLOB.cops_arrived = TRUE
return TRUE
@@ -221,7 +221,7 @@ GLOBAL_LIST_INIT(call911_do_and_do_not, list(
return TRUE
/obj/machinery/computer/communications/proc/calling_911(mob/user, called_group_pretty = "EMTs", called_group = EMERGENCY_RESPONSE_EMT)
message_admins("[ADMIN_LOOKUPFLW(user)] is considering calling the Sol Federation [called_group_pretty].")
message_admins("[ADMIN_LOOKUPFLW(user)] is considering calling the Terran Government [called_group_pretty].")
var/call_911_msg_are_you_sure = "Are you sure you want to call 911? Faulty 911 calls results in a $20,000 fine and a 5 year superjail \
sentence."
if(tgui_alert(user, call_911_msg_are_you_sure, "Call 911", list("No", "Yes")) != "Yes")
@@ -237,18 +237,18 @@ GLOBAL_LIST_INIT(call911_do_and_do_not, list(
GLOB.cops_arrived = TRUE
GLOB.call_911_msg = reason_to_call_911
GLOB.caller_of_911 = user.name
log_game("[key_name(user)] has called the Sol Federation [called_group_pretty] for the following reason:\n[GLOB.call_911_msg]")
message_admins("[ADMIN_LOOKUPFLW(user)] has called the Sol Federation [called_group_pretty] for the following reason:\n[GLOB.call_911_msg]")
deadchat_broadcast(" has called the Sol Federation [called_group_pretty] for the following reason:\n[GLOB.call_911_msg]", span_name("[user.real_name]"), user, message_type = DEADCHAT_ANNOUNCEMENT)
log_game("[key_name(user)] has called the Terran Government [called_group_pretty] for the following reason:\n[GLOB.call_911_msg]")
message_admins("[ADMIN_LOOKUPFLW(user)] has called the Terran Government [called_group_pretty] for the following reason:\n[GLOB.call_911_msg]")
deadchat_broadcast(" has called the Terran Government [called_group_pretty] for the following reason:\n[GLOB.call_911_msg]", span_name("[user.real_name]"), user, message_type = DEADCHAT_ANNOUNCEMENT)
call_911(called_group)
to_chat(user, span_notice("Authorization confirmed. 911 call dispatched to the Sol Federation [called_group_pretty]."))
to_chat(user, span_notice("Authorization confirmed. 911 call dispatched to the Terran Government [called_group_pretty]."))
playsound(src, 'sound/machines/terminal/terminal_prompt_confirm.ogg', 50, FALSE)
/datum/antagonist/ert/request_911
name = "911 Responder"
antag_hud_name = "hud_spacecop"
suicide_cry = "FOR THE SOL FEDERATION!!"
suicide_cry = "FOR THE Terran Government!!"
var/department = "Some stupid shit"
/datum/antagonist/ert/request_911/apply_innate_effects(mob/living/mob_override)
@@ -272,14 +272,14 @@ GLOBAL_LIST_INIT(call911_do_and_do_not, list(
/datum/antagonist/ert/request_911/greet()
var/missiondesc = ""
missiondesc += "<B><font size=5 color=red>You are NOT a Nanotrasen Employee. You work for the Sol Federation as a [role].</font></B>"
missiondesc += "<BR>You are responding to emergency calls from the station for immediate SolFed [department] assistance!\n"
missiondesc += "<B><font size=5 color=red>You are NOT a Nanotrasen Employee. You work for the Terran Government as a [role].</font></B>"
missiondesc += "<BR>You are responding to emergency calls from the station for immediate TerraGov [department] assistance!\n"
missiondesc += "<BR>Use the Cell Phone in your backpack to confer with fellow first responders!\n"
missiondesc += "<BR><B>911 Transcript is as follows</B>:"
missiondesc += "<BR> [GLOB.call_911_msg]"
missiondesc += "<BR><B>Your Mission</B>:"
missiondesc += "<BR> <B>1.</B> Contact [GLOB.caller_of_911] and assist them in resolving the matter."
missiondesc += "<BR> <B>2.</B> Protect, ensure, and uphold the rights of Sol Federation citizens on board [station_name()]."
missiondesc += "<BR> <B>2.</B> Protect, ensure, and uphold the rights of Terran Government citizens on board [station_name()]."
missiondesc += "<BR> <B>3.</B> If you believe yourself to be in danger, unable to do the job assigned to you due to a dangerous situation, \
or that the 911 call was made in error, you can use the S.W.A.T. Backup Caller in your backpack to vote on calling a S.W.A.T. team to assist in the situation."
missiondesc += "<BR> <B>4.</B> When you have finished with your work on the station, use the Beamout Tool in your backpack to beam out yourself \
@@ -291,7 +291,7 @@ GLOBAL_LIST_INIT(call911_do_and_do_not, list(
/datum/outfit/request_911
name = "911 Response: Base"
back = /obj/item/storage/backpack/duffelbag/cops
backpack_contents = list(/obj/item/solfed_reporter/swat_caller = 1)
backpack_contents = list(/obj/item/terragov_reporter/swat_caller = 1)
id_trim = /datum/id_trim/space_police
@@ -323,7 +323,7 @@ GLOBAL_LIST_INIT(call911_do_and_do_not, list(
name = "911 Response: Marshal"
back = /obj/item/storage/backpack/satchel
uniform = /obj/item/clothing/under/sol_peacekeeper
suit = /obj/item/clothing/suit/armor/vest/det_suit/sol
suit = /obj/item/clothing/suit/armor/vest/det_suit/terra
shoes = /obj/item/clothing/shoes/jackboots
glasses = /obj/item/clothing/glasses/sunglasses
ears = /obj/item/radio/headset/headset_sec/alt
@@ -332,17 +332,17 @@ GLOBAL_LIST_INIT(call911_do_and_do_not, list(
belt = /obj/item/storage/belt/security/full
r_pocket = /obj/item/flashlight/seclite
l_pocket = /obj/item/gun/ballistic/revolver/sol
id = /obj/item/card/id/advanced/solfed
id = /obj/item/card/id/advanced/terragov
backpack_contents = list(
/obj/item/storage/box/survival = 1,
/obj/item/ammo_box/c35sol = 1,
/obj/item/solfed_reporter/swat_caller = 1,
/obj/item/terragov_reporter/swat_caller = 1,
/obj/item/beamout_tool = 1,
/obj/item/taperecorder = 1,
/obj/item/storage/box/evidence = 1,
)
id_trim = /datum/id_trim/solfed
id_trim = /datum/id_trim/terragov
/*
* ADVANCED ATMOSPHERICS
@@ -359,33 +359,33 @@ GLOBAL_LIST_INIT(call911_do_and_do_not, list(
back = /obj/item/mod/control/pre_equipped/advanced/atmos
uniform = /obj/item/clothing/under/rank/engineering/atmospheric_technician/skyrat/utility/advanced
shoes = /obj/item/clothing/shoes/jackboots/peacekeeper
ears = /obj/item/radio/headset/headset_solfed/atmos
ears = /obj/item/radio/headset/headset_terragov/atmos
mask = /obj/item/clothing/mask/gas/atmos/glass
belt = /obj/item/storage/belt/utility/full/powertools/ircd
suit_store = /obj/item/tank/internals/oxygen/yellow
id = /obj/item/card/id/advanced/solfed
id = /obj/item/card/id/advanced/terragov
backpack_contents = list(/obj/item/storage/box/rcd_ammo = 1,
/obj/item/storage/box/smart_metal_foam = 1,
/obj/item/multitool = 1,
/obj/item/extinguisher/advanced = 1,
/obj/item/rwd/loaded = 1,
/obj/item/beamout_tool = 1,
/obj/item/solfed_reporter/swat_caller = 1,
/obj/item/terragov_reporter/swat_caller = 1,
)
id_trim = /datum/id_trim/solfed/atmos
id_trim = /datum/id_trim/terragov/atmos
/obj/item/radio/headset/headset_solfed/atmos
name = "\improper SolFed adv. atmos headset"
desc = "A headset used by the Solar Federation response teams."
/obj/item/radio/headset/headset_terragov/atmos
name = "\improper TerraGov adv. atmos headset"
desc = "A headset used by the Terran Government response teams."
icon_state = "med_headset"
keyslot = /obj/item/encryptionkey/headset_solfed/atmos
keyslot = /obj/item/encryptionkey/headset_terragov/atmos
radiosound = 'modular_skyrat/modules/radiosound/sound/radio/security.ogg'
/obj/item/encryptionkey/headset_solfed/atmos
name = "\improper SolFed adv. atmos encryption key"
/obj/item/encryptionkey/headset_terragov/atmos
name = "\improper TerraGov adv. atmos encryption key"
icon_state = "cypherkey_medical"
special_channels = RADIO_SPECIAL_CENTCOM
channels = list(RADIO_CHANNEL_SOLFED = 1, RADIO_CHANNEL_ENGINEERING = 1, RADIO_CHANNEL_COMMAND = 1)
channels = list(RADIO_CHANNEL_TERRAGOV = 1, RADIO_CHANNEL_ENGINEERING = 1, RADIO_CHANNEL_COMMAND = 1)
greyscale_config = /datum/greyscale_config/encryptionkey_medical
greyscale_colors = "#ebebeb#2b2793"
@@ -407,7 +407,7 @@ GLOBAL_LIST_INIT(call911_do_and_do_not, list(
ears = /obj/item/radio/headset/headset_med
mask = /obj/item/clothing/mask/gas/alt
head = /obj/item/clothing/head/helmet/toggleable/sf_hardened/emt
id = /obj/item/card/id/advanced/solfed
id = /obj/item/card/id/advanced/terragov
suit = /obj/item/clothing/suit/armor/sf_hardened/emt
gloves = /obj/item/clothing/gloves/latex/nitrile
belt = /obj/item/storage/backpack/duffelbag/deforest_medkit/stocked
@@ -418,12 +418,12 @@ GLOBAL_LIST_INIT(call911_do_and_do_not, list(
backpack_contents = list(
/obj/item/storage/box/survival = 1,
/obj/item/emergency_bed = 1,
/obj/item/solfed_reporter/swat_caller = 1,
/obj/item/terragov_reporter/swat_caller = 1,
/obj/item/beamout_tool = 1,
/obj/item/defibrillator/compact/loaded = 1,
)
id_trim = /datum/id_trim/solfed
id_trim = /datum/id_trim/terragov
/datum/antagonist/ert/request_911/condom_destroyer
name = "Armed S.W.A.T. Officer"
@@ -433,7 +433,7 @@ GLOBAL_LIST_INIT(call911_do_and_do_not, list(
/datum/antagonist/ert/request_911/condom_destroyer/greet()
var/missiondesc = ""
missiondesc += "<B><font size=5 color=red>You are NOT a Nanotrasen Employee. You work for the Sol Federation as a [role].</font></B>"
missiondesc += "<B><font size=5 color=red>You are NOT a Nanotrasen Employee. You work for the Terran Government as a [role].</font></B>"
missiondesc += "<BR>You are here to backup the 911 first responders, as they have reported for your assistance..\n"
missiondesc += "<BR><B>Your Mission</B>:"
missiondesc += "<BR> <B>1.</B> Contact the first responders using the Cell Phone in your backpack to figure out the situation."
@@ -459,32 +459,32 @@ GLOBAL_LIST_INIT(call911_do_and_do_not, list(
suit = /obj/item/clothing/suit/armor/sf_peacekeeper
r_pocket = /obj/item/flashlight/seclite
l_pocket = /obj/item/restraints/handcuffs
id = /obj/item/card/id/advanced/solfed
id = /obj/item/card/id/advanced/terragov
l_hand = /obj/item/gun/ballistic/automatic/sol_rifle
backpack_contents = list(
/obj/item/storage/box/survival = 1,
/obj/item/melee/baton/telescopic = 1,
/obj/item/ammo_box/magazine/c40sol_rifle/standard = 3,
/obj/item/solfed_reporter/treason_reporter = 1,
/obj/item/terragov_reporter/treason_reporter = 1,
/obj/item/beamout_tool = 1,
)
id_trim = /datum/id_trim/solfed
id_trim = /datum/id_trim/terragov
/datum/antagonist/ert/request_911/treason_destroyer
name = "Sol Federation Peacekeeper"
name = "Terran Government Peacekeeper"
role = "Private"
department = "Military"
outfit = /datum/outfit/request_911/treason_destroyer
/datum/antagonist/ert/request_911/treason_destroyer/greet()
var/missiondesc = ""
missiondesc += "<B><font size=5 color=red>You are NOT a Nanotrasen Employee. You work for the Sol Federation as a [role].</font></B>"
missiondesc += "<B><font size=5 color=red>You are NOT a Nanotrasen Employee. You work for the Terran Government as a [role].</font></B>"
missiondesc += "<BR>You are here to assume control of [station_name()] due to the occupants engaging in Treason as reported by our SWAT team.\n"
missiondesc += "<BR><B>Your Mission</B>:"
missiondesc += "<BR> <B>1.</B> Contact the SWAT Team and the First Responders via your cell phone to get the situation from them."
missiondesc += "<BR> <B>2.</B> Arrest all suspects involved in the treason attempt."
missiondesc += "<BR> <B>3.</B> Assume control of the station for the Sol Federation, and initiate evacuation procedures to get non-offending citizens \
missiondesc += "<BR> <B>3.</B> Assume control of the station for the Terran Government, and initiate evacuation procedures to get non-offending citizens \
away from the scene."
missiondesc += "<BR> <B>4.</B> If you need to use lethal force, do so, but only if you must."
to_chat(owner, missiondesc)
@@ -492,7 +492,7 @@ GLOBAL_LIST_INIT(call911_do_and_do_not, list(
greeted_mob.playsound_local(greeted_mob, 'sound/effects/families_police.ogg', 100, FALSE, pressure_affected = FALSE, use_reverb = FALSE)
/datum/outfit/request_911/treason_destroyer
name = "911 Response: SolFed Military"
name = "911 Response: TerraGov Military"
uniform = /obj/item/clothing/under/sol_peacekeeper
head = /obj/item/clothing/head/helmet/sf_sacrificial
@@ -506,7 +506,7 @@ GLOBAL_LIST_INIT(call911_do_and_do_not, list(
ears = /obj/item/radio/headset/headset_sec/alt
l_pocket = /obj/item/restraints/handcuffs
r_pocket = /obj/item/flashlight/seclite
id = /obj/item/card/id/advanced/solfed
id = /obj/item/card/id/advanced/terragov
r_hand = /obj/item/gun/ballistic/automatic/sol_rifle
backpack_contents = list(
/obj/item/storage/box/handcuffs = 1,
@@ -515,11 +515,11 @@ GLOBAL_LIST_INIT(call911_do_and_do_not, list(
/obj/item/ammo_box/magazine/c40sol_rifle/standard = 4,
)
id_trim = /datum/id_trim/solfed
id_trim = /datum/id_trim/terragov
/obj/item/solfed_reporter
name = "SolFed reporter"
desc = "Use this in-hand to vote to call SolFed backup. If half your team votes for it, SWAT will be dispatched."
/obj/item/terragov_reporter
name = "TerraGov reporter"
desc = "Use this in-hand to vote to call TerraGov backup. If half your team votes for it, SWAT will be dispatched."
icon = 'modular_skyrat/modules/goofsec/icons/reporter.dmi'
icon_state = "reporter_off"
w_class = WEIGHT_CLASS_SMALL
@@ -527,10 +527,10 @@ GLOBAL_LIST_INIT(call911_do_and_do_not, list(
var/activated = FALSE
/// What antagonist should be required to use the reporter?
var/type_to_check = /datum/antagonist/ert/request_911
/// What table should we be incrementing votes in and checking against in the solfed responders global?
/// What table should we be incrementing votes in and checking against in the terragov responders global?
var/type_of_callers = "911_responders"
/// What source should be supplied for the announcement message?
var/announcement_source = "Sol Federation S.W.A.T."
var/announcement_source = "Terran Government S.W.A.T."
/// Should the station be issued a fine when the vote completes?
var/fine_station = TRUE
/// What poll message should we show to the ghosts when they are asked to join the squad?
@@ -539,7 +539,7 @@ GLOBAL_LIST_INIT(call911_do_and_do_not, list(
var/amount_to_summon = 4
/// What antagonist type should we give to the ghosts?
var/type_to_summon = /datum/antagonist/ert/request_911/condom_destroyer
/// What table should be be incrementing amount in in the solfed responders global?
/// What table should be be incrementing amount in in the terragov responders global?
var/summoned_type = "swat"
/// What name and ID should be on the cell phone given to the squad members?
var/cell_phone_number = "911"
@@ -548,8 +548,8 @@ GLOBAL_LIST_INIT(call911_do_and_do_not, list(
/// What announcement message should be displayed if the vote succeeds?
var/announcement_message = "Example announcement message"
/obj/item/solfed_reporter/proc/pre_checks(mob/user)
if(GLOB.solfed_responder_info[type_of_callers][SOLFED_AMT] == 0)
/obj/item/terragov_reporter/proc/pre_checks(mob/user)
if(GLOB.terragov_responder_info[type_of_callers][TERRAGOV_AMT] == 0)
to_chat(user, span_warning("There are no responders. You likely spawned this in as an admin. Please don't do this."))
return FALSE
if(!user.mind.has_antag_datum(type_to_check))
@@ -557,28 +557,28 @@ GLOBAL_LIST_INIT(call911_do_and_do_not, list(
return FALSE
return TRUE
/obj/item/solfed_reporter/proc/questions(mob/user)
/obj/item/terragov_reporter/proc/questions(mob/user)
return TRUE
/obj/item/solfed_reporter/attack_self(mob/user, modifiers)
/obj/item/terragov_reporter/attack_self(mob/user, modifiers)
. = ..()
if(!pre_checks(user))
return
if(!activated && !GLOB.solfed_responder_info[type_of_callers][SOLFED_DECLARED])
if(!activated && !GLOB.terragov_responder_info[type_of_callers][TERRAGOV_DECLARED])
if(!questions(user))
return
activated = TRUE
icon_state = "reporter_on"
GLOB.solfed_responder_info[type_of_callers][SOLFED_VOTES]++
var/current_votes = GLOB.solfed_responder_info[type_of_callers][SOLFED_VOTES]
var/amount_of_responders = GLOB.solfed_responder_info[type_of_callers][SOLFED_AMT]
GLOB.terragov_responder_info[type_of_callers][TERRAGOV_VOTES]++
var/current_votes = GLOB.terragov_responder_info[type_of_callers][TERRAGOV_VOTES]
var/amount_of_responders = GLOB.terragov_responder_info[type_of_callers][TERRAGOV_AMT]
to_chat(user, span_warning("You have activated the device. \
Current Votes: [current_votes]/[amount_of_responders] votes."))
if(current_votes >= amount_of_responders * 0.5)
GLOB.solfed_responder_info[type_of_callers][SOLFED_DECLARED] = TRUE
GLOB.terragov_responder_info[type_of_callers][TERRAGOV_DECLARED] = TRUE
if(fine_station)
var/datum/bank_account/station_balance = SSeconomy.get_dep_account(ACCOUNT_CAR)
station_balance?.adjust_money(SOLFED_FINE_AMOUNT) // paying for the gas to drive all the fuckin' way out to the frontier
station_balance?.adjust_money(TERRAGOV_FINE_AMOUNT) // paying for the gas to drive all the fuckin' way out to the frontier
priority_announce(announcement_message, announcement_source, 'sound/effects/families_police.ogg', has_important_message = TRUE, color_override = "yellow")
var/list/candidates = SSpolling.poll_ghost_candidates(ghost_poll_msg, jobban_to_check)
@@ -586,7 +586,7 @@ GLOBAL_LIST_INIT(call911_do_and_do_not, list(
if(candidates.len)
//Pick the (un)lucky players
var/agents_number = min(amount_to_summon, candidates.len)
GLOB.solfed_responder_info[summoned_type][SOLFED_AMT] = agents_number
GLOB.terragov_responder_info[summoned_type][TERRAGOV_AMT] = agents_number
var/list/spawnpoints = GLOB.emergencyresponseteamspawn
var/index = 0
@@ -624,12 +624,12 @@ GLOBAL_LIST_INIT(call911_do_and_do_not, list(
log_game("[key_name(cop)] has been selected as an [ert_antag.name]")
agents_number--
/obj/item/solfed_reporter/swat_caller
/obj/item/terragov_reporter/swat_caller
name = "S.W.A.T. backup caller"
desc = "Use this in-hand to vote to call SolFed S.W.A.T. backup. If half your team votes for it, SWAT will be dispatched."
desc = "Use this in-hand to vote to call TerraGov S.W.A.T. backup. If half your team votes for it, SWAT will be dispatched."
type_to_check = /datum/antagonist/ert/request_911
type_of_callers = "911_responders"
announcement_source = "Sol Federation S.W.A.T."
announcement_source = "Terran Government S.W.A.T."
fine_station = TRUE
ghost_poll_msg = "The Sol-Fed 911 services have requested a S.W.A.T. backup. Do you wish to become a S.W.A.T. member?"
amount_to_summon = 6
@@ -639,7 +639,7 @@ GLOBAL_LIST_INIT(call911_do_and_do_not, list(
impediment, or due to a fraudulent 911 call. We have billed the station $20,000 for this, to cover the expenses of flying a second emergency response to \
your station. Please comply with all requests by said S.W.A.T. members."
/obj/item/solfed_reporter/swat_caller/questions(mob/user)
/obj/item/terragov_reporter/swat_caller/questions(mob/user)
var/question = "Does the situation require additional S.W.A.T. backup, involve the station impeding you from doing your job, \
or involve the station making a fraudulent 911 call and needing an arrest made on the caller?"
if(tgui_alert(user, question, "S.W.A.T. Backup Caller", list("No", "Yes")) != "Yes")
@@ -648,29 +648,29 @@ GLOBAL_LIST_INIT(call911_do_and_do_not, list(
message_admins("[ADMIN_LOOKUPFLW(user)] has voted to summon S.W.A.T backup.")
return TRUE
/obj/item/solfed_reporter/treason_reporter
/obj/item/terragov_reporter/treason_reporter
name = "treason reporter"
desc = "Use this in-hand to vote that the station is engaging in Treason. If half your team votes for it, the Military will handle the situation."
type_to_check = /datum/antagonist/ert/request_911/condom_destroyer
type_of_callers = "swat"
announcement_source = "Sol Federation National Guard"
announcement_source = "Terran Government National Guard"
fine_station = FALSE
ghost_poll_msg = "The station has decided to engage in treason. Do you wish to join the Sol Federation Military?"
ghost_poll_msg = "The station has decided to engage in treason. Do you wish to join the Terran Government Military?"
amount_to_summon = 12
type_to_summon = /datum/antagonist/ert/request_911/treason_destroyer
summoned_type = "national_guard"
announcement_message = "Crewmembers of the station. You have refused to comply with first responders and SWAT officers, and have assaulted them, \
and they are unable to carry out the wills of the Sol Federation, despite residing within Sol Federation borders.\n\
and they are unable to carry out the wills of the Terran Government, despite residing within Terran Government borders.\n\
As such, we are charging those responsible with Treason. The penalty of which is death, or no less than twenty-five years in Superjail.\n\
Treason is a serious crime. Our military forces are en route to your station. They will be assuming direct control of the station, and \
will be evacuating civilians from the scene.\n\
Non-offending citizens, prepare for evacuation. Comply with all orders given to you by Sol Federation military personnel.\n\
Non-offending citizens, prepare for evacuation. Comply with all orders given to you by Terran Government military personnel.\n\
To all those who are engaging in treason, lay down your weapons and surrender. Refusal to comply may be met with lethal force."
/obj/item/solfed_reporter/treason_reporter/questions(mob/user)
/obj/item/terragov_reporter/treason_reporter/questions(mob/user)
var/list/list_of_questions = list(
"Treason is the crime of attacking a state authority to which one owes allegiance. The station is located within Sol Federation space, \
and owes allegiance to the Sol Federation despite being owned by Nanotrasen. Did the station engage in this today?",
"Treason is the crime of attacking a state authority to which one owes allegiance. The station is located within Terran Government space, \
and owes allegiance to the Terran Government despite being owned by Nanotrasen. Did the station engage in this today?",
"Did station crewmembers assault you or the SWAT team at the direction of Security and/or Command?",
"Did station crewmembers actively prevent you and the SWAT team from accomplishing your objectives at the direction of Security and/or Command?",
"Were you and your fellow SWAT members unable to handle the issue on your own?",
@@ -685,7 +685,7 @@ GLOBAL_LIST_INIT(call911_do_and_do_not, list(
and has voted that the station is engaging in Treason.")
return TRUE
/obj/item/solfed_reporter/pizza_managers
/obj/item/terragov_reporter/pizza_managers
name = "Dogginos uncompliant customer reporter"
desc = "Use this in-hand to vote to call for Dogginos Regional Managers if the station refuses to pay for their pizza. \
If half your delivery squad votes for it, Dogginos Regional Managers will be dispatched."
@@ -704,7 +704,7 @@ GLOBAL_LIST_INIT(call911_do_and_do_not, list(
summoned_type = "dogginos_manager"
cell_phone_number = "Dogginos"
/obj/item/solfed_reporter/pizza_managers/questions(mob/user)
/obj/item/terragov_reporter/pizza_managers/questions(mob/user)
if(tgui_alert(user, "Is the station refusing to pay their bill of $35,000, including a fifteen percent tip for delivery drivers?", "Dogginos Uncompliant Customer Reporter", list("No", "Yes")) != "Yes")
to_chat(user, "You decide not to request management assist you with the delivery.")
return FALSE
@@ -719,7 +719,7 @@ GLOBAL_LIST_INIT(call911_do_and_do_not, list(
/obj/item/storage/box/survival,
/obj/item/knife,
/obj/item/storage/box/ingredients/italian,
/obj/item/solfed_reporter/pizza_managers,
/obj/item/terragov_reporter/pizza_managers,
)
r_hand = /obj/item/pizzabox/meat
l_hand = /obj/item/pizzabox/vegetable
@@ -747,7 +747,7 @@ GLOBAL_LIST_INIT(call911_do_and_do_not, list(
/obj/item/beamout_tool
name = "beam-out tool" // TODO, find a way to make this into drop pods cuz that's cooler visually
desc = "Use this to begin the lengthy beam-out process to return to Sol Federation space. It will bring anyone you are pulling with you."
desc = "Use this to begin the lengthy beam-out process to return to Terran Government space. It will bring anyone you are pulling with you."
icon = 'modular_skyrat/modules/goofsec/icons/reporter.dmi'
icon_state = "beam_me_up_scotty"
w_class = WEIGHT_CLASS_SMALL
@@ -761,7 +761,7 @@ GLOBAL_LIST_INIT(call911_do_and_do_not, list(
to_chat(user, "You have begun the beam-out process. Please wait for the beam to reach the station.")
user.balloon_alert(user, "begun beam-out")
if(do_after(user, 30 SECONDS))
to_chat(user, "You have completed the beam-out process and are returning to the Sol Federation.")
to_chat(user, "You have completed the beam-out process and are returning to the Terran Government.")
message_admins("[ADMIN_LOOKUPFLW(user)] has beamed themselves out.")
if(isliving(user))
var/mob/living/living_user = user
@@ -1,9 +1,9 @@
// Peacekeeper jumpsuit
/obj/item/clothing/under/sol_peacekeeper
name = "sol peacekeeper uniform"
name = "terran peacekeeper uniform"
desc = "A military-grade uniform with military grade comfort (none at all), often seen on \
SolFed's various peacekeeping forces, and usually alongside a blue helmet."
TerraGov's various peacekeeping forces, and usually alongside a blue helmet."
icon = 'modular_skyrat/modules/goofsec/icons/uniforms.dmi'
icon_state = "peacekeeper"
worn_icon = 'modular_skyrat/modules/goofsec/icons/uniforms_worn.dmi'
@@ -17,8 +17,8 @@
// EMT jumpsuit
/obj/item/clothing/under/sol_emt
name = "sol emergency medical uniform"
desc = "A copy of SolFed's peacekeeping uniform, recolored and re-built paramedics in mind."
name = "terran emergency medical uniform"
desc = "A copy of TerraGov's peacekeeping uniform, recolored and re-built paramedics in mind."
icon = 'modular_skyrat/modules/goofsec/icons/uniforms.dmi'
icon_state = "emt"
worn_icon = 'modular_skyrat/modules/goofsec/icons/uniforms_worn.dmi'
@@ -29,11 +29,11 @@
has_sensor = SENSOR_COORDS
random_sensor = FALSE
// Solfed flak jacket, for marshals
// Terragov flak jacket, for marshals
/obj/item/clothing/suit/armor/vest/det_suit/sol
/obj/item/clothing/suit/armor/vest/det_suit/terra
name = "'Gordyn' flak vest"
desc = "A light armored jacket common on SolFed personnel who need armor, but find a full vest \
desc = "A light armored jacket common on TerraGov personnel who need armor, but find a full vest \
too impractical or uneeded."
icon = 'modular_skyrat/modules/goofsec/icons/uniforms.dmi'
icon_state = "flak"
@@ -92,7 +92,7 @@
name = "Privateer Slaver"
prompt_name = "a privateer slaver"
you_are_text = "You're here to capture valuable hostages to sell into slavery."
flavour_text = "You're part of a privateer crew that sometimes takes contracts from the illusive Guild, which offers bounties and contracts to independent crews. Raiding colonies of the many less technologically advanced species in the area is much easier than this. You've been told that your mission is to capture as many valuable hostages from the station as possible. Your anonymous employer insists on the importance of humiliating SolFed by snatching those under their protection from right under their noses."
flavour_text = "You're part of a privateer crew that sometimes takes contracts from the illusive Guild, which offers bounties and contracts to independent crews. Raiding colonies of the many less technologically advanced species in the area is much easier than this. You've been told that your mission is to capture as many valuable hostages from the station as possible. Your anonymous employer insists on the importance of humiliating TerraGov by snatching those under their protection from right under their noses."
important_text = ""
/obj/effect/mob_spawn/ghost_role/human/guild/slaver
@@ -92,7 +92,7 @@
/datum/techweb_node/illegal_microfusion
id = TECHWEB_NODE_ILLEGAL_MICROFUSION
display_name = "Illegal Microfusion Technology"
description = "Microfusion tech that has previously been banned by SolFed. I love the smell of plasma in the mornings."
description = "Microfusion tech that has previously been banned by TerraGov. I love the smell of plasma in the mornings."
prereq_ids = list(
TECHWEB_NODE_ADVANCED_MICROFUSION,
TECHWEB_NODE_SYNDICATE_BASIC,
@@ -67,7 +67,7 @@
desc = "A repair kit that allows for NIFs to be repaired without the use of surgery"
special_desc = "The effects of capitalism and industry run deep, and they run within the Nanite Implant Framework industry as well. \
Frameworks, complicated devices as they are, are normally locked at the firmware level to requiring specific 'approved' brands of repair paste or repair-docks. \
This hacked-kit has been developed by the Altspace Coven as a freeware alternative, spread far and wide throughout extra-Solarian space for quality of life \
This hacked-kit has been developed by the Altspace Coven as a freeware alternative, spread far and wide throughout extra-Terran space for quality of life \
for users located on the peripheries of society."
icon = 'modular_skyrat/modules/modular_implants/icons/obj/devices.dmi'
icon_state = "repair_paste"
@@ -1,9 +1,9 @@
// .35 Sol Short
// Pistol caliber caseless round used almost exclusively by SolFed weapons
// Pistol caliber caseless round used almost exclusively by TerraGov weapons
/obj/item/ammo_casing/c35sol
name = ".35 Sol Short lethal bullet casing"
desc = "A SolFed standard caseless lethal pistol round."
desc = "A TerraGov standard caseless lethal pistol round."
icon = 'modular_skyrat/modules/modular_weapons/icons/obj/company_and_or_faction_based/carwo_defense_systems/ammo.dmi'
icon_state = "35sol"
@@ -46,7 +46,7 @@
/obj/item/ammo_casing/c35sol/incapacitator
name = ".35 Sol Short incapacitator bullet casing"
desc = "A SolFed standard caseless less-lethal pistol round. Exhausts targets on hit, has a tendency to bounce off walls at shallow angles."
desc = "A TerraGov standard caseless less-lethal pistol round. Exhausts targets on hit, has a tendency to bounce off walls at shallow angles."
icon_state = "35sol_disabler"
@@ -91,7 +91,7 @@
/obj/item/ammo_casing/c35sol/ripper
name = ".35 Sol Short ripper bullet casing"
desc = "A SolFed standard caseless ripper pistol round. Causes slashing wounds on targets, but is weak to armor."
desc = "A TerraGov standard caseless ripper pistol round. Causes slashing wounds on targets, but is weak to armor."
icon_state = "35sol_shrapnel"
projectile_type = /obj/projectile/bullet/c35sol/ripper
@@ -3,7 +3,7 @@
/obj/item/ammo_casing/c40sol
name = ".40 Sol Long lethal bullet casing"
desc = "A SolFed standard caseless lethal rifle round."
desc = "A TerraGov standard caseless lethal rifle round."
icon = 'modular_skyrat/modules/modular_weapons/icons/obj/company_and_or_faction_based/carwo_defense_systems/ammo.dmi'
icon_state = "40sol"
@@ -46,7 +46,7 @@
/obj/item/ammo_casing/c40sol/fragmentation
name = ".40 Sol Long fragmentation bullet casing"
desc = "A SolFed standard caseless fragmentation rifle round. Shatters upon impact, ejecting sharp shrapnel that can potentially incapacitate targets."
desc = "A TerraGov standard caseless fragmentation rifle round. Shatters upon impact, ejecting sharp shrapnel that can potentially incapacitate targets."
icon_state = "40sol_disabler"
@@ -96,7 +96,7 @@
/obj/item/ammo_casing/c40sol/pierce
name = ".40 Sol Long match bullet casing"
desc = "A SolFed standard caseless match grade rifle round. Fires at a higher pressure and thus fires slightly faster projectiles. \
desc = "A TerraGov standard caseless match grade rifle round. Fires at a higher pressure and thus fires slightly faster projectiles. \
Rumors say you can do sick ass wall bounce trick shots with these, though the official suggestion is to just shoot your target and \
not the wall next to them."
@@ -157,7 +157,7 @@
/obj/item/ammo_casing/c40sol/incendiary
name = ".40 Sol Long incendiary bullet casing"
desc = "A SolFed standard caseless incendiary rifle round. Leaves no flaming trail, only igniting targets on impact."
desc = "A TerraGov standard caseless incendiary rifle round. Leaves no flaming trail, only igniting targets on impact."
icon_state = "40sol_flame"
@@ -53,7 +53,7 @@
though not in the standard grenade size. The much lighter .980 Tydhouer grenades \
developed for the weapon offered many advantages over standard grenade launching \
ammunition. For a start, it was significantly lighter, and easier to carry large \
amounts of. What it also offered, however, and the reason SolFed funded the \
amounts of. What it also offered, however, and the reason TerraGov funded the \
project: Variable time fuze. Using the large and expensive ranging sight on the \
launcher, its user can set an exact distance for the grenade to self detonate at. \
The dream of militaries for decades, finally realized. The smaller shells do not, \
@@ -2,7 +2,7 @@
/obj/item/ammo_box/magazine/c35sol_pistol
name = "\improper Sol pistol magazine"
desc = "A standard size magazine for SolFed pistols, holds twelve rounds."
desc = "A standard size magazine for TerraGov pistols, holds twelve rounds."
icon = 'modular_skyrat/modules/modular_weapons/icons/obj/company_and_or_faction_based/carwo_defense_systems/ammo.dmi'
icon_state = "pistol_35_standard"
@@ -20,7 +20,7 @@
/obj/item/ammo_box/magazine/c35sol_pistol/stendo
name = "\improper Sol extended pistol magazine"
desc = "An extended magazine for SolFed pistols, holds twenty-four rounds."
desc = "An extended magazine for TerraGov pistols, holds twenty-four rounds."
icon_state = "pistol_35_stended"
@@ -35,7 +35,7 @@
/obj/item/ammo_box/magazine/c40sol_rifle
name = "\improper Sol rifle short magazine"
desc = "A shortened magazine for SolFed rifles, holds fifteen rounds."
desc = "A shortened magazine for TerraGov rifles, holds fifteen rounds."
icon = 'modular_skyrat/modules/modular_weapons/icons/obj/company_and_or_faction_based/carwo_defense_systems/ammo.dmi'
icon_state = "rifle_short"
@@ -54,7 +54,7 @@
/obj/item/ammo_box/magazine/c40sol_rifle/standard
name = "\improper Sol rifle magazine"
desc = "A standard size magazine for SolFed rifles, holds thirty rounds."
desc = "A standard size magazine for TerraGov rifles, holds thirty rounds."
icon_state = "rifle_standard"
@@ -68,7 +68,7 @@
/obj/item/ammo_box/magazine/c40sol_rifle/drum
name = "\improper Sol rifle drum magazine"
desc = "A massive drum magazine for SolFed rifles, holds sixty rounds."
desc = "A massive drum magazine for TerraGov rifles, holds sixty rounds."
icon_state = "rifle_drum"
@@ -2,7 +2,7 @@
/obj/item/gun/ballistic/automatic/sol_rifle
name = "\improper Carwo-Cawil Battle Rifle"
desc = "A heavy battle rifle firing .40 Sol. Commonly seen in the hands of SolFed military types. Accepts any standard SolFed rifle magazine."
desc = "A heavy battle rifle firing .40 Sol. Commonly seen in the hands of TerraGov military types. Accepts any standard TerraGov rifle magazine."
icon = 'modular_skyrat/modules/modular_weapons/icons/obj/company_and_or_faction_based/carwo_defense_systems/guns48x.dmi'
icon_state = "infanterie"
@@ -60,7 +60,7 @@
. = ..()
. += "The Carwo-Cawil rifles are built by Carwo for \
use by SolFed's various infantry branches. Following the rather reasonable \
use by TerraGov's various infantry branches. Following the rather reasonable \
military requirements of using the same few cartridges and magazines, \
the lifespans of logistics coordinators and quartermasters everywhere \
were lengthened by several years. While typically only for military sale \
@@ -77,7 +77,7 @@
/obj/item/gun/ballistic/automatic/sol_rifle/marksman
name = "\improper Cawil Marksman Rifle"
desc = "A heavy marksman rifle commonly seen in the hands of SolFed military types. Accepts any standard SolFed rifle magazine."
desc = "A heavy marksman rifle commonly seen in the hands of TerraGov military types. Accepts any standard TerraGov rifle magazine."
icon_state = "elite"
worn_icon_state = "elite"
@@ -117,7 +117,7 @@
/obj/item/gun/ballistic/automatic/sol_rifle/machinegun
name = "\improper Qarad Light Machinegun"
desc = "A hefty machinegun commonly seen in the hands of SolFed military types. Accepts any standard SolFed rifle magazine."
desc = "A hefty machinegun commonly seen in the hands of TerraGov military types. Accepts any standard TerraGov rifle magazine."
icon_state = "outomaties"
worn_icon_state = "outomaties"
@@ -152,7 +152,7 @@
// Evil version of the rifle (nothing different its just black)
/obj/item/gun/ballistic/automatic/sol_rifle/evil
desc = "A heavy battle rifle, this one seems to be painted tacticool black. Accepts any standard SolFed rifle magazine."
desc = "A heavy battle rifle, this one seems to be painted tacticool black. Accepts any standard TerraGov rifle magazine."
icon_state = "infanterie_evil"
worn_icon_state = "infanterie_evil"
@@ -1,8 +1,8 @@
// SolFed shotgun (this was gonna be in a proprietary shotgun shell type outside of 12ga at some point, wild right?)
// TerraGov shotgun (this was gonna be in a proprietary shotgun shell type outside of 12ga at some point, wild right?)
/obj/item/gun/ballistic/shotgun/riot/sol
name = "\improper Renoster Shotgun"
desc = "A twelve gauge shotgun with a six shell capacity underneath. Made for and used by SolFed's various military branches."
desc = "A twelve gauge shotgun with a six shell capacity underneath. Made for and used by TerraGov's various military branches."
icon = 'modular_skyrat/modules/modular_weapons/icons/obj/company_and_or_faction_based/carwo_defense_systems/guns48x.dmi'
icon_state = "renoster"
@@ -44,7 +44,7 @@
. += "The Sindano submachinegun was originally produced for military contract. \
These guns were seen in the hands of anyone from medics, ship techs, logistics officers, \
and shuttle pilots often had several just to show off. Due to SolFed's quest to \
and shuttle pilots often had several just to show off. Due to TerraGov's quest to \
extend the lifespans of their logistics officers and quartermasters, the weapon \
uses the same standard pistol cartridge that most other miltiary weapons of \
small caliber use. This results in interchangeable magazines between pistols \
@@ -2,7 +2,7 @@
//Main Rifle
/obj/item/gun/ballistic/automatic/rom_carbine
name = "\improper RomTech Carbine"
desc = "An unusual variation of the Carwo-Carwil Battle rifle fielded as service rifle in Romulus Federation, preferred by some law enforcement agency for the compact nature. Accepts any standard .40 SolFed rifle magazine."
desc = "An unusual variation of the Carwo-Carwil Battle rifle fielded as service rifle in Romulus Federation, preferred by some law enforcement agency for the compact nature. Accepts any standard .40 TerraGov rifle magazine."
icon = 'modular_skyrat/modules/modular_weapons/icons/obj/company_and_or_faction_based/romulus_technology/gun48x32.dmi'
icon_state = "carbine"
@@ -71,7 +71,7 @@
/// What is this gun's extended examine, we only have to do this because the carbine is a subtype
var/expanded_examine_text = "The Hyeseong rifle is the first line of man-portable Marsian weapons platforms \
from Cybersun Industries. Like her younger sister weapon, the Hoshi carbine, CI used funding aid provided \
by SolFed to develop a portable weapon fueled by a proprietary generator rumored to be fueled by superstable plasma. \
by TerraGov to develop a portable weapon fueled by a proprietary generator rumored to be fueled by superstable plasma. \
A rugged and hefty weapon, the Hyeseong stars in applications anywhere from medium to long ranges, though struggling \
in CQB. Her onboard machine intelligence, at first devised to support the operator and manage the internal reactor, \
is shipped with a more professional and understated personality-- since influenced by 'negligence' from users in \
@@ -278,7 +278,7 @@
default_selected_mode = "Incinerate"
speech_json_file = SHORT_MOD_LASER_SPEECH
expanded_examine_text = "The Hoshi carbine is the latest line of man-portable Marsian weapons platforms from \
Cybersun Industries. Like her older sister weapon, the Hyeseong rifle, CI used funding aid provided by SolFed \
Cybersun Industries. Like her older sister weapon, the Hyeseong rifle, CI used funding aid provided by TerraGov \
to develop a portable weapon fueled by a proprietary generator rumored to be fueled by superstable plasma. A \
lithe and mobile weapon, the Hoshi stars in close-quarters battle, trickshots, and area-of-effect blasts; though \
ineffective at ranged combat. Her onboard machine intelligence, at first devised to support the operator and \
@@ -119,7 +119,7 @@
. += "The 'Bóbr' started development as a limited run sporting weapon before \
the military took interest. The market quickly changed from sport shooting \
targets, to sport shooting SolFed strike teams once the conflict broke out. \
targets, to sport shooting TerraGov strike teams once the conflict broke out. \
This pattern is different from the original civilian version, with a military \
standard pistol grip and weather resistant finish. While the 'Bóbr' was not \
a weapon standard issued to every CIN soldier, it was available for relatively \
@@ -53,7 +53,7 @@
into the wild, typically the frontier. It was built alongside the round it fires, the \
.27-54 Cesarzawa pistol round. Based on the proven Lanca design, it seeks to bring that \
same reliable weapon design into the factor of a submachinegun. While it is significantly \
larger than many comparable weapons in SolFed use, it more than makes up for it with ease \
larger than many comparable weapons in TerraGov use, it more than makes up for it with ease \
of control and significant firerate."
return .
@@ -32,7 +32,7 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/structure/sign/poster/official/trappiste_suppre
. = ..()
. += "Small text details that this information may also be transferrable \
to other types of SolFed ammunition, but that you should check the box \
to other types of TerraGov ammunition, but that you should check the box \
the bullets come in just to be sure. Trappiste is, of course,\
not liable for excess harm caused by misreading color identification systems."
@@ -2,7 +2,7 @@
/obj/item/gun/ballistic/automatic/pistol/sol
name = "\improper Wespe Pistol"
desc = "The standard issue service pistol of SolFed's various military branches. Uses .35 Sol and comes with an attached light."
desc = "The standard issue service pistol of TerraGov's various military branches. Uses .35 Sol and comes with an attached light."
icon = 'modular_skyrat/modules/modular_weapons/icons/obj/company_and_or_faction_based/trappiste_fabriek/guns32x.dmi'
icon_state = "wespe"
@@ -37,7 +37,7 @@
. += "The Wespe is a pistol that was made entirely for military use. \
Required to use a standard round, standard magazines, and be able \
to function in all of the environments that SolFed operated in \
to function in all of the environments that TerraGov operated in \
commonly. These qualities just so happened to make the weapon \
popular in frontier space and is likely why you are looking at \
one now."
@@ -50,7 +50,7 @@
// Sol pistol evil gun
/obj/item/gun/ballistic/automatic/pistol/sol/evil
desc = "The standard issue service pistol of SolFed's various military branches. Comes with attached light. This one is painted tacticool black."
desc = "The standard issue service pistol of TerraGov's various military branches. Comes with attached light. This one is painted tacticool black."
icon_state = "wespe_evil"
@@ -91,16 +91,16 @@
/obj/item/gun/ballistic/automatic/pistol/trappiste/examine_more(mob/user)
. = ..()
. += "The Skild only exists due to a widely known event that SolFed's military \
. += "The Skild only exists due to a widely known event that TerraGov's military \
would prefer wasn't anywhere near as popular. A general, name unknown as of now, \
was recorded complaining about the lack of capability the Wespe provided to the \
military, alongside several statements comparing the Wespe's lack of masculinity \
to the, quote, 'unique lack of testosterone those NRI mongrels field'. While the \
identities of both the general and people responsible for the leaking of the recording \
are still classified, many high ranking SolFed military staff suspiciously have stopped \
are still classified, many high ranking TerraGov military staff suspiciously have stopped \
appearing in public, unlike the Skild. A lot of several thousand pistols, the first \
of the weapons to ever exist, were not so silently shipped to SolFed's Plutonian \
shipping hub from TRAPPIST. SolFed military command refuses to answer any \
of the weapons to ever exist, were not so silently shipped to TerraGov's Plutonian \
shipping hub from TRAPPIST. TerraGov military command refuses to answer any \
further questions about the incident to this day."
return .
@@ -28,7 +28,7 @@
. += "The Eland is one of the few Trappiste weapons not made for military contract. \
Instead, the Eland started life as a police weapon, offered as a gun to finally \
outmatch all others in the cheap police weapons market. Unfortunately, this \
coincided with nearly every SolFed police force realising they are actually \
coincided with nearly every TerraGov police force realising they are actually \
comically overfunded. With military weapons bought for police forces taking \
over the market, the Eland instead found home in the civilian personal defense \
market. That is likely the reason you are looking at this one now."
@@ -52,7 +52,7 @@
who you ask. Ask a Jovian, and they'll go off all day about how they \
love the thing so. A big weapon for shooting big targets, like the \
fuel-stat raiders in their large suits of armor. Ask a space pirate, however \
and you'll get a different story. That is thanks to many SolFed anti-piracy \
and you'll get a different story. That is thanks to many TerraGov anti-piracy \
units picking the Bogseo as their standard boarding weapon. What better \
to ruin a brigand's day than a bullet large enough to turn them into \
mist at full auto, after all?"
@@ -45,7 +45,7 @@
missiondesc += "<BR> <B>2.</B> Neutralise the threat."
missiondesc += "<BR> <B>3.</B> Stabilise the situation."
missiondesc += "<BR> <B>4.</B> Contact whoever called you and assist in resolving the matter."
missiondesc += "<BR> <B>5.</B> Protect, ensure, and uphold the rights of Novaya Rossiyskaya Imperiya, Kingdom of Agurkrral and Free Teshari League citizens on board [station_name()]. SolFed citizens' wellbeing is up to your discretion."
missiondesc += "<BR> <B>5.</B> Protect, ensure, and uphold the rights of Novaya Rossiyskaya Imperiya, Kingdom of Agurkrral and Free Teshari League citizens on board [station_name()]. TerraGov citizens' wellbeing is up to your discretion."
missiondesc += "<BR> <B>6.</B> Attempt to subvert the station's crew in order to shift the station's territory under control of Novaya Rossiyskaya Imperiya."
missiondesc += span_warning("<BR><B>Your Mission</B>: [ert_team.mission.explanation_text]")
@@ -35,7 +35,7 @@
/obj/item/clothing/head/helmet/cin_surplus_helmet
name = "\improper GZ-03 combat helmet"
desc = "An outdated service helmet previously used by CIN military forces. The design dates back to the years leading up to CIN - SolFed border war, and was in service until the advent of VOSKHOD powered armor becoming standard issue."
desc = "An outdated service helmet previously used by CIN military forces. The design dates back to the years leading up to CIN - TerraGov border war, and was in service until the advent of VOSKHOD powered armor becoming standard issue."
icon = 'modular_skyrat/modules/novaya_ert/icons/surplus_armor/surplus_armor.dmi'
worn_icon = 'modular_skyrat/modules/novaya_ert/icons/surplus_armor/surplus_armor_object.dmi'
icon_state = "helmet_plain"
@@ -75,9 +75,9 @@
. = ..()
. += "The GZ-03 series of coalition armor was a collaborative project between the NRI and TransOrbital \
to develop a frontline soldier's armor set that could withstand attacks from the Solar Federation's \
to develop a frontline soldier's armor set that could withstand attacks from the Terran Government's \
then relatively new pulse ballistics. The design itself is based upon a far older pattern \
of armor originally developed by SolFed themselves, which was the standard pattern of armor design \
of armor originally developed by TerraGov themselves, which was the standard pattern of armor design \
granted to the first colony ships leaving Sol. Armor older than any of the CIN member states, \
upgraded with modern technology. This helmet in particular encloses the entire head save for \
the face, and should come with a glass visor and relatively comfortable internal padding. Should, \
@@ -113,7 +113,7 @@
/obj/item/clothing/under/syndicate/rus_army/cin_surplus
name = "\improper CIN combat uniform"
desc = "A CIN designed combat uniform that can come in any number of camouflauge variations. Despite this particular design being developed in the years leading up to the CIN-SolFed border war, the uniform is still in use by many member states to this day."
desc = "A CIN designed combat uniform that can come in any number of camouflauge variations. Despite this particular design being developed in the years leading up to the CIN-TerraGov border war, the uniform is still in use by many member states to this day."
icon = 'modular_skyrat/modules/novaya_ert/icons/surplus_armor/surplus_armor.dmi'
worn_icon = 'modular_skyrat/modules/novaya_ert/icons/surplus_armor/surplus_armor_object.dmi'
icon_state = "undersuit_greyscale"
@@ -149,7 +149,7 @@
/obj/item/clothing/suit/armor/vest/cin_surplus_vest
name = "\improper GZ-03 armor vest"
desc = "An outdated armor vest previously used by CIN military forces. The design dates back to the years leading up to CIN - SolFed border war, and was in service until the advent of VOSKHOD powered armor becoming standard issue."
desc = "An outdated armor vest previously used by CIN military forces. The design dates back to the years leading up to CIN - TerraGov border war, and was in service until the advent of VOSKHOD powered armor becoming standard issue."
worn_icon = 'modular_skyrat/modules/novaya_ert/icons/surplus_armor/surplus_armor.dmi'
icon = 'modular_skyrat/modules/novaya_ert/icons/surplus_armor/surplus_armor_object.dmi'
icon_state = "vest_basic"
@@ -176,9 +176,9 @@
. = ..()
. += "The GZ-03 series of coalition armor was a collaborative project between the NRI and TransOrbital \
to develop a frontline soldier's armor set that could withstand attacks from the Solar Federation's \
to develop a frontline soldier's armor set that could withstand attacks from the Terran Government's \
then relatively new pulse ballistics. The design itself is based upon a far older pattern \
of armor originally developed by SolFed themselves, which was the standard pattern of armor design \
of armor originally developed by TerraGov themselves, which was the standard pattern of armor design \
granted to the first colony ships leaving Sol. Armor older than any of the CIN member states, \
upgraded with modern technology. This vest in particular is made up of several large, dense plates \
front and back. While vests like this were also produced with extra plating to protect the groin, many \
@@ -13,7 +13,7 @@
/datum/opposing_force_equipment/ranged/infanteria
name = "Carwo-Cawil Battle Rifle"
description = "A heavy battle rifle, this one seems to be painted tacticool black. Accepts any standard SolFed rifle magazine."
description = "A heavy battle rifle, this one seems to be painted tacticool black. Accepts any standard TerraGov rifle magazine."
item_type = /obj/item/storage/toolbox/guncase/skyrat/opfor/infanteria
/obj/item/storage/toolbox/guncase/skyrat/opfor/infanteria/PopulateContents()
@@ -159,7 +159,7 @@
/datum/opposing_force_equipment/ranged_stealth/wespe
name = "Wespe Pistol"
description = "The standard issue service pistol of SolFed's various military branches. Comes with attached light."
description = "The standard issue service pistol of TerraGov's various military branches. Comes with attached light."
item_type = /obj/item/storage/toolbox/guncase/skyrat/pistol/opfor/wespe
/obj/item/storage/toolbox/guncase/skyrat/pistol/opfor/wespe/PopulateContents()
@@ -1,4 +1,4 @@
//SKYRAT AND SOL AMMO
//TERRAGOV AMMO
/datum/supply_pack/security/lethalsolpistols
name = ".35 Ammunition Crates"
@@ -53,7 +53,7 @@
crate_name = "anti riot shotgun ammo crate"
//SOL GUNS
//TERRAGOV GUNS
/datum/supply_pack/security/wespe
name = "Wespe Three-Pack Crates"
@@ -41,7 +41,7 @@
/datum/supply_pack/goody/rensoter_shotgun
name = "Renoster Shotgun Single-Pack"
desc = "A common modern shotgun used by Solarian State Police."
desc = "A common modern shotgun used by Terran Government Police."
contains = list(/obj/item/gun/ballistic/shotgun/riot/sol, /obj/item/storage/pouch/ammo, /obj/item/storage/belt/bandolier, /obj/item/ammo_box/advanced/s12gauge/rubber)
cost = PAYCHECK_COMMAND * 22
@@ -69,7 +69,7 @@
/obj/item/clothing/head/security_garrison = 10,
/obj/item/clothing/head/security_cap = 10,
/obj/item/clothing/head/beret/sec/peacekeeper = 5,
/obj/item/clothing/head/helmet/sec/sol = 5,
/obj/item/clothing/head/helmet/sec/terra = 5,
/obj/item/clothing/head/hats/warden/police/patrol = 5,
/obj/item/clothing/head/costume/ushanka/sec = 10,
/obj/item/clothing/gloves/color/black/security = 10,
@@ -31,7 +31,7 @@
supports_variations_flags = CLOTHING_SNOUTED_VARIATION_NO_NEW_ICON
armor_type = /datum/armor/hats_warden
/obj/item/clothing/head/helmet/sec/sol
/obj/item/clothing/head/helmet/sec/terra
name = "sol police helmet"
desc = "A helmet to protect any officer from bludgeoning attacks, or the occasional bullet."
icon = 'modular_skyrat/master_files/icons/obj/clothing/head/helmet.dmi'
@@ -114,7 +114,7 @@
/obj/item/ammo_casing/shotgun/magnum
name = "magnum blockshot shell"
desc = "A 12 gauge shell that fires fewer, larger pellets than buckshot. A favorite of SolFed anti-piracy enforcers, \
desc = "A 12 gauge shell that fires fewer, larger pellets than buckshot. A favorite of TerraGov anti-piracy enforcers, \
especially against the likes of vox."
icon_state = "magshell"
projectile_type = /obj/projectile/bullet/pellet/shotgun_buckshot/magnum
@@ -1,7 +1,7 @@
/datum/supply_pack/security/armory/soft_armor
name = "Soft Armor Kit Crate"
crate_name = "soft armor kit crate"
desc = "Contains three sets of SolFed-made soft body armor and matching helmets."
desc = "Contains three sets of TerraGov-made soft body armor and matching helmets."
cost = CARGO_CRATE_VALUE * 5
contains = list(
/obj/item/clothing/head/helmet/sf_peacekeeper/debranded = 3,
@@ -11,7 +11,7 @@
/datum/supply_pack/security/armory/hardened_armor
name = "Hardened Armor Kit Crate"
crate_name = "hardened armor kit crate"
desc = "Contains three sets of SolFed-made hardened body armor and matching helmets."
desc = "Contains three sets of TerraGov-made hardened body armor and matching helmets."
cost = CARGO_CRATE_VALUE * 5
contains = list(
/obj/item/clothing/head/helmet/toggleable/sf_hardened = 3,
@@ -21,7 +21,7 @@
/datum/supply_pack/security/armory/sacrificial_armor
name = "Sacrificial Armor Kit Crate"
crate_name = "sacrificial armor kit crate"
desc = "Contains three sets of SolFed-made sacrificial body armor and matching helmets."
desc = "Contains three sets of TerraGov-made sacrificial body armor and matching helmets."
cost = CARGO_CRATE_VALUE * 5
contains = list(
/obj/item/clothing/head/helmet/sf_sacrificial = 3,
@@ -36,7 +36,7 @@
. += "What do you do in an age where armor penetration technology keeps getting better and better, \
and you're quite fond of not being a corpse? The 'Muur' type armor was a pretty successful attempt at an answer \
to the question. Using some advanced materials, micro-scale projectile dampener fields, and a whole \
host of other technologies that some poor SolFed procurement general had to talked to death about, \
host of other technologies that some poor TerraGov procurement general had to talked to death about, \
it offers a unique advantage over many armor piercing bullets. Why stop the bullet from piercing the armor \
with more armor, when you could simply force the bullet to penetrate less and get away with less protection? \
Some people would rather the bullet just be stopped, of course, but when you have to make choices, many choose \
@@ -83,7 +83,7 @@
. += "What do you do in an age where armor penetration technology keeps getting better and better, \
and you're quite fond of not being a corpse? The 'Muur' type armor was a pretty successful attempt at an answer \
to the question. Using some advanced materials, micro-scale projectile dampener fields, and a whole \
host of other technologies that some poor SolFed procurement general had to talked to death about, \
host of other technologies that some poor TerraGov procurement general had to talked to death about, \
it offers a unique advantage over many armor piercing bullets. Why stop the bullet from piercing the armor \
with more armor, when you could simply force the bullet to penetrate less and get away with less protection? \
Some people would rather the bullet just be stopped, of course, but when you have to make choices, many choose \
@@ -11,7 +11,7 @@
/obj/item/clothing/suit/armor/sf_peacekeeper
name = "'Touvou' peacekeeper armor vest"
desc = "A bright blue vest, proudly bearing 'SF' in white on its front and back. Dense fabric with a thin layer of rolled metal \
desc = "A bright blue vest, proudly bearing 'TGPD' in white on its front and back. Dense fabric with a thin layer of rolled metal \
will protect you from bullets best, a few blunt blows, and the wounds they cause. Lasers will burn more or less straight through it."
icon = 'modular_skyrat/modules/specialist_armor/icons/armor.dmi'
icon_state = "soft_peacekeeper"
@@ -24,25 +24,24 @@
/obj/item/clothing/suit/armor/sf_peacekeeper/examine_more(mob/user)
. = ..()
. += "A common SolFed designed armor vest for a common cause, not having your innards become outards. \
. += "A common TerraGov designed armor vest for a common cause, not having your innards become outards. \
While heavier armors certainly exist, the 'Touvou' is relatively cheap for the protection you do get, \
and many soldiers and officers around the galaxy will tell you the convenience of a mostly soft body armor. \
Not for any of the protection, but for the relative comfort, especially in areas where you don't need to care \
much if you're able to stop an anti materiel round with your chest. Likely due to all those factors, \
it is a common sight on SolFed peacekeepers around the galaxy, alongside other misfits and corporate baddies \
it is a common sight on TerraGov peacekeepers around the galaxy, alongside other misfits and corporate baddies \
across the galaxy."
return .
/obj/item/clothing/suit/armor/sf_peacekeeper/debranded
name = "'Touvou' soft armor vest"
desc = "A bright white vest, notably missing an 'SF' marking on either its front or back. Dense fabric with a thin layer of rolled metal \
will protect you from bullets best, a few blunt blows, and the wounds they cause. Lasers will burn more or less straight through it."
desc = "A bright white vest, notably missing an 'TGPD', and the wounds they cause. Lasers will burn more or less straight through it."
icon_state = "soft_civilian"
/obj/item/clothing/head/helmet/sf_peacekeeper
name = "'Kastrol' peacekeeper helmet"
desc = "A large, almost always ill-fitting helmet painted in bright blue. It proudly bears the emblems of SolFed on its sides. \
desc = "A large, almost always ill-fitting helmet painted in bright blue. It proudly bears the emblems of TerraGov on its sides. \
It will protect from bullets best, with some protection against blunt blows, but falters easily in the presence of lasers."
icon = 'modular_skyrat/modules/specialist_armor/icons/armor.dmi'
icon_state = "helmet_peacekeeper"
@@ -56,14 +55,14 @@
/obj/item/clothing/head/helmet/sf_peacekeeper/examine_more(mob/user)
. = ..()
. += "A common SolFed designed ballistic helmet for a common cause, keeping your brain inside your head. \
. += "A common TerraGov designed ballistic helmet for a common cause, keeping your brain inside your head. \
While heavier helmets certainly exist, the 'Kastrol' is relatively cheap for the protection you do get, \
and many soldiers don't mind it much due to its large over-head size bypassing a lot of the fitting issues \
some more advanced or more protective helmets might have. \
Especially in areas where you don't need to care \
much if you're able to stop an anti materiel round with your forehead, it does the job just fine. \
Likely due to all those factors, \
it is a common sight on SolFed peacekeepers around the galaxy, alongside other misfits and corporate baddies \
it is a common sight on TerraGov peacekeepers around the galaxy, alongside other misfits and corporate baddies \
across the galaxy."
return .
@@ -314,14 +314,14 @@
- Strong point defense system <br>
- ~1/2 a tile's length of movement range
<br>
<b>SolFed</b> <br>
SolFed's navy is possibly the oldest and largest in the known universe, having more experience in
combat historically than most other navies combined. Nowadays, due to the expanse of SolFed space,
<b>TerraGov</b> <br>
TerraGov's navy is possibly the oldest and largest in the known universe, having more experience in
combat historically than most other navies combined. Nowadays, due to the expanse of TerraGov space,
their patrols are thin stretched across the space they control, large groups of ships a rare sight.
A side effect of this is that they usually lack smaller combat vessels, favoring larger ships. <br>
<br>
-- Flak Frigate -- <br>
Built special purpose to shoot down the vast numbers of strike craft that were often employed by SolFed's
Built special purpose to shoot down the vast numbers of strike craft that were often employed by TerraGov's
enemies in large scale disputes, comes packed with enough point defense to make any carrier captain cry. <br>
- Represented by a medium ship marker <br>
- Cannons <br>
@@ -330,7 +330,7 @@
- ~1 tile's length of movement range
<br>
-- Light Cruiser -- <br>
The mainstay ship of any SolFed fleet, with enough armor and firepower to cruise into the thick of
The mainstay ship of any TerraGov fleet, with enough armor and firepower to cruise into the thick of
any battle and more than likely come out the other side still operational. <br>
- Represented by a large ship marker <br>
- Cannons <br>
@@ -339,7 +339,7 @@
- ~1/2 a tile's length of movement range
<br>
-- Heavy Carrier -- <br>
A prohibitively expensive carrier (not like this stops SolFed) that, while rarely fielded, can bring
A prohibitively expensive carrier (not like this stops TerraGov) that, while rarely fielded, can bring
more strike craft into battle than any ship known to mankind. <br>
- Represented by an alternative large ship marker <br>
- 4 Wings of strike craft, with 3 seeking missiles each wing <br>
@@ -347,7 +347,7 @@
- ~1/2 a tile's length of movement range
<br>
<b>NRI</b> <br>
The NRI's navy has always been at least a contender to SolFed's and Nanotrasen's own, heavily focused on missiles
The NRI's navy has always been at least a contender to TerraGov's and Nanotrasen's own, heavily focused on missiles
with very few ships straying away from that doctrine.
<br>
-- Patrol Corvette --
@@ -380,7 +380,7 @@
Though nowhere near as common as they were in the years since official contact with the Nomad Fleet,
explorers of humanity's past have been plagued with raids from pirate ships of mothic origin. Though
not malicious in nature, they would often come in skirmishes with patrol and escort forces on the outer
rim of SolFed territory, and may still rarely commit to raids against human ships even today.
rim of TerraGov territory, and may still rarely commit to raids against human ships even today.
<br>
-- Raider Corvette -- <br>
The smallest and most common ship in mothic pirate bands, using the Nomad Fleet's prowess in ship
@@ -418,15 +418,15 @@
- The NRI should start with a few more ships, or stronger ships than the NT force, however
the NT station should have several defensive platforms surrounding it to supplement. <br>
<br>
-- NRI/SolFed Border Conflict -- <br>
Two sizeable fleets from both SolFed, and the NRI meet in disputed space. A battle ensues soon
-- NRI/TerraGov Border Conflict -- <br>
Two sizeable fleets from both TerraGov, and the NRI meet in disputed space. A battle ensues soon
after, this fight being only a small part of a larger battle. <br>
- Takes place in the rings of a nearby planet, large dust fields and asteroids making spotting
other ships difficult. <br>
- Either side will win through complete destruction or surrender of the enemy. <br>
- Both the NRI and SolFed fleets should be about the same size and strength.
- Both the NRI and TerraGov fleets should be about the same size and strength.
<br>
-- SolFed/Mothic Raiders Convoy Raid -- <br>
-- TerraGov/Mothic Raiders Convoy Raid -- <br>
A convoy of Nanotrasen cargo vessels, escorted by a small patrol force, come under attack by a sizeable
band of mothic raiders. <br>
- Takes place in a dense asteroid field <br>
@@ -108,8 +108,8 @@
//Off-station,
JOB_SPACE_POLICE = 901,
JOB_SOLFED = 902,
JOB_SOLFED_LIASON = 903
JOB_TERRAGOV = 902,
JOB_TERRAGOV_LIASON = 903
)
@@ -16,8 +16,8 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/structure/sign/flag/galfed, 32)
icon_state = "flag_tizira"
/obj/structure/sign/flag/terragov
name = "flag of the Solarian State"
desc = "Previously the flag of the Sol Federation, before it was dissolved."
name = "flag of the Terran Government"
desc = "The flag of the Terran Government, home of humanity."
/obj/item/sign/flag/galfed
name = "folded flag of the Galactic Federation"
@@ -33,8 +33,8 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/structure/sign/flag/galfed, 32)
icon_state = "folded_tizira"
/obj/item/sign/flag/terragov
name = "folded flag of the Solarian State"
desc = "The folded flag of the Solarian State."
name = "folded flag of the Terran Government"
desc = "The folded flag of the Terran Government."
/obj/structure/sign/flag/nri
name = "flag of the Novaya Rossiyskaya Imperiya"
@@ -1,6 +1,6 @@
/datum/supply_pack/goody/sol_pistol_single
name = "Sol 'Wespe' Pistol Single Pack"
desc = "The standard issue service pistol of the Solar Federation's various military branches. Comes with an attached light and a spare magazine."
desc = "The standard issue service pistol of the Terran Government's various military branches. Comes with an attached light and a spare magazine."
contains = list(/obj/item/gun/ballistic/automatic/pistol/sol = 1,
/obj/item/ammo_box/magazine/c35sol_pistol/starts_empty = 1,
)
@@ -176,7 +176,7 @@ GLOBAL_LIST(end_titles)
titles += "<center>STAFF'S GOOD BOYS:<br>[english_list(goodboys)]</center><br>"
var/disclaimer = "<br>Sponsored by [pick("Nanotrasen", "The Syndicate", "Armadyne Corporation")].<br>All rights reserved.<br>\
This motion picture is protected under the copyright laws of the Sol Central Government<br> and other nations throughout the galaxy.<br>\
This motion picture is protected under the copyright laws of the Terran Government<br> and other nations throughout the galaxy.<br>\
Colony of First Publication: [pick("Mars", "Luna", "Earth", "Venus", "Phobos", "Ceres", "Tiamat", "Ceti Epsilon", "Eos", "Pluto", "Ouere",\
"Lordania", "Kingston", "Cinu", "Yuklid V", "Lorriman", "Tersten", "Gaia")].<br>"
disclaimer += pick("Use for parody prohibited. PROHIBITED.",
@@ -8,8 +8,8 @@
/datum/species/human/get_species_lore()
return list(
"Humans originate from Earth in the Sol system. They evolved from Primates and founded the former state of SolFed,\
the NRI, and many other minor organizations. After a turbulent history, SolFed was absorbed into the Galactic Federation,\
"Humans originate from Earth in the Sol system. They evolved from Primates and founded the Terran Government,\
the NRI, and many other minor organizations. After a turbulent history, the Terran Government was absorbed into the Galactic Federation,\
and humanity went along with it.",
"While most humans reside within GalFed in the current age, a large portion has migrated to every corner of the Known Galaxy,\
@@ -17,16 +17,16 @@
The human stereotype of adaptability holds true even in space.",
"Humans entered space around when many other species did, fully-entering into the space age in the mid 2040s.\
SolFed erupted with massive growth, sprawling many star systems and colonizing hundreds of planets.\
Around the 2080s SolFed encountered the Alliance, the predecessors to GalFed, and engaged in a long-standing rivalry with them until 2140.\
TerraGov erupted with massive growth, sprawling many star systems and colonizing hundreds of planets.\
Around the 2080s TerraGov encountered the Alliance, the predecessors to GalFed, and engaged in a long-standing rivalry with them until 2140.\
During this period, Sol found itself in 9 wars with the Alliance, winning 5 and losing 4. The last of these wars were a crushing defeat, \
and left SolFed under the influence of the Alliance.",
and left TerraGov under the influence of the Alliance.",
"Around this time, the NRI had made its roots in a collection of far-colonies, establishing the second, \
and eventually the largest Human-led nation in the Known Galaxy. When SolFed was absorbed into the Galactic Federation during its founding, \
and eventually the largest Human-led nation in the Known Galaxy. When TerraGov was absorbed into the Galactic Federation during its founding, \
the NRI exploded in population and started a rivalry with GalFed that spanned longer than Sol and the Alliances rivalry by a long shot.",
"In the current day and age, the NRI is still the largest Human primary nation, though even they have taken on a massive population of non-humans.\
What remains of Sol is the Solarian State, otherwise known as SolGov, and it is a bustling state of commerce and military advancement. \
What remains of Sol is the Terran Government, otherwise known as TerraGov, and it is a bustling state of commerce and military advancement. \
Human thriftiness is often considered the reason for GalFeds economic explosion and current dominance over markets across the entirety of the Known Galaxy.",
)
@@ -11,7 +11,7 @@
Nri = list(fax_name = "NRI", fax_id = "NRI", color = "orange", emag_needed = FALSE),
Ombrux = list(fax_name = "Ombrux", fax_id = "Ombrux", color = "orange", emag_needed = TRUE),
Soato = list(fax_name = "Soato", fax_id = "Soato", color = "orange", emag_needed = TRUE),
SolFed = list(fax_name = "SBI", fax_id = "SBI", color = "orange", emag_needed = FALSE),
TerraGov = list(fax_name = "SBI", fax_id = "SBI", color = "orange", emag_needed = FALSE),
Irs = list(fax_name = "IRS", fax_id = "IRS", color = "orange", emag_needed = FALSE),
Clowns = list(fax_name = "Clown Planet", fax_id = "Clowns", color = "pink", emag_needed = FALSE),
Mimes = list(fax_name = "La Pantomime Troupe", fax_id = "Mimes", color = "white", emag_needed = FALSE),
@@ -34,7 +34,7 @@
/obj/item/clothing/head/security_garrison = 10,
/obj/item/clothing/head/security_cap = 10,
/obj/item/clothing/head/beret/sec/peacekeeper = 6,
/obj/item/clothing/head/helmet/sec/sol = 6,
/obj/item/clothing/head/helmet/sec/terra = 6,
/obj/item/clothing/head/hats/warden/police/patrol = 6,
/obj/item/clothing/head/costume/ushanka/sec = 10,
/obj/item/clothing/gloves/color/black/security = 10,
+4 -4
View File
@@ -466,13 +466,13 @@
#include "code\__DEFINES\~skyrat_defines\say.dm"
#include "code\__DEFINES\~skyrat_defines\security_alerts.dm"
#include "code\__DEFINES\~skyrat_defines\signals.dm"
#include "code\__DEFINES\~skyrat_defines\solfed.dm"
#include "code\__DEFINES\~skyrat_defines\sound.dm"
#include "code\__DEFINES\~skyrat_defines\span.dm"
#include "code\__DEFINES\~skyrat_defines\species_clothing_paths.dm"
#include "code\__DEFINES\~skyrat_defines\strippable.dm"
#include "code\__DEFINES\~skyrat_defines\synth_defines.dm"
#include "code\__DEFINES\~skyrat_defines\techweb_nodes.dm"
#include "code\__DEFINES\~skyrat_defines\terragov.dm"
#include "code\__DEFINES\~skyrat_defines\teshari_clothing_paths.dm"
#include "code\__DEFINES\~skyrat_defines\text.dm"
#include "code\__DEFINES\~skyrat_defines\tools.dm"
@@ -6583,8 +6583,8 @@
#include "modular_skyrat\master_files\code\datums\components\tippable.dm"
#include "modular_skyrat\master_files\code\datums\greyscale\config_types\greyscale_configs.dm"
#include "modular_skyrat\master_files\code\datums\id_trim\jobs.dm"
#include "modular_skyrat\master_files\code\datums\id_trim\solfed.dm"
#include "modular_skyrat\master_files\code\datums\id_trim\syndicate.dm"
#include "modular_skyrat\master_files\code\datums\id_trim\terragov.dm"
#include "modular_skyrat\master_files\code\datums\keybinding\mob.dm"
#include "modular_skyrat\master_files\code\datums\keybinding\movement.dm"
#include "modular_skyrat\master_files\code\datums\mind\_mind.dm"
@@ -7737,8 +7737,8 @@
#include "modular_skyrat\modules\goofsec\code\department_guards.dm"
#include "modular_skyrat\modules\goofsec\code\hud.dm"
#include "modular_skyrat\modules\goofsec\code\sec_clothing_overrides.dm"
#include "modular_skyrat\modules\goofsec\code\sol_fed.dm"
#include "modular_skyrat\modules\goofsec\code\solfed_clothing.dm"
#include "modular_skyrat\modules\goofsec\code\terragov.dm"
#include "modular_skyrat\modules\goofsec\code\terragov_clothing.dm"
#include "modular_skyrat\modules\gun_safety\code\keybinding.dm"
#include "modular_skyrat\modules\gun_safety\code\safety_additions.dm"
#include "modular_skyrat\modules\gun_safety\code\safety_component.dm"
@@ -463,21 +463,21 @@ const PageMain = (props) => {
{!!canMakeAnnouncement && (
<Button
icon="bullhorn"
content="Call Sol Federation 911: Marshals Response"
content="Call Terran Government 911: Marshals Response"
onClick={() => act('callThePolice')}
/>
)}
{!!canMakeAnnouncement && (
<Button
icon="bullhorn"
content="Call Sol Federation 811: Atmospherics Response"
content="Call Terran Government 811: Atmospherics Response"
onClick={() => act('callTheCatmos')}
/>
)}
{!!canMakeAnnouncement && (
<Button
icon="bullhorn"
content="Call Sol Federation 911: Medical Response"
content="Call Terran Government 911: Medical Response"
onClick={() => act('callTheParameds')}
/>
)}
@@ -0,0 +1,8 @@
/datum/loadout_item/inhand/flag_terragov : /datum/loadout_item/inhand/flag_solfed{@OLD}
/datum/outfit/terragov_bitrun : /datum/outfit/solfed_bitrun{@OLD}
/obj/item/card/id/advanced/terragov : /obj/item/card/id/advanced/solfed{@OLD}
/datum/id_trim/terragov : /datum/id_trim/solfed{@OLD}
/datum/id_trim/terragov/liasion : /datum/id_trim/solfed/liasion{@OLD}
/datum/id_trim/terragov_bitrun : /datum/id_trim/solfed_bitrun{@OLD}
/obj/item/card/id/advanced/terragov : /obj/item/card/id/advanced/solfed{@OLD}