forked from cmss13-devs/cmss13
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'dev' of https://gitlab.com/cmdevs/colonial-warfare into…
… maploader # Conflicts: # code/__HELPERS/unsorted.dm # code/controllers/subsystem/ticker.dm # code/controllers/voting.dm # code/game/gamemodes/cm_self_destruct.dm # code/game/gamemodes/colonialmarines/whiskey_outpost.dm # code/game/jobs/job/job.dm # code/game/jobs/role_authority.dm # code/game/world.dm # code/modules/mob/new_player/new_player.dm
- Loading branch information
1 parent
e527811
commit 276cda2
Showing
338 changed files
with
4,760 additions
and
5,941 deletions.
There are no files selected for viewing
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,14 +1,17 @@ | ||
| [*] | ||
| indent_style = tab | ||
| indent_size = 4 | ||
| charset = utf-8 | ||
| trim_trailing_whitespace = true | ||
| insert_final_newline = true | ||
| end_of_line = lf | ||
|
|
||
| [*.yml] | ||
| indent_style = space | ||
| indent_size = 2 | ||
|
|
||
| [*.py] | ||
| indent_style = space | ||
| [*] | ||
| indent_style = tab | ||
| indent_size = 4 | ||
| charset = utf-8 | ||
| trim_trailing_whitespace = true | ||
| insert_final_newline = true | ||
| end_of_line = lf | ||
|
|
||
| [*.yml] | ||
| indent_style = space | ||
| indent_size = 2 | ||
|
|
||
| [*.py] | ||
| indent_style = space | ||
|
|
||
| [*.json] | ||
| indent_style = space |
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
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,39 +1,42 @@ | ||
| image: i386/ubuntu:xenial | ||
|
|
||
| stages: | ||
| - build | ||
|
|
||
| variables: | ||
| BYOND_MAJOR: "513" | ||
| BYOND_MINOR: "1527" | ||
| SPACEMAN_DMM_VERSION: "1.6" | ||
| GITLAB_CHANGELOG_PID: "21031593" | ||
| GITLAB_REPO_LINK: "[email protected]:cmdevs/colonial-warfare.git" | ||
|
|
||
| stages: | ||
| - build | ||
|
|
||
| before_script: | ||
| - apt-get update -qq | ||
| - apt-get --yes install build-essential unzip libc6:i386 libgcc1:i386 libstdc++6:i386 curl -qq | ||
| - curl "http://www.byond.com/download/build/${BYOND_MAJOR}/${BYOND_MAJOR}.${BYOND_MINOR}_byond_linux.zip" -o byond.zip | ||
| - unzip byond.zip | ||
| - cd byond | ||
| - make install | ||
| - cd .. | ||
| - curl -LJO "https://github.com/SpaceManiac/SpacemanDMM/releases/download/suite-${SPACEMAN_DMM_VERSION}/dreamchecker" -o dreamchecker | ||
| - chmod +x dreamchecker | ||
|
|
||
| build: | ||
| stage: build | ||
| script: | ||
| - ./dreamchecker | ||
| - chmod +rwx ./insert_maps_in_dme.sh | ||
| - ./insert_maps_in_dme.sh | ||
| - DreamMaker ColonialMarinesALPHA.dme | ||
| artifacts: | ||
| paths: | ||
| - ColonialMarinesALPHA.dmb | ||
| - ColonialMarinesALPHA.rsc | ||
| expire_in: 20min | ||
| run_linters: | ||
| stage: build | ||
| before_script: | ||
| - apt update | ||
| - apt install -y software-properties-common | ||
| - add-apt-repository ppa:deadsnakes/ppa | ||
| - apt update | ||
| - apt install -y curl unzip build-essential libssl-dev build-essential libc6:i386 libgcc1:i386 libstdc++6:i386 python3.7 wget | ||
| - bash tools/ci/install_spaceman_dmm.sh dreamchecker | ||
| script: | ||
| - find . -name "*.json" -not -path "*/node_modules/*" -print0 | xargs -0 python3 ./tools/json_verifier.py | ||
| - ~/dreamchecker | ||
| compile_all_maps: | ||
| stage: build | ||
| before_script: | ||
| - apt update | ||
| - apt install -y software-properties-common | ||
| - add-apt-repository ppa:deadsnakes/ppa | ||
| - apt update | ||
| - apt install -y curl python3.7 unzip build-essential libc6:i386 libgcc1:i386 libstdc++6:i386 | ||
| script: | ||
| - bash tools/ci/install_byond.sh | ||
| - source $HOME/BYOND/byond/bin/byondsetup | ||
| - python3 tools/ci/template_dm_generator.py | ||
| - bash tools/ci/dm.sh -DCIBUILDING -DCITESTING -DALL_MAPS ColonialMarinesALPHA.dme | ||
| artifacts: | ||
| paths: | ||
| - ColonialMarinesALPHA.dmb | ||
| - ColonialMarinesALPHA.rsc | ||
| expire_in: 20min | ||
|
|
||
| changelog: | ||
| stage: build | ||
|
|
||
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
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
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
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
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,7 +1,7 @@ | ||
| GLOBAL_LIST_EMPTY(icon_source_files) | ||
|
|
||
| /proc/get_icon_from_source(source_name) | ||
| var/icon/I = null | ||
| if(GLOB.icon_source_files[source_name]) | ||
| return GLOB.icon_source_files[source_name] | ||
| GLOB.icon_source_files[source_name] = file(source_name) | ||
| I = GLOB.icon_source_files[source_name] | ||
| return I | ||
| return GLOB.icon_source_files[source_name] |
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,116 @@ | ||
| /* | ||
| The /tg/ codebase allows mixing of hardcoded and dynamically-loaded z-levels. | ||
| Z-levels can be reordered as desired and their properties are set by "traits". | ||
| See map_config.dm for how a particular station's traits may be chosen. | ||
| The list DEFAULT_MAP_TRAITS at the bottom of this file should correspond to | ||
| the maps that are hardcoded, as set in maps/_basemap.dm. SSmapping is | ||
| responsible for loading every non-hardcoded z-level. | ||
| Multi-Z stations are supported and multi-Z mining and away missions would | ||
| require only minor tweaks. | ||
| */ | ||
|
|
||
| // helpers for modifying jobs, used in various job_changes.dm files | ||
| #define MAP_JOB_CHECK if(SSmapping.configs[GROUND_MAP].map_name != JOB_MODIFICATION_MAP_NAME) { return; } | ||
| #define MAP_JOB_CHECK_BASE if(SSmapping.configs[GROUND_MAP].map_name != JOB_MODIFICATION_MAP_NAME) { return ..(); } | ||
| #define MAP_REMOVE_JOB(jobpath) /datum/job/##jobpath/map_check() { return (SSmapping.configs[GROUND_MAP].map_name != JOB_MODIFICATION_MAP_NAME) && ..() } | ||
|
|
||
| #define SPACERUIN_MAP_EDGE_PAD 15 | ||
|
|
||
| // traits | ||
| // boolean - marks a level as having that property if present | ||
| #define ZTRAIT_STATION "Station" | ||
| #define ZTRAIT_RESERVED "Transit/Reserved" | ||
| #define ZTRAIT_GROUND "Ground" | ||
| #define ZTRAIT_MARINE_MAIN_SHIP "Marine Main Ship" | ||
| #define ZTRAIT_ADMIN "Admin" | ||
| #define ZTRAIT_LOWORBIT "LowOrbit" | ||
| #define ZTRAIT_HUNTER_SHIP "HunterShop" | ||
| #define ZTRAIT_INTERIORS "Interiors" | ||
|
|
||
| #define ZTRAIT_FOG "Fog" | ||
| #define ZTRAIT_LOCKDOWN "Lockdown" | ||
|
|
||
| // boolean - weather types that occur on the level | ||
| #define ZTRAIT_SNOWSTORM "weather_snowstorm" | ||
| #define ZTRAIT_ASHSTORM "weather_ashstorm" | ||
| #define ZTRAIT_ACIDRAIN "weather_acidrain" | ||
| #define ZTRAIT_SANDSTORM "weather_sandstorm" | ||
|
|
||
| // number - bombcap is multiplied by this before being applied to bombs | ||
| #define ZTRAIT_BOMBCAP_MULTIPLIER "Bombcap Multiplier" | ||
|
|
||
| // number - default gravity if there's no gravity generators or area overrides present | ||
| #define ZTRAIT_GRAVITY "Gravity" | ||
|
|
||
| // numeric offsets - e.g. {"Down": -1} means that chasms will fall to z - 1 rather than oblivion | ||
| #define ZTRAIT_UP "Up" | ||
| #define ZTRAIT_DOWN "Down" | ||
|
|
||
| // enum - how space transitions should affect this level | ||
| #define ZTRAIT_LINKAGE "Linkage" | ||
| // UNAFFECTED if absent - no space transitions | ||
| #define UNAFFECTED null | ||
| // SELFLOOPING - space transitions always self-loop | ||
| #define SELFLOOPING "Self" | ||
| // CROSSLINKED - mixed in with the cross-linked space pool | ||
| #define CROSSLINKED "Cross" | ||
|
|
||
| // string - type path of the z-level's baseturf (defaults to space) | ||
| #define ZTRAIT_BASETURF "Baseturf" | ||
|
|
||
| // default trait definitions, used by SSmapping | ||
| #define ZTRAITS_MAIN_SHIP list(ZTRAIT_MARINE_MAIN_SHIP = TRUE) | ||
| #define ZTRAITS_GROUND list(ZTRAIT_GROUND = TRUE) | ||
| #define ZTRAITS_ADMIN list(ZTRAIT_ADMIN = TRUE) | ||
| #define ZTRAITS_LOWORBIT list(ZTRAIT_LOWORBIT = TRUE) | ||
| #define ZTRAITS_SPACE list(ZTRAIT_LINKAGE = CROSSLINKED, ZTRAIT_SPACE_RUINS = TRUE) | ||
| #define ZTRAITS_INTERIORS list(ZTRAIT_INTERIORS = TRUE) | ||
|
|
||
| #define DL_NAME "name" | ||
| #define DL_TRAITS "traits" | ||
| #define DECLARE_LEVEL(NAME, TRAITS) list(DL_NAME = NAME, DL_TRAITS = TRAITS) | ||
|
|
||
| // must correspond to _basemap.dm for things to work correctly | ||
| #define DEFAULT_MAP_TRAITS list(\ | ||
| DECLARE_LEVEL("CentCom", ZTRAITS_ADMIN),\ | ||
| DECLARE_LEVEL("LowOrbit", ZTRAITS_LOWORBIT),\ | ||
| ) | ||
|
|
||
| // Camera lock flags | ||
| #define CAMERA_LOCK_SHIP (1<<0) | ||
| #define CAMERA_LOCK_GROUND (1<<1) | ||
| #define CAMERA_LOCK_ADMIN (1<<2) | ||
|
|
||
| //Reserved/Transit turf type | ||
| #define RESERVED_TURF_TYPE /turf/open/space/basic //What the turf is when not being used | ||
|
|
||
| //Ruin Generation | ||
|
|
||
| #define PLACEMENT_TRIES 100 //How many times we try to fit the ruin somewhere until giving up (really should just swap to some packing algo) | ||
|
|
||
| #define PLACE_DEFAULT "random" | ||
| #define PLACE_SAME_Z "same" | ||
| #define PLACE_SPACE_RUIN "space" | ||
| #define PLACE_LAVA_RUIN "lavaland" | ||
|
|
||
|
|
||
| #define GROUND_MAP "ground_map" | ||
| #define SHIP_MAP "ship_map" | ||
| #define ALL_MAPTYPES list(GROUND_MAP, SHIP_MAP) | ||
| #define MAP_TO_FILENAME list(GROUND_MAP = "data/next_map.json", SHIP_MAP = "data/next_ship.json") | ||
|
|
||
| // traity things | ||
| #define MAP_COLD "COLD" | ||
|
|
||
| #define MAP_ARMOR_STYLE_DEFAULT "default" | ||
| #define MAP_ARMOR_STYLE_ICE "ice" | ||
| #define MAP_ARMOR_STYLE_JUNGLE "jungle" | ||
| #define MAP_ARMOR_STYLE_PRISON "prison" | ||
|
|
||
| //turf-only flags | ||
| #define NOJAUNT_1 (1<<0) | ||
| #define UNUSED_RESERVATION_TURF_1 (1<<1) | ||
| /// If a turf can be made dirty at roundstart. This is also used in areas. | ||
| #define CAN_BE_DIRTY_1 (1<<2) |
Oops, something went wrong.