4 Commits

Author SHA1 Message Date
DreamySkrell
db8d0918e6 Remove the Crew Armory and the Leviathan (#19728)
end of an era


![image](https://github.com/user-attachments/assets/3a8c35b1-5dd6-4456-8f87-b807e61b8535)

![image](https://github.com/user-attachments/assets/723dd548-852d-48f8-9255-881aa7e6f71b)

![image](https://github.com/user-attachments/assets/157491eb-a1b8-465b-868a-d8df1c56aa41)

![image](https://github.com/user-attachments/assets/50c1ebbb-0d4f-40f0-bc4f-2675f126b8be)

![image](https://github.com/user-attachments/assets/e3e8c83f-4d77-4c81-aa55-263e90eb0c90)


----------------------------------------------------------------------------------

----------------------------------------------------------------------------------

----------------------------------------------------------------------------------

----------------------------------------------------------------------------------

changes:
  - rscadd: "Removes the Crew Armory."
  - rscadd: "Removes the Leviathan."
  - rscadd: "Updates mapmerge2 tool with most current tg version."



MATT'S EDIT: For whoever is reading, the Leviathan and the Crew Armoury
are being removed to try and lower the Horizon's passive militarization
a bit. We're going to try playing without the crew armoury, but in case
security stomps are unbearable and Ops can't properly fulfill the role
of "giving people guns", then ERTs will likely end up being readded.

There will be an IC explanation given for the Leviathan's removal. The
crew armoury one will probably be a straight retcon.

---------

Co-authored-by: DreamySkrell <>
2024-08-11 01:14:32 +00:00
Werner
3742231bc2 Major UT Overhaul (#16544)
* Removes old UT definition files (drone/travis)
* Adds concurrency definitions to the workflows
* Changes our workflows to be more in line with what /tg does
* Adds a workflow to build/commit TGUI
* Adds a workflow to build/commit changelogs

Add python version to dependencies.sh
Fix dme errors
Removes a bunch of not included files
Cache Opendream and add directory to check_grep.py

Co-authored-by: Werner <Arrow768@users.noreply.github.com>
2023-06-27 16:44:16 +02:00
Mykhailo Bykhovtsev
779f8a0733 Integrating mapmerge2 checks into Travis (#5616)
Okay, this update is kinda big. Summary:

- Trimmed unused keys in Exodus telecomms

- Adds script that will run mapmerge2 on Travis to check branch for unused keys or key overflow, etc.

- Fixes matching indentation style in tag-matcher and converts it to use Python 3.6

- Converts mapmerge2 to be used by Python 3.4 and above. Instead of 3.6

- Removes Windows 1252 characters from Communication-blackout.dm that were not able to be seen in UTF-8 format.

Note: the last commit will fail because currently main level is broken

Example of no map issues:
![2018-11-15_li](https://user-images.githubusercontent.com/25555314/48592180-0fd7be80-e8fc-11e8-80b9-cd5af32540e3.jpg)

Example of issues:
![2018-11-15_li 2](https://user-images.githubusercontent.com/25555314/48592190-15cd9f80-e8fc-11e8-99bd-6da4b4c2b9d8.jpg)
2018-11-20 20:14:21 +01:00
Lohikar
1d335dd9e9 Add mapmerge 2 (#4645)
Adds TG's mapmerge2, a new TGM-compatible merger that handles things like dictionary expansion much better than the old tool, as well as supporting a git merge hook for map files.

This PR does not remove the old merger as this one is more annoying to setup.
2018-06-01 23:54:51 +03:00