Skip to content

Commit

Permalink
Merge remote-tracking branch 'cmss13-devs/master' into !MPS_REWORK
Browse files Browse the repository at this point in the history
  • Loading branch information
Stan_Albatross committed Nov 29, 2022
2 parents 54e3ec0 + 59c13bf commit 9a6b8c7
Show file tree
Hide file tree
Showing 719 changed files with 178,968 additions and 8,172 deletions.
24 changes: 24 additions & 0 deletions .github/workflows/auto_changelog.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
# Creates an entry in html/changelogs automatically, to eventually be compiled by compile_changelogs
name: Auto Changelog
on:
pull_request_target:
types:
- closed
branches:
- master
permissions:
contents: write
jobs:
auto_changelog:
runs-on: ubuntu-latest
if: github.event.pull_request.merged == true
steps:
- name: Checkout
uses: actions/checkout@v3
- name: Run auto changelog
uses: actions/github-script@v6
with:
script: |
const { processAutoChangelog } = await import('${{ github.workspace }}/tools/pull_request_hooks/autoChangelog.js')
await processAutoChangelog({ github, context })
github-token: ${{ secrets.GITHUB_TOKEN }}
33 changes: 16 additions & 17 deletions .github/workflows/compile_changelogs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,53 +3,52 @@ name: Compile changelogs
on:
schedule:
- cron: "0 0 * * *"
workflow_dispatch:

jobs:
compile:
name: "Compile changelogs"
runs-on: ubuntu-20.04
steps:
- name: "Check for CHANGELOG_ENABLER secret and pass true to output if it exists to be checked by later steps"
- name: "Check for ACTION_ENABLER secret and pass true to output if it exists to be checked by later steps"
id: value_holder
env:
CHANGELOG_ENABLER: ${{ secrets.CHANGELOG_ENABLER }}
ENABLER_SECRET: ${{ secrets.ACTION_ENABLER }}
run: |
unset SECRET_EXISTS
if [ -n $CHANGELOG_ENABLER ]; then SECRET_EXISTS='true' ; fi
echo ::set-output name=CL_ENABLED::${SECRET_EXISTS}
if [ -n "$ENABLER_SECRET" ]; then SECRET_EXISTS=true ; fi
echo "ACTIONS_ENABLED=$SECRET_EXISTS" >> $GITHUB_OUTPUT
- name: "Setup python"
if: steps.value_holder.outputs.CL_ENABLED
if: steps.value_holder.outputs.ACTIONS_ENABLED
uses: actions/setup-python@v3
with:
python-version: '3.x'
- name: "Install deps"
if: steps.value_holder.outputs.CL_ENABLED
if: steps.value_holder.outputs.ACTIONS_ENABLED
run: |
python -m pip install --upgrade pip
python -m pip install pyyaml
sudo apt-get install dos2unix
- name: "Checkout"
if: steps.value_holder.outputs.CL_ENABLED
if: steps.value_holder.outputs.ACTIONS_ENABLED
uses: actions/checkout@v3
with:
fetch-depth: 25
persist-credentials: false
- name: "Compile"
if: steps.value_holder.outputs.CL_ENABLED
if: steps.value_holder.outputs.ACTIONS_ENABLED
run: |
python tools/ss13_genchangelog.py html/changelog.html html/changelogs
- name: "Convert Lineendings"
if: steps.value_holder.outputs.CL_ENABLED
run: |
unix2dos html/changelogs/.all_changelog.yml
python .github/ss13_genchangelog.py html/changelogs
- name: Commit
if: steps.value_holder.outputs.CL_ENABLED
if: steps.value_holder.outputs.ACTIONS_ENABLED
run: |
git config --local user.email "[email protected]"
git config --local user.name "Changelogs"
git pull origin dev
git pull origin master
git add html/changelogs/archive
git commit -m "Automatic changelog compile [ci skip]" -a || true
- name: "Push"
if: steps.value_holder.outputs.CL_ENABLED
uses: ad-m/github-push-action@dev
if: steps.value_holder.outputs.ACTIONS_ENABLED
uses: ad-m/github-push-action@master
with:
github_token: ${{ secrets.GITHUB_TOKEN }}
33 changes: 0 additions & 33 deletions .gitlab/issue_templates/Bug.md

This file was deleted.

11 changes: 0 additions & 11 deletions .gitlab/issue_templates/Task.md

This file was deleted.

34 changes: 0 additions & 34 deletions .gitlab/merge_request_templates/Changelog.md

This file was deleted.

29 changes: 22 additions & 7 deletions ColonialMarinesALPHA.dme
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,6 @@
#include "code\__DEFINES\html.dm"
#include "code\__DEFINES\hud.dm"
#include "code\__DEFINES\human.dm"
#include "code\__DEFINES\icon_source_map.dm"
#include "code\__DEFINES\job.dm"
#include "code\__DEFINES\keybinding.dm"
#include "code\__DEFINES\language.dm"
Expand Down Expand Up @@ -182,8 +181,6 @@
#include "code\controllers\configuration\entries\combat_config.dm"
#include "code\controllers\configuration\entries\game_options.dm"
#include "code\controllers\configuration\entries\general.dm"
#include "code\controllers\configuration\entries\icon_source_config.dm"
#include "code\controllers\configuration\entries\nightmare.dm"
#include "code\controllers\configuration\entries\resources.dm"
#include "code\controllers\mc\admin.dm"
#include "code\controllers\mc\controller.dm"
Expand Down Expand Up @@ -216,6 +213,7 @@
#include "code\controllers\subsystem\midi.dm"
#include "code\controllers\subsystem\mob.dm"
#include "code\controllers\subsystem\nanoui.dm"
#include "code\controllers\subsystem\nightmare.dm"
#include "code\controllers\subsystem\objectives_controller.dm"
#include "code\controllers\subsystem\pager_status.dm"
#include "code\controllers\subsystem\perf_logging.dm"
Expand Down Expand Up @@ -512,6 +510,7 @@
#include "code\datums\supply_packs\attachments.dm"
#include "code\datums\supply_packs\clothing.dm"
#include "code\datums\supply_packs\engineering.dm"
#include "code\datums\supply_packs\food.dm"
#include "code\datums\supply_packs\hardpoint_modules.dm"
#include "code\datums\supply_packs\medical.dm"
#include "code\datums\supply_packs\misc.dm"
Expand All @@ -522,10 +521,12 @@
#include "code\datums\weather\weather_map_holder.dm"
#include "code\datums\weather\weather_events\big_red.dm"
#include "code\datums\weather\weather_events\faction_clash.dm"
#include "code\datums\weather\weather_events\lv522_chances_claim.dm"
#include "code\datums\weather\weather_events\lv624.dm"
#include "code\datums\weather\weather_events\sorokyne.dm"
#include "code\datums\weather\weather_map_holders\big_red.dm"
#include "code\datums\weather\weather_map_holders\faction_clash.dm"
#include "code\datums\weather\weather_map_holders\lv522_chances_claim.dm"
#include "code\datums\weather\weather_map_holders\lv624.dm"
#include "code\datums\weather\weather_map_holders\sorokyne.dm"
#include "code\datums\xeno_shields\xeno_shield.dm"
Expand Down Expand Up @@ -560,6 +561,7 @@
#include "code\game\area\DesertDam.dm"
#include "code\game\area\IceColony.dm"
#include "code\game\area\kutjevo.dm"
#include "code\game\area\LV522_Chances_Claim.dm"
#include "code\game\area\LV624.dm"
#include "code\game\area\prison.dm"
#include "code\game\area\Prison_Station_FOP.dm"
Expand All @@ -570,6 +572,7 @@
#include "code\game\area\strata.dm"
#include "code\game\area\Sulaco.dm"
#include "code\game\area\techtree.dm"
#include "code\game\area\varadero.dm"
#include "code\game\area\WhiskeyOutpost.dm"
#include "code\game\cas_manager\datums\cas_fire_envelope.dm"
#include "code\game\cas_manager\datums\cas_fire_mission.dm"
Expand Down Expand Up @@ -987,6 +990,7 @@
#include "code\game\objects\items\reagent_containers\food\cans.dm"
#include "code\game\objects\items\reagent_containers\food\condiment.dm"
#include "code\game\objects\items\reagent_containers\food\drinks.dm"
#include "code\game\objects\items\reagent_containers\food\fish_snacks.dm"
#include "code\game\objects\items\reagent_containers\food\fortunecookie.dm"
#include "code\game\objects\items\reagent_containers\food\sandwich.dm"
#include "code\game\objects\items\reagent_containers\food\snacks.dm"
Expand Down Expand Up @@ -1174,6 +1178,7 @@
#include "code\game\turfs\kutjevo.dm"
#include "code\game\turfs\light.dm"
#include "code\game\turfs\open.dm"
#include "code\game\turfs\shale.dm"
#include "code\game\turfs\shiva.dm"
#include "code\game\turfs\snow.dm"
#include "code\game\turfs\space.dm"
Expand Down Expand Up @@ -1290,6 +1295,7 @@
#include "code\modules\buildmode\submodes\outfit.dm"
#include "code\modules\buildmode\submodes\throwing.dm"
#include "code\modules\buildmode\submodes\variable_edit.dm"
#include "code\modules\character_traits\biology_traits.dm"
#include "code\modules\character_traits\character_trait.dm"
#include "code\modules\character_traits\hair_dye.dm"
#include "code\modules\character_traits\languages.dm"
Expand Down Expand Up @@ -1421,6 +1427,7 @@
#include "code\modules\cm_preds\yaut_shield.dm"
#include "code\modules\cm_preds\yaut_weapons.dm"
#include "code\modules\cm_tech\hologram.dm"
#include "code\modules\cm_tech\research_memories.dm"
#include "code\modules\cm_tech\tech.dm"
#include "code\modules\cm_tech\tech_memories.dm"
#include "code\modules\cm_tech\tech_node.dm"
Expand All @@ -1431,6 +1438,7 @@
#include "code\modules\cm_tech\droppod\gear_access_point.dm"
#include "code\modules\cm_tech\droppod\lz_effect.dm"
#include "code\modules\cm_tech\droppod\marine.dm"
#include "code\modules\cm_tech\droppod\supply.dm"
#include "code\modules\cm_tech\implements\adv_weapon.dm"
#include "code\modules\cm_tech\implements\ammo_kits.dm"
#include "code\modules\cm_tech\implements\armor.dm"
Expand Down Expand Up @@ -1489,6 +1497,12 @@
#include "code\modules\emoji\emoji_parse.dm"
#include "code\modules\events\comms_blackout.dm"
#include "code\modules\flufftext\Chinese.dm"
#include "code\modules\fishing\bait\generic.dm"
#include "code\modules\fishing\datums\generic.dm"
#include "code\modules\fishing\datums\helpers.dm"
#include "code\modules\fishing\poles\generic.dm"
#include "code\modules\fishing\props\fishing_line.dm"
#include "code\modules\fishing\props\fishing_pole.dm"
#include "code\modules\flufftext\Dreaming.dm"
#include "code\modules\flufftext\Hallucination.dm"
#include "code\modules\flufftext\Japanese.dm"
Expand All @@ -1500,6 +1514,7 @@
#include "code\modules\gear_presets\contractor.dm"
#include "code\modules\gear_presets\corpses.dm"
#include "code\modules\gear_presets\dust_raider.dm"
#include "code\modules\gear_presets\forcon_survivors.dm"
#include "code\modules\gear_presets\fun.dm"
#include "code\modules\gear_presets\other.dm"
#include "code\modules\gear_presets\pmc.dm"
Expand Down Expand Up @@ -1846,16 +1861,15 @@
#include "code\modules\nano\nanomapgen.dm"
#include "code\modules\nano\nanoui.dm"
#include "code\modules\nightmare\nmcontext.dm"
#include "code\modules\nightmare\nmreader.dm"
#include "code\modules\nightmare\nmnodes\components.dm"
#include "code\modules\nightmare\nmnodes\flow.dm"
#include "code\modules\nightmare\nmnodes\mapload.dm"
#include "code\modules\nightmare\nmnodes\nmnode.dm"
#include "code\modules\nightmare\nmnodes\scenario.dm"
#include "code\modules\nightmare\nmtasks\mapinit.dm"
#include "code\modules\nightmare\nmtasks\mapload.dm"
#include "code\modules\nightmare\nmtasks\multi.dm"
#include "code\modules\nightmare\nmtasks\mapscheduler.dm"
#include "code\modules\nightmare\nmtasks\nmtask.dm"
#include "code\modules\nightmare\nmtasks\sync.dm"
#include "code\modules\nightmare\nmtasks\scheduler.dm"
#include "code\modules\objectives\analyze_chems.dm"
#include "code\modules\objectives\communications.dm"
#include "code\modules\objectives\data_retrieval.dm"
Expand Down Expand Up @@ -1969,6 +1983,7 @@
#include "code\modules\reagents\chemistry_reagents\food.dm"
#include "code\modules\reagents\chemistry_reagents\medical.dm"
#include "code\modules\reagents\chemistry_reagents\other.dm"
#include "code\modules\reagents\chemistry_reagents\stims.dm"
#include "code\modules\reagents\chemistry_reagents\toxin.dm"
#include "code\modules\recycling\conveyor2.dm"
#include "code\modules\recycling\disposal-construction.dm"
Expand Down
2 changes: 2 additions & 0 deletions code/__DEFINES/__game.dm
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,8 @@
#define MAP_ICE_COLONY_V3 "Shivas Snowball" //Ice Rework, low pop enabled.
#define MAP_HAUNTED_HOUSE_V2 "Haunted House V2"
#define MAP_RUNTIME "USS Runtime"
#define MAP_LV522_CHANCES_CLAIM "LV-522 Chance's Claim" // Highpop Only
#define MAP_NEW_VARADERO "New Varadero"//ice colony underground but as its own map

#define PLAYERCOUNT_LOWPOP_MAP_LIMIT 130 // number of players before we switch to lowpop maps only (LV, BR, Prison)

Expand Down
2 changes: 0 additions & 2 deletions code/__DEFINES/conflict.dm
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,6 @@
///Can only hit people with criminal status
#define AMMO_MP (1<<21)
#define AMMO_FLAME (1<<22) // Handles sentry flamers glob
/// Can BE people with it
#define AMMO_HIGHIMPACT (1<<23)


//Gun defines for gun related thing. More in the projectile folder.
Expand Down
Loading

0 comments on commit 9a6b8c7

Please sign in to comment.