-
-
Notifications
You must be signed in to change notification settings - Fork 280
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Guerilla Bandits and Insurgents Oh My!: Adhomai's Cold War comes in Hot! #6972
Merged
BlueWildrose
merged 16 commits into
Citadel-Station-13:master
from
CharlesWedge:guerilla_warfare
Feb 5, 2025
Merged
Guerilla Bandits and Insurgents Oh My!: Adhomai's Cold War comes in Hot! #6972
BlueWildrose
merged 16 commits into
Citadel-Station-13:master
from
CharlesWedge:guerilla_warfare
Feb 5, 2025
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Adhomai Style
I hate rendering I hate rendering
BlueWildrose
requested changes
Jan 22, 2025
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Some grammar corrections.
code/modules/mob/living/simple_mob/subtypes/humanoid/mercs/taj_guerilla.dm
Outdated
Show resolved
Hide resolved
code/modules/mob/living/simple_mob/subtypes/humanoid/mercs/taj_guerilla.dm
Outdated
Show resolved
Hide resolved
Co-authored-by: Blubelle <[email protected]>
…_guerilla.dm Co-authored-by: Blubelle <[email protected]>
Co-authored-by: Blubelle <[email protected]>
…_guerilla.dm Co-authored-by: Blubelle <[email protected]>
oops Grammar
more grammar
Other Say List Adjustments
New Gun Sprites now render correctly. Wielded sprites are still broken though.
…tadel-Station-13-RP into guerilla_warfare
TheLordME
previously approved these changes
Feb 1, 2025
silicons
pushed a commit
that referenced
this pull request
Feb 1, 2025
Fixes Tajara guerilla factions. Adds faction subtypes so they can work with eachoter/mercs or be non-hostile to crew.
silicons
pushed a commit
that referenced
this pull request
Feb 2, 2025
silicons
pushed a commit
that referenced
this pull request
Feb 2, 2025
silicons
pushed a commit
that referenced
this pull request
Feb 2, 2025
BlueWildrose
previously approved these changes
Feb 3, 2025
silicons
pushed a commit
that referenced
this pull request
Feb 4, 2025
BlueWildrose
approved these changes
Feb 5, 2025
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Gunmen of a Different Caliber (And Species)
Exploration and the station in general have been stuck shooting at human, totally not syndicate, mercenaries, it is time we begin shooting at other species and ones that are more politically relevant then the not-syndicate people. Introducing Tajara guerillas which come in three varieties representing the Tajara nations they come from. New Kingdom Bandits, Democratic Republic Guerillas, and People's Republic Insurgents. In addition, I have added 3 Tajara assault rifles (one from each nation) and a laser pistol.
Why It's Good For The Game
Though we in general want to get away from humanoid enemies, the primary issue with them is that currently selection of humanoids are faceless mercs that have no real reason to be there beyond gameplay. The Tajara factions have far more flavor and more easily readable motivations than the regular mercenaries and will be essential to events in and around the Atlas map. POIs involving the new mercs will be added at a later date likely replacing the remaining merc presence on Miaphus.
Changelog
🆑
add: 3 Tajara humanoid factions with a total of 11 mobs.
add: 3 Tajara assault rifles and a laser pistol.
/:cl: