Skip to content

Commit

Permalink
Adds a Hardliner faction datum. (shiptest-ss13#3765)
Browse files Browse the repository at this point in the history
<!-- 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. -->
Title.
<!-- Describe The Pull Request. Please be sure every change is
documented or this can delay review and even discourage maintainers from
merging your PR! -->
Three Hardliner ships are open (shiptest-ss13#3761, shiptest-ss13#3744, shiptest-ss13#3741) and all are using
the base syndicate faction. What a shame.
<!-- Please add a short description of why you think these changes would
benefit the game. If you can't justify it in words, it might not be
worth adding. -->

:cl:
code: Added a Hardliner faction datum.
/:cl:

<!-- Both :cl:'s are required for the changelog to work! You can put
your name to the right of the first :cl: 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. -->
  • Loading branch information
Sadhorizon authored and MrCat15352 committed Dec 27, 2024
1 parent 4121c38 commit 83c639f
Show file tree
Hide file tree
Showing 3 changed files with 39 additions and 1 deletion.
2 changes: 1 addition & 1 deletion _maps/configs/syndicate_gorlex_komodo.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"faction": "/datum/faction/syndicate",
"faction": "/datum/faction/syndicate/hardliners",
"prefix": "ISV",
"namelists": [
"GORLEX",
Expand Down
34 changes: 34 additions & 0 deletions code/__DEFINES/factions.dm
Original file line number Diff line number Diff line change
Expand Up @@ -43,4 +43,38 @@
// #define PREFIX_FRONTIER list("FFV")
// #define PREFIX_PGF list("PGF", "PGFMC", "PGFN")
// #define PREFIX_INDEPENDENT list("SV", "IMV", "ISV")

// #define FACTION_SYNDICATE "Syndicate"
// #define FACTION_NGR "New Gorlex Republic"
// #define FACTION_CYBERSUN "CyberSun"
// #define FACTION_HARDLINERS "Hardliners"
// #define FACTION_SUNS "Student-Union of Naturalistic Sciences"
// #define FACTION_SOLGOV "SolGov"
// #define FACTION_SRM "Saint-Roumain Militia"
// #define FACTION_INTEQ "Inteq Risk Management Group"
// #define FACTION_CLIP "CLIP Minutemen"
// #define FACTION_NT "Nanotrasen"
// #define FACTION_NS_LOGI "N+S Logistics"
// #define FACTION_VIGILITAS "Vigilitas Interstellar"
// #define FACTION_FRONTIER "Frontiersmen Fleet"
// #define FACTION_PGF "Pan-Gezenan Federation"
// #define FACTION_INDEPENDENT "Independent"

// #define PREFIX_SYNDICATE list("SEV", "SSV")
// #define PREFIX_NGR list("NGRV")
// #define PREFIX_CYBERSUN list("CSSV")
// #define PREFIX_HARDLINERS list("ISV")
// #define PREFIX_SUNS list("SUNS")
// #define PREFIX_SOLGOV list("SCSV")
// #define PREFIX_SRM list("SRSV")
// #define PREFIX_INTEQ list("IRMV")
// #define PREFIX_CLIP list("CMSV", "CMGSV")
// #define PREFIX_NT list("NTSV")
// #define PREFIX_NS_LOGI list("NSSV")
// #define PREFIX_VIGILITAS list("VISV")
// #define PREFIX_FRONTIER list("FFV")
// #define PREFIX_PGF list("PGF", "PGFMC", "PGFN")
// #define PREFIX_INDEPENDENT list("SV", "IMV", "ISV")


// [CELADON-REMOVE]
4 changes: 4 additions & 0 deletions code/modules/faction/faction_datum.dm
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,10 @@
name = FACTION_CYBERSUN
prefixes = PREFIX_CYBERSUN

/datum/faction/syndicate/hardliners
name = FACTION_HARDLINERS
prefixes = PREFIX_HARDLINERS

/datum/faction/syndicate/suns
name = FACTION_SUNS
short_name = "SUNS"
Expand Down

0 comments on commit 83c639f

Please sign in to comment.