17 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
mikomyazaki a7b53a1146 Adds a mapmerge2 script set for the horizon map (#13496) 2022-04-16 21:32:52 +02:00
alberyk 8c1d2a7cde Merge branch 'master' into final_away_maps_additions
# Conflicts:
#	code/__defines/misc.dm
#	code/modules/client/preference_setup/loadout/loadout_xeno/tajara.dm
#	icons/mob/head.dmi
#	maps/exodus/code/exodus.dm
2022-04-04 19:47:58 -03:00
mikomyazaki 25dc59083c Removes Exodus map (#13305) 2022-03-12 02:03:38 +01:00
Ferner 06294c97da Merge branch 'master' into placeholder 2020-12-07 03:25:15 +01:00
Wowzewow (Wezzy) 7766368069 Replaces DMItool with contemporary /tg/station version. (#10624) 2020-12-04 02:21:40 +01:00
Ferner 49e776b145 Merge branch 'master' into placeholder 2020-07-15 20:52:49 +02:00
Mykhailo Bykhovtsev 6b5b3fc592 Enforcing python version in scripts (#7620) 2020-06-26 11:49:34 +02:00
Ferner 5e2f046aba Initial 2020-06-24 09:29:58 +02:00
Mykhailo Bykhovtsev 7b07d8f2e0 Adding admin verb to load templates(maps) during runtime. (#7674) 2020-01-27 21:51:49 +01:00
Panter daf29bf016 Added bash versions of all the map preparing and merging scripts in 'tools/mapmerge2/'. (#6929)
* Added bash versions of all the map preparing and merging scripts in 'tools/mapmerge2/'.

* Renamed all Linux map preparation bash scripts.

* All Linux map preparation bash scripts now assume the file is being executed from the mapmerge2 directory, making the same assumption the .bat files make.

* The map merge Linux bash script now assumes the script is being run from the mapmerge2 directory, making the same assumption the .bat file makes.
2019-11-06 18:46:11 +01:00
Alberyk 6393c26326 Adds a system for random explorable space sites (#6320) 2019-05-05 23:37:03 +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
Mykhailo Bykhovtsev 43cd737a78 Getting rid of mm1 and moving merge conflict resolution to mm2 (#5617)
This PRs gets rid of mm1 and moves merge conflict resolution entirely to mm2.
2018-11-17 00:52:49 +02:00
BurgerLUA 1bd59b6532 [Ready] Asteroid Dungeons (#4884)
Adds Asteroid Dungeons framework to the game. Mappers can make their own asteroid dungeons to the game. Currently there are no asteroid dungeons that can be loaded.

Anyone can make a dungeon like anyone could make a change to a map. A readme file is included inside the maps directory for information regarding how to add your own dungeon to the map.

There's an added config function in the example config that determines whether or not asteroid dungeons spawn. I also included 2 bat files in mapmerge and mapmerge2 that backup the asteroid dungeons spawns so that they can be used in mapmerge.
2018-07-20 22:10:35 +02: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