diff --git a/.dockerignore b/.dockerignore
index 9c6ac6b4aa..a4b8a25cdc 100644
--- a/.dockerignore
+++ b/.dockerignore
@@ -22,7 +22,6 @@ tgstation.int
tgstation.rsc
tgstation.lk
tgstation.dyn.rsc
-libmariadb.dll
-rust_g.dll
-BSQL.dll
+*.dll
Dockerfile
+tools/bootstrap/.cache
diff --git a/.editorconfig b/.editorconfig
index c44572fbf9..d6adf33378 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -4,7 +4,7 @@ indent_size = 4
charset = utf-8
trim_trailing_whitespace = true
insert_final_newline = true
-#end_of_line = lf
+# end_of_line = lf
[*.yml]
indent_style = space
@@ -12,3 +12,9 @@ indent_size = 2
[*.py]
indent_style = space
+
+[*.md]
+trim_trailing_whitespace = false
+
+[Dockerfile]
+indent_style = space
diff --git a/.gitattributes b/.gitattributes
index b23dfe6932..f46a38d1d1 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1,8 +1,7 @@
* text=auto
## Enforce text mode and LF line breaks
-## porter note: not yet LFing dm.
-# *.bat text eol=lf
+*.bat text eol=lf
*.css text eol=lf
# *.dm text eol=lf
# *.dme text eol=lf
@@ -12,15 +11,15 @@
*.js text eol=lf
*.json text eol=lf
*.jsx text eol=lf
-# *.md text eol=lf
+*.md text eol=lf
*.py text eol=lf
*.scss text eol=lf
-# *.sh text eol=lf
-# *.sql text eol=lf
+*.sh text eol=lf
+*.sql text eol=lf
*.svg text eol=lf
*.ts text eol=lf
*.tsx text eol=lf
-# *.txt text eol=lf
+*.txt text eol=lf
*.yaml text eol=lf
*.yml text eol=lf
diff --git a/.github/workflows/ci_suite.yml b/.github/workflows/ci_suite.yml
index 76a1c26656..a6b91bd559 100644
--- a/.github/workflows/ci_suite.yml
+++ b/.github/workflows/ci_suite.yml
@@ -10,7 +10,7 @@ jobs:
run_linters:
if: "!contains(github.event.head_commit.message, '[ci skip]')"
name: Run Linters
- runs-on: ubuntu-latest
+ runs-on: ubuntu-20.04
steps:
- uses: actions/checkout@v2
- name: Setup cache
@@ -21,18 +21,20 @@ jobs:
- name: Install Tools
run: |
pip3 install setuptools
- bash tools/ci/install_build_tools.sh
+ bash tools/ci/install_node.sh
bash tools/ci/install_spaceman_dmm.sh dreamchecker
- pip3 install -r tools/mapmerge2/requirements.txt
+ tools/bootstrap/python -c ''
- name: Run Linters
run: |
bash tools/ci/check_filedirs.sh tgstation.dme
bash tools/ci/check_changelogs.sh
find . -name "*.php" -print0 | xargs -0 -n1 php -l
find . -name "*.json" -not -path "*/node_modules/*" -print0 | xargs -0 python3 ./tools/json_verifier.py
- bash tools/ci/build_tgui.sh
+ tgui/bin/tgui --lint
+ tgui/bin/tgui --test
bash tools/ci/check_grep.sh
- python3 tools/mapmerge2/dmi.py --test
+ tools/bootstrap/python -m dmi.test
+ tools/bootstrap/python -m mapmerge2.dmm_test
~/dreamchecker > ${GITHUB_WORKSPACE}/output-annotations.txt 2>&1
- name: Annotate Lints
uses: yogstation13/DreamAnnotate@v1
@@ -43,7 +45,7 @@ jobs:
compile_all_maps:
if: "!contains(github.event.head_commit.message, '[ci skip]')"
name: Compile Maps
- runs-on: ubuntu-latest
+ runs-on: ubuntu-20.04
steps:
- uses: actions/checkout@v2
- name: Setup cache
@@ -56,11 +58,13 @@ jobs:
bash tools/ci/install_byond.sh
source $HOME/BYOND/byond/bin/byondsetup
python3 tools/ci/template_dm_generator.py
+ tgui/bin/tgui --build
bash tools/ci/dm.sh -DCIBUILDING -DCITESTING -DALL_MAPS tgstation.dme
+
run_all_tests:
if: "!contains(github.event.head_commit.message, '[ci skip]')"
name: Integration Tests
- runs-on: ubuntu-latest
+ runs-on: ubuntu-20.04
services:
mysql:
image: mysql:latest
@@ -87,14 +91,16 @@ jobs:
run: |
sudo dpkg --add-architecture i386
sudo apt update || true
- sudo apt install libssl1.1:i386
+ sudo apt install -o APT::Immediate-Configure=false libssl1.1:i386
bash tools/ci/install_rust_g.sh
- # - name: Compile and run tests
- # run: |
- # bash tools/ci/install_byond.sh
- # source $HOME/BYOND/byond/bin/byondsetup
- # bash tools/ci/dm.sh -DCIBUILDING tgstation.dme
- # bash tools/ci/run_server.sh
+ - name: Compile and run tests
+ run: |
+ bash tools/ci/install_byond.sh
+ source $HOME/BYOND/byond/bin/byondsetup
+ tgui/bin/tgui --build
+ bash tools/ci/dm.sh -DCIBUILDING tgstation.dme
+ # bash tools/ci/run_server.sh
+
test_windows:
if: "!contains(github.event.head_commit.message, '[ci skip]')"
name: Windows Build
diff --git a/.github/workflows/compile_changelogs.yml b/.github/workflows/compile_changelogs.yml
index c8756f0d28..b0e1578815 100644
--- a/.github/workflows/compile_changelogs.yml
+++ b/.github/workflows/compile_changelogs.yml
@@ -7,7 +7,7 @@ on:
jobs:
compile:
name: "Compile changelogs"
- runs-on: ubuntu-latest
+ 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"
id: value_holder
diff --git a/.github/workflows/docker_publish.yml b/.github/workflows/docker_publish.yml
index 7417a382c4..32d160b840 100644
--- a/.github/workflows/docker_publish.yml
+++ b/.github/workflows/docker_publish.yml
@@ -7,7 +7,8 @@ on:
jobs:
publish:
- runs-on: ubuntu-latest
+ if: "!contains(github.event.head_commit.message, '[ci skip]')"
+ runs-on: ubuntu-20.04
steps:
- uses: actions/checkout@v2
diff --git a/.github/workflows/generate_documentation.yml b/.github/workflows/generate_documentation.yml
index d0d61be073..c1b7a2d5e1 100644
--- a/.github/workflows/generate_documentation.yml
+++ b/.github/workflows/generate_documentation.yml
@@ -6,7 +6,7 @@ on:
jobs:
generate_documentation:
if: "!contains(github.event.head_commit.message, '[ci skip]')"
- runs-on: ubuntu-latest
+ runs-on: ubuntu-20.04
steps:
- uses: actions/checkout@v2
- name: Setup cache
diff --git a/.github/workflows/round_id_linker.yml b/.github/workflows/round_id_linker.yml
index 37998a93eb..2b028b0863 100644
--- a/.github/workflows/round_id_linker.yml
+++ b/.github/workflows/round_id_linker.yml
@@ -5,7 +5,7 @@ on:
jobs:
link_rounds:
- runs-on: ubuntu-latest
+ runs-on: ubuntu-20.04
steps:
- uses: Cidatel-Station-13/round_linker@master #notice: fork the round linkies from tg!!
with:
diff --git a/.github/workflows/update_tgs_dmapi.yml b/.github/workflows/update_tgs_dmapi.yml
index c7bb5c970c..19a72d6702 100644
--- a/.github/workflows/update_tgs_dmapi.yml
+++ b/.github/workflows/update_tgs_dmapi.yml
@@ -7,7 +7,7 @@ on:
jobs:
update-dmapi:
- runs-on: ubuntu-latest
+ runs-on: ubuntu-20.04
name: Update the TGS DMAPI
steps:
- name: Clone
diff --git a/.gitignore b/.gitignore
index e885761104..dd20fecd22 100644
--- a/.gitignore
+++ b/.gitignore
@@ -231,3 +231,6 @@ tools/LinuxOneShot/Database
tools/LinuxOneShot/TGS_Config
tools/LinuxOneShot/TGS_Instances
tools/LinuxOneShot/TGS_Logs
+
+# Common build tooling
+!/tools/build
diff --git a/.tgs4.yml b/.tgs4.yml
new file mode 100644
index 0000000000..932a3a6672
--- /dev/null
+++ b/.tgs4.yml
@@ -0,0 +1,8 @@
+static_files:
+ - name: config
+ populate: true
+ - name: data
+linux_scripts:
+ PreCompile.sh: tools/tgs4_scripts/PreCompile.sh
+windows_scripts:
+ PreCompile.bat: tools/tgs4_scripts/PreCompile.bat
diff --git a/.vscode/extensions.json b/.vscode/extensions.json
index bf0d9d2fb9..d384c4535b 100644
--- a/.vscode/extensions.json
+++ b/.vscode/extensions.json
@@ -5,6 +5,7 @@
"EditorConfig.EditorConfig",
"arcanis.vscode-zipfs",
"dbaeumer.vscode-eslint",
- "kevinkyang.auto-comment-blocks"
+ "stylemistake.auto-comment-blocks",
+ "Donkie.vscode-tgstation-test-adapter"
]
}
diff --git a/.vscode/settings.json b/.vscode/settings.json
index f95b8f7cc6..f290e9f369 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -1,8 +1,10 @@
{
- "eslint.nodePath": "tgui/.yarn/sdks",
+ "eslint.nodePath": "./tgui/.yarn/sdks",
"eslint.workingDirectories": [
"./tgui"
],
+ "typescript.tsdk": "./tgui/.yarn/sdks/typescript/lib",
+ "typescript.enablePromptUseWorkspaceTsdk": true,
"search.exclude": {
"tgui/.yarn": true,
"tgui/.pnp.*": true
@@ -14,5 +16,6 @@
}
],
"files.eol": "\n",
- "gitlens.advanced.blame.customArguments": ["-w"]
+ "gitlens.advanced.blame.customArguments": ["-w"],
+ "tgstationTestExplorer.project.resultsType": "json"
}
diff --git a/Build.bat b/Build.bat
new file mode 100644
index 0000000000..dd3a6fd9d9
--- /dev/null
+++ b/Build.bat
@@ -0,0 +1,2 @@
+@call tools\build\build
+@pause
diff --git a/Dockerfile b/Dockerfile
index cca7e43a54..0ae4f82be8 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,62 +1,85 @@
-FROM tgstation/byond:513.1533 as base
+# base = ubuntu + full apt update
+FROM ubuntu:xenial AS base
-FROM base as rust_g
-
-RUN apt-get update \
+RUN dpkg --add-architecture i386 \
+ && apt-get update \
+ && apt-get upgrade -y \
+ && apt-get dist-upgrade -y \
&& apt-get install -y --no-install-recommends \
- git \
- ca-certificates
+ ca-certificates
+# byond = base + byond installed globally
+FROM base AS byond
+WORKDIR /byond
+
+RUN apt-get install -y --no-install-recommends \
+ curl \
+ unzip \
+ make \
+ libstdc++6:i386
+
+COPY dependencies.sh .
+
+RUN . ./dependencies.sh \
+ && curl "http://www.byond.com/download/build/${BYOND_MAJOR}/${BYOND_MAJOR}.${BYOND_MINOR}_byond_linux.zip" -o byond.zip \
+ && unzip byond.zip \
+ && cd byond \
+ && sed -i 's|install:|&\n\tmkdir -p $(MAN_DIR)/man6|' Makefile \
+ && make install \
+ && chmod 644 /usr/local/byond/man/man6/* \
+ && apt-get purge -y --auto-remove curl unzip make \
+ && cd .. \
+ && rm -rf byond byond.zip
+
+# build = byond + tgstation compiled and deployed to /deploy
+FROM byond AS build
+WORKDIR /tgstation
+
+RUN apt-get install -y --no-install-recommends \
+ curl
+
+COPY . .
+
+RUN env TG_BOOTSTRAP_NODE_LINUX=1 tools/build/build \
+ && tools/deploy.sh /deploy
+
+# rust = base + rustc and i686 target
+FROM base AS rust
+RUN apt-get install -y --no-install-recommends \
+ curl && \
+ curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y --profile minimal \
+ && ~/.cargo/bin/rustup target add i686-unknown-linux-gnu
+
+# rust_g = base + rust_g compiled to /rust_g
+FROM rust AS rust_g
WORKDIR /rust_g
RUN apt-get install -y --no-install-recommends \
- libssl-dev \
- pkg-config \
- curl \
- gcc-multilib \
- && curl https://sh.rustup.rs -sSf | sh -s -- -y --default-host i686-unknown-linux-gnu \
+ pkg-config:i386 \
+ libssl-dev:i386 \
+ gcc-multilib \
+ git \
&& git init \
&& git remote add origin https://github.com/tgstation/rust-g
COPY dependencies.sh .
-RUN /bin/bash -c "source dependencies.sh \
- && git fetch --depth 1 origin \$RUST_G_VERSION" \
+RUN . ./dependencies.sh \
+ && git fetch --depth 1 origin "${RUST_G_VERSION}" \
&& git checkout FETCH_HEAD \
- && ~/.cargo/bin/cargo build --release
-
-FROM base as dm_base
+ && env PKG_CONFIG_ALLOW_CROSS=1 ~/.cargo/bin/cargo build --release --target i686-unknown-linux-gnu
+# final = byond + runtime deps + rust_g + build
+FROM byond
WORKDIR /tgstation
-FROM dm_base as build
+RUN apt-get install -y --no-install-recommends \
+ libssl1.0.0:i386 \
+ zlib1g:i386
-COPY . .
-
-RUN DreamMaker -max_errors 0 tgstation.dme \
- && tools/deploy.sh /deploy \
- && rm /deploy/*.dll
-
-FROM dm_base
-
-EXPOSE 1337
-
-RUN apt-get update \
- && apt-get install -y --no-install-recommends software-properties-common \
- && add-apt-repository ppa:ubuntu-toolchain-r/test \
- && apt-get update \
- && apt-get upgrade -y \
- && apt-get dist-upgrade -y \
- && apt-get install -y --no-install-recommends \
- libmariadb2 \
- mariadb-client \
- libssl1.0.0 \
- && rm -rf /var/lib/apt/lists/* \
- && mkdir -p /root/.byond/bin
-
-COPY --from=rust_g /rust_g/target/release/librust_g.so /root/.byond/bin/rust_g
COPY --from=build /deploy ./
+COPY --from=rust_g /rust_g/target/i686-unknown-linux-gnu/release/librust_g.so ./librust_g.so
VOLUME [ "/tgstation/config", "/tgstation/data" ]
-
ENTRYPOINT [ "DreamDaemon", "tgstation.dmb", "-port", "1337", "-trusted", "-close", "-verbose" ]
+EXPOSE 1337
diff --git a/_maps/RandomRuins/SpaceRuins/oldstation.dmm b/_maps/RandomRuins/SpaceRuins/oldstation.dmm
index 8528099d30..43aea1761a 100644
--- a/_maps/RandomRuins/SpaceRuins/oldstation.dmm
+++ b/_maps/RandomRuins/SpaceRuins/oldstation.dmm
@@ -1651,7 +1651,7 @@
/turf/open/floor/plasteel/white,
/area/ruin/space/has_grav/ancientstation/rnd)
"eD" = (
-/obj/machinery/mecha_part_fabricator/offstation,
+/obj/machinery/mecha_part_fabricator,
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/plasteel/white,
/area/ruin/space/has_grav/ancientstation/rnd)
@@ -2010,12 +2010,12 @@
/turf/open/floor/plasteel,
/area/ruin/space/has_grav/ancientstation/deltacorridor)
"fu" = (
-/obj/machinery/rnd/production/protolathe/offstation,
+/obj/machinery/rnd/production/protolathe,
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/plasteel/white,
/area/ruin/space/has_grav/ancientstation/rnd)
"fv" = (
-/obj/machinery/rnd/production/circuit_imprinter/offstation,
+/obj/machinery/rnd/production/circuit_imprinter,
/obj/effect/decal/cleanable/dirt,
/obj/item/reagent_containers/dropper,
/turf/open/floor/plasteel/white,
diff --git a/code/__DEFINES/achievements.dm b/code/__DEFINES/achievements.dm
new file mode 100644
index 0000000000..c39531971c
--- /dev/null
+++ b/code/__DEFINES/achievements.dm
@@ -0,0 +1,108 @@
+// Keep the identifiers here below 32 characters, you can put the full display name in the actual achievement datum
+
+#define ACHIEVEMENT_DEFAULT "default"
+#define ACHIEVEMENT_SCORE "score"
+
+//Misc Medal hub IDs
+#define MEDAL_METEOR "Your Life Before Your Eyes"
+#define MEDAL_PULSE "Jackpot"
+#define MEDAL_TIMEWASTE "Overextended The Joke"
+#define MEDAL_RODSUPLEX "Feat of Strength"
+#define MEDAL_CLOWNCARKING "Round and Full"
+#define MEDAL_THANKSALOT "The Best Driver"
+#define MEDAL_HELBITALJANKEN "Hel-bent on Winning"
+#define MEDAL_MATERIALCRAFT "Getting an Upgrade"
+#define MEDAL_DISKPLEASE "Disk, Please!"
+#define MEDAL_GAMER "I'm Not Important"
+#define MEDAL_VENDORSQUISH "Teenage Anarchist"
+#define MEDAL_SWIRLIE "Bowl-d"
+#define MEDAL_SELFOUCH "Hands???"
+#define MEDAL_SANDMAN "Mister Sandman"
+#define MEDAL_CLEANBOSS "Cleanboss"
+#define MEDAL_RULE8 "Rule 8"
+#define MEDAL_LONGSHIFT "longshift"
+#define MEDAL_SNAIL "KKKiiilll mmmeee"
+#define MEDAL_LOOKOUTSIR "Look Out, Sir!"
+#define MEDAL_GOTTEM "GOTTEM"
+#define MEDAL_ASCENSION "Ascension"
+#define MEDAL_FRENCHING "FrenchingTheBubble"
+#define MEDAL_ASH_ASCENSION "Ash"
+#define MEDAL_FLESH_ASCENSION "Flesh"
+#define MEDAL_RUST_ASCENSION "Rust"
+#define MEDAL_VOID_ASCENSION "Void"
+#define MEDAL_TOOLBOX_SOUL "Toolsoul"
+#define MEDAL_CHEM_TUT "Beginner Chemist"
+
+//Skill medal hub IDs
+#define MEDAL_LEGENDARY_MINER "Legendary Miner"
+
+//Mafia medal hub IDs (wins)
+#define MAFIA_MEDAL_ASSISTANT "Assistant"
+#define MAFIA_MEDAL_DETECTIVE "Detective"
+#define MAFIA_MEDAL_PSYCHOLOGIST "Psychologist"
+#define MAFIA_MEDAL_CHAPLAIN "Chaplain"
+#define MAFIA_MEDAL_MD "Medical Doctor"
+#define MAFIA_MEDAL_OFFICER "Security Officer"
+#define MAFIA_MEDAL_LAWYER "Lawyer"
+#define MAFIA_MEDAL_HOP "Head of Personnel"
+#define MAFIA_MEDAL_HOS "Head of Security"
+#define MAFIA_MEDAL_WARDEN "Warden"
+#define MAFIA_MEDAL_CHANGELING "CHANGELING"
+#define MAFIA_MEDAL_THOUGHTFEEDER "Thoughtfeeder"
+#define MAFIA_MEDAL_TRAITOR "Traitor"
+#define MAFIA_MEDAL_NIGHTMARE "Nightmare"
+#define MAFIA_MEDAL_FUGITIVE "Fugitive"
+#define MAFIA_MEDAL_OBSESSED "Obsessed"
+#define MAFIA_MEDAL_CLOWN "Clown"
+
+//Mafia medal hub IDs (misc stuff)
+#define MAFIA_MEDAL_HATED "Universally Hated"
+#define MAFIA_MEDAL_CHARISMATIC "Charismatic"
+#define MAFIA_MEDAL_VIP "VIP"
+
+//Boss medals
+
+// Medal hub IDs for boss medals (Pre-fixes)
+#define BOSS_MEDAL_ANY "Boss Killer"
+#define BOSS_MEDAL_MINER "Blood-drunk Miner Killer"
+#define BOSS_MEDAL_FROSTMINER "Demonic-frost Miner Killer"
+#define BOSS_MEDAL_BUBBLEGUM "Bubblegum Killer"
+#define BOSS_MEDAL_COLOSSUS "Colossus Killer"
+#define BOSS_MEDAL_DRAKE "Drake Killer"
+#define BOSS_MEDAL_HIEROPHANT "Hierophant Killer"
+#define BOSS_MEDAL_LEGION "Legion Killer"
+#define BOSS_MEDAL_TENDRIL "Tendril Exterminator"
+#define BOSS_MEDAL_SWARMERS "Swarmer Beacon Killer"
+#define BOSS_MEDAL_WENDIGO "Wendigo Killer"
+#define BOSS_MEDAL_KINGGOAT "King Goat Killer"
+
+#define BOSS_MEDAL_MINER_CRUSHER "Blood-drunk Miner Crusher"
+#define BOSS_MEDAL_FROSTMINER_CRUSHER "Demonic-frost Miner Crusher"
+#define BOSS_MEDAL_BUBBLEGUM_CRUSHER "Bubblegum Crusher"
+#define BOSS_MEDAL_COLOSSUS_CRUSHER "Colossus Crusher"
+#define BOSS_MEDAL_DRAKE_CRUSHER "Drake Crusher"
+#define BOSS_MEDAL_HIEROPHANT_CRUSHER "Hierophant Crusher"
+#define BOSS_MEDAL_LEGION_CRUSHER "Legion Crusher"
+#define BOSS_MEDAL_SWARMERS_CRUSHER "Swarmer Beacon Crusher"
+#define BOSS_MEDAL_WENDIGO_CRUSHER "Wendigo Crusher"
+#define BOSS_MEDAL_KINGGOAT_CRUSHER "King Goat Crusher"
+
+// Medal hub IDs for boss-kill scores
+#define BOSS_SCORE "Bosses Killed"
+#define MINER_SCORE "BDMs Killed"
+#define FROST_MINER_SCORE "DFMs Killed"
+#define BUBBLEGUM_SCORE "Bubblegum Killed"
+#define COLOSSUS_SCORE "Colossus Killed"
+#define DRAKE_SCORE "Drakes Killed"
+#define HIEROPHANT_SCORE "Hierophants Killed"
+#define LEGION_SCORE "Legion Killed"
+#define SWARMER_BEACON_SCORE "Swarmer Beacs Killed"
+#define WENDIGO_SCORE "Wendigos Killed"
+#define KINGGOAT_SCORE "King Goat Killed"
+#define TENDRIL_CLEAR_SCORE "Tendrils Killed"
+
+// DB ID for hardcore random mode
+#define HARDCORE_RANDOM_SCORE "Hardcore Random Score"
+
+// DB ID for amount of consumed maintenance pills
+#define MAINTENANCE_PILL_SCORE "Maintenance Pill Score"
diff --git a/code/__DEFINES/cargo.dm b/code/__DEFINES/cargo.dm
index ac5272057a..40a50fe1e6 100644
--- a/code/__DEFINES/cargo.dm
+++ b/code/__DEFINES/cargo.dm
@@ -30,26 +30,36 @@
#define POD_SHAPE_NORML 1
#define POD_SHAPE_OTHER 2
+#define POD_TRANSIT "1"
+#define POD_FALLING "2"
+#define POD_OPENING "3"
+#define POD_LEAVING "4"
+
#define SUPPLYPOD_X_OFFSET -16
+/// The baseline unit for cargo crates. Adjusting this will change the cost of all in-game shuttles, crate export values, bounty rewards, and all supply pack import values, as they use this as their unit of measurement.
+#define CARGO_CRATE_VALUE 200
+
GLOBAL_LIST_EMPTY(supplypod_loading_bays)
GLOBAL_LIST_INIT(podstyles, list(\
- list(POD_SHAPE_NORML, "pod", TRUE, "default", "yellow", RUBBLE_NORMAL, "supply pod", "A Nanotrasen supply drop pod."),\
- list(POD_SHAPE_NORML, "advpod", TRUE, "bluespace", "blue", RUBBLE_NORMAL, "bluespace supply pod" , "A Nanotrasen Bluespace supply pod. Teleports back to CentCom after delivery."),\
- list(POD_SHAPE_NORML, "advpod", TRUE, "centcom", "blue", RUBBLE_NORMAL, "\improper CentCom supply pod", "A Nanotrasen supply pod, this one has been marked with Central Command's designations. Teleports back to CentCom after delivery."),\
- list(POD_SHAPE_NORML, "darkpod", TRUE, "syndicate", "red", RUBBLE_NORMAL, "blood-red supply pod", "An intimidating supply pod, covered in the blood-red markings of the Syndicate. It's probably best to stand back from this."),\
- list(POD_SHAPE_NORML, "darkpod", TRUE, "deathsquad", "blue", RUBBLE_NORMAL, "\improper Deathsquad drop pod", "A Nanotrasen drop pod. This one has been marked the markings of Nanotrasen's elite strike team."),\
- list(POD_SHAPE_NORML, "pod", TRUE, "cultist", "red", RUBBLE_NORMAL, "bloody supply pod", "A Nanotrasen supply pod covered in scratch-marks, blood, and strange runes."),\
- list(POD_SHAPE_OTHER, "missile", FALSE, FALSE, FALSE, RUBBLE_THIN, "cruise missile", "A big ass missile that didn't seem to fully detonate. It was likely launched from some far-off deep space missile silo. There appears to be an auxillery payload hatch on the side, though manually opening it is likely impossible."),\
- list(POD_SHAPE_OTHER, "smissile", FALSE, FALSE, FALSE, RUBBLE_THIN, "\improper Syndicate cruise missile", "A big ass, blood-red missile that didn't seem to fully detonate. It was likely launched from some deep space Syndicate missile silo. There appears to be an auxillery payload hatch on the side, though manually opening it is likely impossible."),\
- list(POD_SHAPE_OTHER, "box", TRUE, FALSE, FALSE, RUBBLE_WIDE, "\improper Aussec supply crate", "An incredibly sturdy supply crate, designed to withstand orbital re-entry. Has 'Aussec Armory - 2532' engraved on the side."),\
- list(POD_SHAPE_NORML, "clownpod", TRUE, "clown", "green", RUBBLE_NORMAL, "\improper HONK pod", "A brightly-colored supply pod. It likely originated from the Clown Federation."),\
- list(POD_SHAPE_OTHER, "orange", TRUE, FALSE, FALSE, RUBBLE_NONE, "\improper Orange", "An angry orange."),\
- list(POD_SHAPE_OTHER, FALSE, FALSE, FALSE, FALSE, RUBBLE_NONE, "\improper S.T.E.A.L.T.H. pod MKVII", "A supply pod that, under normal circumstances, is completely invisible to conventional methods of detection. How are you even seeing this?"),\
- list(POD_SHAPE_OTHER, "gondola", FALSE, FALSE, FALSE, RUBBLE_NONE, "gondola", "The silent walker. This one seems to be part of a delivery agency."),\
- list(POD_SHAPE_OTHER, FALSE, FALSE, FALSE, FALSE, RUBBLE_NONE, FALSE, FALSE, "rl_click", "give_po")\
+ list(POD_SHAPE_NORML, "pod", TRUE, "default", "yellow", RUBBLE_NORMAL, "supply pod", "A Nanotrasen supply drop pod."),\
+ list(POD_SHAPE_NORML, "advpod", TRUE, "bluespace", "blue", RUBBLE_NORMAL, "bluespace supply pod" , "A Nanotrasen Bluespace supply pod. Teleports back to CentCom after delivery."),\
+ list(POD_SHAPE_NORML, "advpod", TRUE, "centcom", "blue", RUBBLE_NORMAL, "\improper CentCom supply pod", "A Nanotrasen supply pod, this one has been marked with Central Command's designations. Teleports back to CentCom after delivery."),\
+ list(POD_SHAPE_NORML, "darkpod", TRUE, "syndicate", "red", RUBBLE_NORMAL, "blood-red supply pod", "An intimidating supply pod, covered in the blood-red markings of the Syndicate. It's probably best to stand back from this."),\
+ list(POD_SHAPE_NORML, "darkpod", TRUE, "deathsquad", "blue", RUBBLE_NORMAL, "\improper Deathsquad drop pod", "A Nanotrasen drop pod. This one has been marked the markings of Nanotrasen's elite strike team."),\
+ list(POD_SHAPE_NORML, "pod", TRUE, "cultist", "red", RUBBLE_NORMAL, "bloody supply pod", "A Nanotrasen supply pod covered in scratch-marks, blood, and strange runes."),\
+ list(POD_SHAPE_OTHER, "missile", FALSE, FALSE, FALSE, RUBBLE_THIN, "cruise missile", "A big ass missile that didn't seem to fully detonate. It was likely launched from some far-off deep space missile silo. There appears to be an auxillery payload hatch on the side, though manually opening it is likely impossible."),\
+ list(POD_SHAPE_OTHER, "smissile", FALSE, FALSE, FALSE, RUBBLE_THIN, "\improper Syndicate cruise missile", "A big ass, blood-red missile that didn't seem to fully detonate. It was likely launched from some deep space Syndicate missile silo. There appears to be an auxillery payload hatch on the side, though manually opening it is likely impossible."),\
+ list(POD_SHAPE_OTHER, "box", TRUE, FALSE, FALSE, RUBBLE_WIDE, "\improper Aussec supply crate", "An incredibly sturdy supply crate, designed to withstand orbital re-entry. Has 'Aussec Armory - 2532' engraved on the side."),\
+ list(POD_SHAPE_NORML, "clownpod", TRUE, "clown", "green", RUBBLE_NORMAL, "\improper HONK pod", "A brightly-colored supply pod. It likely originated from the Clown Federation."),\
+ list(POD_SHAPE_OTHER, "orange", TRUE, FALSE, FALSE, RUBBLE_NONE, "\improper Orange", "An angry orange."),\
+ list(POD_SHAPE_OTHER, FALSE, FALSE, FALSE, FALSE, RUBBLE_NONE, "\improper S.T.E.A.L.T.H. pod MKVII", "A supply pod that, under normal circumstances, is completely invisible to conventional methods of detection. How are you even seeing this?"),\
+ list(POD_SHAPE_OTHER, "gondola", FALSE, FALSE, FALSE, RUBBLE_NONE, "gondola", "The silent walker. This one seems to be part of a delivery agency."),\
+ list(POD_SHAPE_OTHER, FALSE, FALSE, FALSE, FALSE, RUBBLE_NONE, FALSE, FALSE, "rl_click", "give_po")\
))
+
+//cit
#define PACK_GOODY_NONE 0
#define PACK_GOODY_PUBLIC 1 //can be bought by both privates and cargo
#define PACK_GOODY_PRIVATE 2 //can be bought only by privates
diff --git a/code/__DEFINES/colors.dm b/code/__DEFINES/colors.dm
index fb461acfa4..9f45d8da79 100644
--- a/code/__DEFINES/colors.dm
+++ b/code/__DEFINES/colors.dm
@@ -52,3 +52,9 @@
#define COLOR_ASSEMBLY_BLUE "#38559E"
#define COLOR_ASSEMBLY_PURPLE "#6F6192"
#define COLOR_ASSEMBLY_PINK "#ff4adc"
+
+#define COLOR_WHITE "#FFFFFF"
+#define COLOR_VERY_LIGHT_GRAY "#EEEEEE"
+#define COLOR_SILVER "#C0C0C0"
+#define COLOR_GRAY "#808080"
+#define COLOR_HALF_TRANSPARENT_BLACK "#0000007A"
diff --git a/code/__DEFINES/dcs/signals.dm b/code/__DEFINES/dcs/signals.dm
index 42199174e7..c12ec20de2 100644
--- a/code/__DEFINES/dcs/signals.dm
+++ b/code/__DEFINES/dcs/signals.dm
@@ -22,7 +22,7 @@
#define COMPONENT_GLOB_BLOCK_CINEMATIC 1
// signals from globally accessible objects
-/// from SSsun when the sun changes position : (azimuth)
+/// from SSsun when the sun changes position : (primary_sun, suns)
#define COMSIG_SUN_MOVED "sun_moved"
//////////////////////////////////////////////////////////////////
diff --git a/code/__DEFINES/economy.dm b/code/__DEFINES/economy.dm
index 746267c15b..715469ff78 100644
--- a/code/__DEFINES/economy.dm
+++ b/code/__DEFINES/economy.dm
@@ -12,6 +12,9 @@
#define MAX_GRANT_SCI 5000
#define MAX_GRANT_SECMEDSRV 3000
+//What should vending machines charge when you buy something in-department.
+#define VENDING_DISCOUNT 0 // price * discount so 0 = 0
+
#define ACCOUNT_CIV "CIV"
#define ACCOUNT_CIV_NAME "Civil Budget"
#define ACCOUNT_ENG "ENG"
diff --git a/code/__DEFINES/is_helpers.dm b/code/__DEFINES/is_helpers.dm
index 02227dc737..faffea0e6e 100644
--- a/code/__DEFINES/is_helpers.dm
+++ b/code/__DEFINES/is_helpers.dm
@@ -67,17 +67,19 @@ GLOBAL_LIST_INIT(turfs_without_ground, typecacheof(list(
#define isslimeperson(A) (is_species(A, /datum/species/jelly/slime))
#define isluminescent(A) (is_species(A, /datum/species/jelly/luminescent))
#define iszombie(A) (is_species(A, /datum/species/zombie))
+#define isskeleton(A) (is_species(A, /datum/species/skeleton))
+#define ismoth(A) (is_species(A, /datum/species/moth))
#define ishumanbasic(A) (is_species(A, /datum/species/human))
#define iscatperson(A) (ishumanbasic(A) && istype(A.dna.species, /datum/species/human/felinid))
-#define isdwarf(A) (is_species(A, /datum/species/dwarf))
+#define isethereal(A) (is_species(A, /datum/species/ethereal))
+#define isvampire(A) (is_species(A,/datum/species/vampire))
#define isdullahan(A) (is_species(A, /datum/species/dullahan))
+
#define isangel(A) (is_species(A, /datum/species/angel))
-#define isvampire(A) (is_species(A, /datum/species/vampire))
#define ismush(A) (is_species(A, /datum/species/mush))
#define isshadow(A) (is_species(A, /datum/species/shadow))
-#define isskeleton(A) (is_species(A, /datum/species/skeleton))
#define isrobotic(A) (is_species(A, /datum/species/ipc) || is_species(A, /datum/species/synthliz))
-#define isethereal(A) (is_species(A, /datum/species/ethereal))
+#define isdwarf(A) (is_species(A, /datum/species/dwarf))
// Citadel specific species
#define isipcperson(A) (is_species(A, /datum/species/ipc))
@@ -143,6 +145,10 @@ GLOBAL_LIST_INIT(turfs_without_ground, typecacheof(list(
#define ishostile(A) (istype(A, /mob/living/simple_animal/hostile))
+// #define israt(A) (istype(A, /mob/living/simple_animal/hostile/rat))
+
+// #define isregalrat(A) (istype(A, /mob/living/simple_animal/hostile/regalrat))
+
#define isswarmer(A) (istype(A, /mob/living/simple_animal/hostile/swarmer))
#define isguardian(A) (istype(A, /mob/living/simple_animal/hostile/guardian))
@@ -155,6 +161,7 @@ GLOBAL_LIST_INIT(turfs_without_ground, typecacheof(list(
#define isclown(A) (istype(A, /mob/living/simple_animal/hostile/retaliate/clown))
+
//Misc mobs
#define isobserver(A) (istype(A, /mob/dead/observer))
@@ -184,6 +191,8 @@ GLOBAL_LIST_INIT(turfs_without_ground, typecacheof(list(
#define isitem(A) (istype(A, /obj/item))
+#define isstack(A) (istype(A, /obj/item/stack))
+
#define isgrenade(A) (istype(A, /obj/item/grenade))
#define islandmine(A) (istype(A, /obj/effect/mine))
@@ -206,6 +215,8 @@ GLOBAL_LIST_INIT(turfs_without_ground, typecacheof(list(
#define isclothing(A) (istype(A, /obj/item/clothing))
+#define iscash(A) (istype(A, /obj/item/coin) || istype(A, /obj/item/stack/spacecash) || istype(A, /obj/item/holochip))
+
#define isbodypart(A) (istype(A, /obj/item/bodypart))
#define isprojectile(A) (istype(A, /obj/item/projectile))
diff --git a/code/__DEFINES/medal.dm b/code/__DEFINES/medal.dm
deleted file mode 100644
index e723c7504e..0000000000
--- a/code/__DEFINES/medal.dm
+++ /dev/null
@@ -1,29 +0,0 @@
-// Medal names
-#define BOSS_KILL_MEDAL "Killer"
-#define ALL_KILL_MEDAL "Exterminator" //Killing all of x type
-#define BOSS_KILL_MEDAL_CRUSHER "Crusher"
-
-//Defines for boss medals
-#define BOSS_MEDAL_MINER "Blood-drunk Miner"
-#define BOSS_MEDAL_BUBBLEGUM "Bubblegum"
-#define BOSS_MEDAL_COLOSSUS "Colossus"
-#define BOSS_MEDAL_DRAKE "Drake"
-#define BOSS_MEDAL_HIEROPHANT "Hierophant"
-#define BOSS_MEDAL_LEGION "Legion"
-#define BOSS_MEDAL_TENDRIL "Tendril"
-#define BOSS_MEDAL_SWARMERS "Swarmer Beacon"
-
-// Score names
-#define HIEROPHANT_SCORE "Hierophants Killed"
-#define BOSS_SCORE "Bosses Killed"
-#define BUBBLEGUM_SCORE "Bubblegum Killed"
-#define COLOSSUS_SCORE "Colossus Killed"
-#define DRAKE_SCORE "Drakes Killed"
-#define LEGION_SCORE "Legion Killed"
-#define SWARMER_BEACON_SCORE "Swarmer Beacons Killed"
-#define TENDRIL_CLEAR_SCORE "Tendrils Killed"
-
-//Misc medals
-#define MEDAL_METEOR "Your Life Before Your Eyes"
-#define MEDAL_PULSE "Jackpot"
-#define MEDAL_TIMEWASTE "Overextended The Joke"
diff --git a/code/__DEFINES/misc.dm b/code/__DEFINES/misc.dm
index 30162594d6..51d1b618fc 100644
--- a/code/__DEFINES/misc.dm
+++ b/code/__DEFINES/misc.dm
@@ -435,8 +435,13 @@ GLOBAL_LIST_INIT(pda_reskins, list(PDA_SKIN_CLASSIC = 'icons/obj/pda.dmi', PDA_S
//text files
#define BRAIN_DAMAGE_FILE "traumas.json"
#define ION_FILE "ion_laws.json"
-#define REDPILL_FILE "redpill.json"
#define PIRATE_NAMES_FILE "pirates.json"
+#define REDPILL_FILE "redpill.json"
+#define ARCADE_FILE "arcade.json"
+// #define BOOMER_FILE "boomer.json"
+// #define LOCATIONS_FILE "locations.json"
+// #define WANTED_FILE "wanted_message.json"
+// #define VISTA_FILE "steve.json"
#define FLESH_SCAR_FILE "wounds/flesh_scar_desc.json"
#define BONE_SCAR_FILE "wounds/bone_scar_desc.json"
#define SCAR_LOC_FILE "wounds/scar_loc.json"
diff --git a/code/__DEFINES/robots.dm b/code/__DEFINES/robots.dm
index dda9cfd430..b31fa22962 100644
--- a/code/__DEFINES/robots.dm
+++ b/code/__DEFINES/robots.dm
@@ -8,7 +8,7 @@
#define DEFAULT_SCAN_RANGE 7 //default view range for finding targets.
-//Mode defines
+//Mode defines. If you add a new one make sure you update mode_name in /mob/living/simple_animal/bot
#define BOT_IDLE 0 // idle
#define BOT_HUNT 1 // found target, hunting
#define BOT_PREP_ARREST 2 // at target, preparing to arrest
@@ -27,7 +27,8 @@
#define BOT_NAV 15 // computing navigation
#define BOT_WAIT_FOR_NAV 16 // waiting for nav computation
#define BOT_NO_ROUTE 17 // no destination beacon found (or no route)
-#define BOT_TIPPED 18 // someone tipped a medibot over ;_;
+#define BOT_SHOWERSTANCE 18 // cleaning unhygienic humans
+#define BOT_TIPPED 19 // someone tipped a medibot over ;_;
//Bot types
#define SEC_BOT (1<<0) // Secutritrons (Beepsky) and ED-209s
@@ -37,6 +38,7 @@
#define MED_BOT (1<<4) // Medibots
#define HONK_BOT (1<<5) // Honkbots & ED-Honks
#define FIRE_BOT (1<<6) // Firebots
+#define HYGIENE_BOT (1<<7) // Hygienebots
//AI notification defines
#define NEW_BORG 1
@@ -69,8 +71,15 @@
//Checks to determine borg availability depending on the server's config. These are defines in the interest of reducing copypasta
#define BORG_SEC_AVAILABLE (!CONFIG_GET(flag/disable_secborg) && GLOB.security_level >= CONFIG_GET(number/minimum_secborg_alert))
-//silicon_privileges flags
+//silicon_priviledges flags
#define PRIVILEGES_SILICON (1<<0)
#define PRIVILEGES_PAI (1<<1)
#define PRIVILEGES_BOT (1<<2)
#define PRIVILEGES_DRONE (1<<3)
+
+#define BORG_LAMP_CD_RESET -1 //special value to reset cyborg's lamp_cooldown
+
+/// Defines for whether or not module slots are broken.
+#define BORG_MODULE_ALL_DISABLED (1<<0)
+#define BORG_MODULE_TWO_DISABLED (1<<1)
+#define BORG_MODULE_THREE_DISABLED (1<<2)
diff --git a/code/__DEFINES/subsystems.dm b/code/__DEFINES/subsystems.dm
index e84f6eb50b..9c67a6b36c 100644
--- a/code/__DEFINES/subsystems.dm
+++ b/code/__DEFINES/subsystems.dm
@@ -108,7 +108,7 @@
#define INIT_ORDER_SOUNDS 83
#define INIT_ORDER_INSTRUMENTS 82
#define INIT_ORDER_VIS 80
-// #define INIT_ORDER_ACHIEVEMENTS 77
+#define INIT_ORDER_ACHIEVEMENTS 77
#define INIT_ORDER_RESEARCH 75
#define INIT_ORDER_EVENTS 70
#define INIT_ORDER_JOBS 65
diff --git a/code/__DEFINES/vv.dm b/code/__DEFINES/vv.dm
index fe46fdc710..99a2e9d0ab 100644
--- a/code/__DEFINES/vv.dm
+++ b/code/__DEFINES/vv.dm
@@ -90,6 +90,9 @@
#define VV_HK_TRIGGER_EMP "empulse"
#define VV_HK_TRIGGER_EXPLOSION "explode"
#define VV_HK_AUTO_RENAME "auto_rename"
+// #define VV_HK_RADIATE "radiate"
+#define VV_HK_EDIT_FILTERS "edit_filters"
+// #define VV_HK_ADD_AI "add_ai"
// /obj
#define VV_HK_OSAY "osay"
diff --git a/code/__HELPERS/_lists.dm b/code/__HELPERS/_lists.dm
index 04db6cec78..6d41fefb81 100644
--- a/code/__HELPERS/_lists.dm
+++ b/code/__HELPERS/_lists.dm
@@ -617,7 +617,7 @@
used_key_list[input_key] = 1
return input_key
-#if DM_VERSION > 513
+#if DM_VERSION > 514
#error Remie said that lummox was adding a way to get a lists
#error contents via list.values, if that is true remove this
#error otherwise, update the version and bug lummox
diff --git a/code/__HELPERS/filters.dm b/code/__HELPERS/filters.dm
new file mode 100644
index 0000000000..7be7ca5d73
--- /dev/null
+++ b/code/__HELPERS/filters.dm
@@ -0,0 +1,319 @@
+#define ICON_NOT_SET "Not Set"
+
+//This is stored as a nested list instead of datums or whatever because it json encodes nicely for usage in tgui
+GLOBAL_LIST_INIT(master_filter_info, list(
+ "alpha" = list(
+ "defaults" = list(
+ "x" = 0,
+ "y" = 0,
+ "icon" = ICON_NOT_SET,
+ "render_source" = "",
+ "flags" = 0
+ ),
+ "flags" = list(
+ "MASK_INVERSE" = MASK_INVERSE,
+ "MASK_SWAP" = MASK_SWAP
+ )
+ ),
+ "angular_blur" = list(
+ "defaults" = list(
+ "x" = 0,
+ "y" = 0,
+ "size" = 1
+ )
+ ),
+ /* Not supported because making a proper matrix editor on the frontend would be a huge dick pain.
+ Uncomment if you ever implement it
+ "color" = list(
+ "defaults" = list(
+ "color" = matrix(),
+ "space" = FILTER_COLOR_RGB
+ )
+ ),
+ */
+ "displace" = list(
+ "defaults" = list(
+ "x" = 0,
+ "y" = 0,
+ "size" = null,
+ "icon" = ICON_NOT_SET,
+ "render_source" = ""
+ )
+ ),
+ "drop_shadow" = list(
+ "defaults" = list(
+ "x" = 1,
+ "y" = -1,
+ "size" = 1,
+ "offset" = 0,
+ "color" = COLOR_HALF_TRANSPARENT_BLACK
+ )
+ ),
+ "blur" = list(
+ "defaults" = list(
+ "size" = 1
+ )
+ ),
+ "layer" = list(
+ "defaults" = list(
+ "x" = 0,
+ "y" = 0,
+ "icon" = ICON_NOT_SET,
+ "render_source" = "",
+ "flags" = FILTER_OVERLAY,
+ "color" = "",
+ "transform" = null,
+ "blend_mode" = BLEND_DEFAULT
+ )
+ ),
+ "motion_blur" = list(
+ "defaults" = list(
+ "x" = 0,
+ "y" = 0
+ )
+ ),
+ "outline" = list(
+ "defaults" = list(
+ "size" = 0,
+ "color" = COLOR_BLACK,
+ "flags" = NONE
+ ),
+ "flags" = list(
+ "OUTLINE_SHARP" = OUTLINE_SHARP,
+ "OUTLINE_SQUARE" = OUTLINE_SQUARE
+ )
+ ),
+ "radial_blur" = list(
+ "defaults" = list(
+ "x" = 0,
+ "y" = 0,
+ "size" = 0.01
+ )
+ ),
+ "rays" = list(
+ "defaults" = list(
+ "x" = 0,
+ "y" = 0,
+ "size" = 16,
+ "color" = COLOR_WHITE,
+ "offset" = 0,
+ "density" = 10,
+ "threshold" = 0.5,
+ "factor" = 0,
+ "flags" = FILTER_OVERLAY | FILTER_UNDERLAY
+ ),
+ "flags" = list(
+ "FILTER_OVERLAY" = FILTER_OVERLAY,
+ "FILTER_UNDERLAY" = FILTER_UNDERLAY
+ )
+ ),
+ "ripple" = list(
+ "defaults" = list(
+ "x" = 0,
+ "y" = 0,
+ "size" = 1,
+ "repeat" = 2,
+ "radius" = 0,
+ "falloff" = 1,
+ "flags" = NONE
+ ),
+ "flags" = list(
+ "WAVE_BOUNDED" = WAVE_BOUNDED
+ )
+ ),
+ "wave" = list(
+ "defaults" = list(
+ "x" = 0,
+ "y" = 0,
+ "size" = 1,
+ "offset" = 0,
+ "flags" = NONE
+ ),
+ "flags" = list(
+ "WAVE_SIDEWAYS" = WAVE_SIDEWAYS,
+ "WAVE_BOUNDED" = WAVE_BOUNDED
+ )
+ )
+))
+
+#undef ICON_NOT_SET
+
+//Helpers to generate lists for filter helpers
+//This is the only practical way of writing these that actually produces sane lists
+/proc/alpha_mask_filter(x, y, icon/icon, render_source, flags)
+ . = list("type" = "alpha")
+ if(!isnull(x))
+ .["x"] = x
+ if(!isnull(y))
+ .["y"] = y
+ if(!isnull(icon))
+ .["icon"] = icon
+ if(!isnull(render_source))
+ .["render_source"] = render_source
+ if(!isnull(flags))
+ .["flags"] = flags
+
+/proc/angular_blur_filter(x, y, size)
+ . = list("type" = "angular_blur")
+ if(!isnull(x))
+ .["x"] = x
+ if(!isnull(y))
+ .["y"] = y
+ if(!isnull(size))
+ .["size"] = size
+
+/proc/color_matrix_filter(matrix/in_matrix, space)
+ . = list("type" = "color")
+ .["color"] = in_matrix
+ if(!isnull(space))
+ .["space"] = space
+
+/proc/displacement_map_filter(icon, render_source, x, y, size = 32)
+ . = list("type" = "displace")
+ if(!isnull(icon))
+ .["icon"] = icon
+ if(!isnull(render_source))
+ .["render_source"] = render_source
+ if(!isnull(x))
+ .["x"] = x
+ if(!isnull(y))
+ .["y"] = y
+ if(!isnull(size))
+ .["size"] = size
+
+/proc/drop_shadow_filter(x, y, size, offset, color)
+ . = list("type" = "drop_shadow")
+ if(!isnull(x))
+ .["x"] = x
+ if(!isnull(y))
+ .["y"] = y
+ if(!isnull(size))
+ .["size"] = size
+ if(!isnull(offset))
+ .["offset"] = offset
+ if(!isnull(color))
+ .["color"] = color
+
+/proc/gauss_blur_filter(size)
+ . = list("type" = "blur")
+ if(!isnull(size))
+ .["size"] = size
+
+/proc/layering_filter(icon, render_source, x, y, flags, color, transform, blend_mode)
+ . = list("type" = "layer")
+ if(!isnull(icon))
+ .["icon"] = icon
+ if(!isnull(render_source))
+ .["render_source"] = render_source
+ if(!isnull(x))
+ .["x"] = x
+ if(!isnull(y))
+ .["y"] = y
+ if(!isnull(color))
+ .["color"] = color
+ if(!isnull(flags))
+ .["flags"] = flags
+ if(!isnull(transform))
+ .["transform"] = transform
+ if(!isnull(blend_mode))
+ .["blend_mode"] = blend_mode
+
+/proc/motion_blur_filter(x, y)
+ . = list("type" = "motion_blur")
+ if(!isnull(x))
+ .["x"] = x
+ if(!isnull(y))
+ .["y"] = y
+
+/proc/outline_filter(size, color, flags)
+ . = list("type" = "outline")
+ if(!isnull(size))
+ .["size"] = size
+ if(!isnull(color))
+ .["color"] = color
+ if(!isnull(flags))
+ .["flags"] = flags
+
+/proc/radial_blur_filter(size, x, y)
+ . = list("type" = "radial_blur")
+ if(!isnull(size))
+ .["size"] = size
+ if(!isnull(x))
+ .["x"] = x
+ if(!isnull(y))
+ .["y"] = y
+
+/proc/rays_filter(size, color, offset, density, threshold, factor, x, y, flags)
+ . = list("type" = "rays")
+ if(!isnull(size))
+ .["size"] = size
+ if(!isnull(color))
+ .["color"] = color
+ if(!isnull(offset))
+ .["offset"] = offset
+ if(!isnull(density))
+ .["density"] = density
+ if(!isnull(threshold))
+ .["threshold"] = threshold
+ if(!isnull(factor))
+ .["factor"] = factor
+ if(!isnull(x))
+ .["x"] = x
+ if(!isnull(y))
+ .["y"] = y
+ if(!isnull(flags))
+ .["flags"] = flags
+
+/proc/ripple_filter(radius, size, falloff, repeat, x, y, flags)
+ . = list("type" = "ripple")
+ if(!isnull(radius))
+ .["radius"] = radius
+ if(!isnull(size))
+ .["size"] = size
+ if(!isnull(falloff))
+ .["falloff"] = falloff
+ if(!isnull(repeat))
+ .["repeat"] = repeat
+ if(!isnull(flags))
+ .["flags"] = flags
+ if(!isnull(x))
+ .["x"] = x
+ if(!isnull(y))
+ .["y"] = y
+
+/proc/wave_filter(x, y, size, offset, flags)
+ . = list("type" = "wave")
+ if(!isnull(size))
+ .["size"] = size
+ if(!isnull(x))
+ .["x"] = x
+ if(!isnull(y))
+ .["y"] = y
+ if(!isnull(offset))
+ .["offset"] = offset
+ if(!isnull(flags))
+ .["flags"] = flags
+
+/proc/apply_wibbly_filters(atom/in_atom, length)
+ for(var/i in 1 to 7)
+ //This is a very baffling and strange way of doing this but I am just preserving old functionality
+ var/X
+ var/Y
+ var/rsq
+ do
+ X = 60*rand() - 30
+ Y = 60*rand() - 30
+ rsq = X*X + Y*Y
+ while(rsq<100 || rsq>900) // Yeah let's just loop infinitely due to bad luck what's the worst that could happen?
+ var/random_roll = rand()
+ in_atom.add_filter("wibbly-[i]", 5, wave_filter(x = X, y = Y, size = rand() * 2.5 + 0.5, offset = random_roll))
+ var/filter = in_atom.get_filter("wibbly-[i]")
+ animate(filter, offset = random_roll, time = 0, loop = -1, flags = ANIMATION_PARALLEL)
+ animate(offset = random_roll - 1, time = rand() * 20 + 10)
+
+/proc/remove_wibbly_filters(atom/in_atom)
+ var/filter
+ for(var/i in 1 to 7)
+ filter = in_atom.get_filter("wibbly-[i]")
+ animate(filter)
+ in_atom.remove_filter("wibbly-[i]")
diff --git a/code/__HELPERS/roundend.dm b/code/__HELPERS/roundend.dm
index 8e139175dd..5250a3ed88 100644
--- a/code/__HELPERS/roundend.dm
+++ b/code/__HELPERS/roundend.dm
@@ -1,81 +1,102 @@
-#define POPCOUNT_SURVIVORS "survivors" //Not dead at roundend
-#define POPCOUNT_ESCAPEES "escapees" //Not dead and on centcom/shuttles marked as escaped
-#define POPCOUNT_SHUTTLE_ESCAPEES "shuttle_escapees" //Emergency shuttle only.
+#define POPCOUNT_SURVIVORS "survivors" //Not dead at roundend
+#define POPCOUNT_ESCAPEES "escapees" //Not dead and on centcom/shuttles marked as escaped
+#define POPCOUNT_SHUTTLE_ESCAPEES "shuttle_escapees" //Emergency shuttle only.
+#define PERSONAL_LAST_ROUND "personal last round"
+#define SERVER_LAST_ROUND "server last round"
/datum/controller/subsystem/ticker/proc/gather_roundend_feedback()
- var/datum/station_state/end_state = new /datum/station_state()
- end_state.count()
- station_integrity = min(PERCENT(GLOB.start_state.score(end_state)), 100)
gather_antag_data()
record_nuke_disk_location()
var/json_file = file("[GLOB.log_directory]/round_end_data.json")
+ // All but npcs sublists and ghost category contain only mobs with minds
var/list/file_data = list("escapees" = list("humans" = list(), "silicons" = list(), "others" = list(), "npcs" = list()), "abandoned" = list("humans" = list(), "silicons" = list(), "others" = list(), "npcs" = list()), "ghosts" = list(), "additional data" = list())
- var/num_survivors = 0
- var/num_escapees = 0
- var/num_shuttle_escapees = 0
+ var/num_survivors = 0 //Count of non-brain non-camera mobs with mind that are alive
+ var/num_escapees = 0 //Above and on centcom z
+ var/num_shuttle_escapees = 0 //Above and on escape shuttle
var/list/area/shuttle_areas
- if(SSshuttle && SSshuttle.emergency)
+ if(SSshuttle?.emergency)
shuttle_areas = SSshuttle.emergency.shuttle_areas
- for(var/mob/m in GLOB.mob_list)
- var/escaped
- var/category
+
+ for(var/mob/M in GLOB.mob_list)
var/list/mob_data = list()
- if(isnewplayer(m))
+ if(isnewplayer(M))
continue
- if (m.client && m.client.prefs && m.client.prefs.auto_ooc)
- if (!(m.client.prefs.chat_toggles & CHAT_OOC))
- m.client.prefs.chat_toggles ^= CHAT_OOC
- if(m.mind)
- if(m.stat != DEAD && !isbrain(m) && !iscameramob(m))
+ // enable their ooc?
+ if (M.client?.prefs?.auto_ooc)
+ if (!(M.client.prefs.chat_toggles & CHAT_OOC))
+ M.client.prefs.chat_toggles ^= CHAT_OOC
+
+ var/escape_status = "abandoned" //default to abandoned
+ var/category = "npcs" //Default to simple count only bracket
+ var/count_only = TRUE //Count by name only or full info
+
+ mob_data["name"] = M.name
+ if(M.mind)
+ count_only = FALSE
+ mob_data["ckey"] = M.mind.key
+ if(M.stat != DEAD && !isbrain(M) && !iscameramob(M))
num_survivors++
- mob_data += list("name" = m.name, "ckey" = ckey(m.mind.key))
- if(isobserver(m))
- escaped = "ghosts"
- else if(isliving(m))
- var/mob/living/L = m
- mob_data += list("location" = get_area(L), "health" = L.health)
+ if(EMERGENCY_ESCAPED_OR_ENDGAMED && (M.onCentCom() || M.onSyndieBase()))
+ num_escapees++
+ escape_status = "escapees"
+ if(shuttle_areas[get_area(M)])
+ num_shuttle_escapees++
+ if(isliving(M))
+ var/mob/living/L = M
+ mob_data["location"] = get_area(L)
+ mob_data["health"] = L.health
if(ishuman(L))
var/mob/living/carbon/human/H = L
category = "humans"
- mob_data += list("job" = H.mind.assigned_role, "species" = H.dna.species.name)
+ if(H.mind)
+ mob_data["job"] = H.mind.assigned_role
+ else
+ mob_data["job"] = "Unknown"
+ mob_data["species"] = H.dna.species.name
else if(issilicon(L))
category = "silicons"
if(isAI(L))
- mob_data += list("module" = "AI")
- if(isAI(L))
- mob_data += list("module" = "pAI")
- if(iscyborg(L))
+ mob_data["module"] = "AI"
+ else if(ispAI(L))
+ mob_data["module"] = "pAI"
+ else if(iscyborg(L))
var/mob/living/silicon/robot/R = L
- mob_data += list("module" = R.module)
- else
- category = "others"
- mob_data += list("typepath" = m.type)
- if(!escaped)
- if(EMERGENCY_ESCAPED_OR_ENDGAMED && (m.onCentCom() || m.onSyndieBase()))
- escaped = "escapees"
- num_escapees++
- if(shuttle_areas[get_area(m)])
- num_shuttle_escapees++
- else
- escaped = "abandoned"
- if(!m.mind && (!ishuman(m) || !issilicon(m)))
- var/list/npc_nest = file_data["[escaped]"]["npcs"]
- if(npc_nest.Find(initial(m.name)))
- file_data["[escaped]"]["npcs"]["[initial(m.name)]"] += 1
- else
- file_data["[escaped]"]["npcs"]["[initial(m.name)]"] = 1
- else
- if(isobserver(m))
- var/pos = length(file_data["[escaped]"]) + 1
- file_data["[escaped]"]["[pos]"] = mob_data
- else
- if(!category)
+ mob_data["module"] = R.module.name
+ else
category = "others"
- mob_data += list("name" = m.name, "typepath" = m.type)
- var/pos = length(file_data["[escaped]"]["[category]"]) + 1
- file_data["[escaped]"]["[category]"]["[pos]"] = mob_data
+ mob_data["typepath"] = M.type
+ //Ghosts don't care about minds, but we want to retain ckey data etc
+ if(isobserver(M))
+ count_only = FALSE
+ escape_status = "ghosts"
+ if(!M.mind)
+ mob_data["ckey"] = M.key
+ category = null //ghosts are one list deep
+ //All other mindless stuff just gets counts by name
+ if(count_only)
+ var/list/npc_nest = file_data["[escape_status]"]["npcs"]
+ var/name_to_use = initial(M.name)
+ if(ishuman(M))
+ name_to_use = "Unknown Human" //Monkeymen and other mindless corpses
+ if(npc_nest.Find(name_to_use))
+ file_data["[escape_status]"]["npcs"][name_to_use] += 1
+ else
+ file_data["[escape_status]"]["npcs"][name_to_use] = 1
+ else
+ //Mobs with minds and ghosts get detailed data
+ if(category)
+ var/pos = length(file_data["[escape_status]"]["[category]"]) + 1
+ file_data["[escape_status]"]["[category]"]["[pos]"] = mob_data
+ else
+ var/pos = length(file_data["[escape_status]"]) + 1
+ file_data["[escape_status]"]["[pos]"] = mob_data
+
+ var/datum/station_state/end_state = new /datum/station_state()
+ end_state.count()
+ station_integrity = min(PERCENT(GLOB.start_state.score(end_state)), 100)
file_data["additional data"]["station integrity"] = station_integrity
WRITE_FILE(json_file, json_encode(file_data))
+
SSblackbox.record_feedback("nested tally", "round_end_stats", num_survivors, list("survivors", "total"))
SSblackbox.record_feedback("nested tally", "round_end_stats", num_escapees, list("escapees", "total"))
SSblackbox.record_feedback("nested tally", "round_end_stats", GLOB.joined_player_list.len, list("players", "total"))
@@ -169,10 +190,34 @@
file_data["wanted"] = list("author" = "[GLOB.news_network.wanted_issue.scannedUser]", "criminal" = "[GLOB.news_network.wanted_issue.criminal]", "description" = "[GLOB.news_network.wanted_issue.body]", "photo file" = "[GLOB.news_network.wanted_issue.photo_file]")
WRITE_FILE(json_file, json_encode(file_data))
+///Handles random hardcore point rewarding if it applies.
+/datum/controller/subsystem/ticker/proc/HandleRandomHardcoreScore(client/player_client)
+ if(!ishuman(player_client.mob))
+ return FALSE
+ var/mob/living/carbon/human/human_mob = player_client.mob
+ if(!human_mob.hardcore_survival_score) ///no score no glory
+ return FALSE
+
+ if(human_mob.mind && (human_mob.mind.special_role || length(human_mob.mind.antag_datums) > 0))
+ var/didthegamerwin = TRUE
+ for(var/a in human_mob.mind.antag_datums)
+ var/datum/antagonist/antag_datum = a
+ for(var/i in antag_datum.objectives)
+ var/datum/objective/objective_datum = i
+ if(!objective_datum.check_completion())
+ didthegamerwin = FALSE
+ if(!didthegamerwin)
+ return FALSE
+ player_client.give_award(/datum/award/score/hardcore_random, human_mob, round(human_mob.hardcore_survival_score))
+ else if(human_mob.onCentCom())
+ player_client.give_award(/datum/award/score/hardcore_random, human_mob, round(human_mob.hardcore_survival_score))
+
+
/datum/controller/subsystem/ticker/proc/declare_completion()
set waitfor = FALSE
to_chat(world, "
The round has ended.")
+ log_game("The round has ended.")
if(LAZYLEN(GLOB.round_end_notifiees))
world.TgsTargetedChatBroadcast("[GLOB.round_end_notifiees.Join(", ")] the round has ended.", FALSE)
@@ -186,6 +231,19 @@
C.RollCredits()
C.playtitlemusic(40)
CONFIG_SET(flag/suicide_allowed,TRUE) // EORG suicides allowed
+
+ var/speed_round = FALSE
+ if(world.time - SSticker.round_start_time <= 300 SECONDS)
+ speed_round = TRUE
+
+ for(var/client/C in GLOB.clients)
+ if(!C.credits)
+ C.RollCredits()
+ C.playtitlemusic(40)
+ if(speed_round)
+ C.give_award(/datum/award/achievement/misc/speed_round, C.mob)
+ HandleRandomHardcoreScore(C)
+
var/popcount = gather_roundend_feedback()
display_report(popcount)
@@ -215,6 +273,11 @@
CHECK_TICK
+ // handle_hearts()
+ set_observer_default_invisibility(0, "The round is over! You are now visible to the living.")
+
+ CHECK_TICK
+
//These need update to actually reflect the real antagonists
//Print a list of antagonists to the server log
var/list/total_antagonists = list()
@@ -233,18 +296,13 @@
for(var/antag_name in total_antagonists)
var/list/L = total_antagonists[antag_name]
log_game("[antag_name]s :[L.Join(", ")].")
- set_observer_default_invisibility(0, "The round is over! You are now visible to the living.")
CHECK_TICK
SSdbcore.SetRoundEnd()
//Collects persistence features
- if(mode.station_was_nuked)
- SSpersistence.station_was_destroyed = TRUE
- if(!mode.allow_persistence_save)
- SSpersistence.station_persistence_save_disabled = TRUE
- else
+ if(mode.allow_persistence_save)
SSpersistence.SaveTCGCards()
- SSpersistence.CollectData()
+ SSpersistence.CollectData()
//stop collecting feedback during grifftime
SSblackbox.Seal()
@@ -279,11 +337,15 @@
//Antagonists
parts += antag_report()
+ parts += hardcore_random_report()
+
CHECK_TICK
//Medals
parts += medal_report()
//Station Goals
parts += goal_report()
+ //Economy & Money
+ parts += market_report()
listclearnulls(parts)
@@ -326,9 +388,9 @@
parts += "[FOURSPACES]Nobody died this shift!"
if(istype(SSticker.mode, /datum/game_mode/dynamic))
var/datum/game_mode/dynamic/mode = SSticker.mode
- mode.update_playercounts()
- parts += "[FOURSPACES]Final threat level: [mode.threat_level]"
- parts += "[FOURSPACES]Final threat: [mode.threat]"
+ mode.update_playercounts() // ?
+ parts += "[FOURSPACES]Threat level: [mode.threat_level]"
+ parts += "[FOURSPACES]Threat left: [mode.threat]"
parts += "[FOURSPACES]Average threat: [mode.threat_average]"
parts += "[FOURSPACES]Executed rules:"
for(var/datum/dynamic_ruleset/rule in mode.executed_rules)
@@ -345,20 +407,47 @@
/client/proc/roundend_report_file()
return "data/roundend_reports/[ckey].html"
-/datum/controller/subsystem/ticker/proc/show_roundend_report(client/C, previous = FALSE)
+/**
+ * Log the round-end report as an HTML file
+ *
+ * Composits the roundend report, and saves it in two locations.
+ * The report is first saved along with the round's logs
+ * Then, the report is copied to a fixed directory specifically for
+ * housing the server's last roundend report. In this location,
+ * the file will be overwritten at the end of each shift.
+ */
+/datum/controller/subsystem/ticker/proc/log_roundend_report()
+ var/roundend_file = file("[GLOB.log_directory]/round_end_data.html")
+ var/list/parts = list()
+ parts += ""
+ parts += GLOB.survivor_report
+ parts += "
"
+ parts += GLOB.common_report
+ var/content = parts.Join()
+ //Log the rendered HTML in the round log directory
+ fdel(roundend_file)
+ WRITE_FILE(roundend_file, content)
+ //Place a copy in the root folder, to be overwritten each round.
+ roundend_file = file("data/server_last_roundend_report.html")
+ fdel(roundend_file)
+ WRITE_FILE(roundend_file, content)
+
+/datum/controller/subsystem/ticker/proc/show_roundend_report(client/C, report_type = null)
var/datum/browser/roundend_report = new(C, "roundend")
roundend_report.width = 800
roundend_report.height = 600
var/content
var/filename = C.roundend_report_file()
- if(!previous)
+ if(report_type == PERSONAL_LAST_ROUND) //Look at this player's last round
+ content = file2text(filename)
+ else if (report_type == SERVER_LAST_ROUND) //Look at the last round that this server has seen
+ content = file2text("data/server_last_roundend_report.html")
+ else //report_type is null, so make a new report based on the current round and show that to the player
var/list/report_parts = list(personal_report(C), GLOB.common_report)
content = report_parts.Join()
- remove_verb(C, /client/proc/show_previous_roundend_report)
fdel(filename)
text2file(content, filename)
- else
- content = file2text(filename)
+
roundend_report.set_content(content)
roundend_report.stylesheets = list()
roundend_report.add_stylesheet("roundend", 'html/browser/roundend.css')
@@ -395,8 +484,9 @@
/datum/controller/subsystem/ticker/proc/display_report(popcount)
GLOB.common_report = build_roundend_report()
GLOB.survivor_report = survivor_report(popcount)
+ log_roundend_report()
for(var/client/C in GLOB.clients)
- show_roundend_report(C, FALSE)
+ show_roundend_report(C)
give_show_report_button(C)
CHECK_TICK
@@ -414,12 +504,11 @@
if (aiPlayer.connected_robots.len)
var/borg_num = aiPlayer.connected_robots.len
- var/robolist = "
[aiPlayer.real_name]'s minions were: "
+ parts += "
[aiPlayer.real_name]'s minions were:"
for(var/mob/living/silicon/robot/robo in aiPlayer.connected_robots)
borg_num--
if(robo.mind)
- robolist += "[robo.name][robo.mind.hide_ckey ? "" : " (Played by: [robo.mind.key])"] [robo.stat == DEAD ? " (Deactivated)" : ""][borg_num ?", ":""]
"
- parts += "[robolist]"
+ parts += "[robo.name][robo.mind.hide_ckey ? "" : " (Played by: [robo.mind.key])"] [robo.stat == DEAD ? " (Deactivated)" : ""][borg_num ?", ":""]"
if(!borg_spacer)
borg_spacer = TRUE
@@ -446,6 +535,34 @@
parts += G.get_result()
return ""
+///Generate a report for how much money is on station, as well as the richest crewmember on the station.
+/datum/controller/subsystem/ticker/proc/market_report()
+ var/list/parts = list()
+ parts += ""
+ ///This is the richest account on station at roundend.
+ var/datum/bank_account/mr_moneybags
+ ///This is the station's total wealth at the end of the round.
+ var/station_vault = 0
+ ///How many players joined the round.
+ var/total_players = GLOB.joined_player_list.len
+ var/list/typecache_bank = typecacheof(list(/datum/bank_account/department, /datum/bank_account/remote))
+ for(var/i in SSeconomy.generated_accounts)
+ var/datum/bank_account/current_acc = SSeconomy.generated_accounts[i]
+ if(typecache_bank[current_acc.type])
+ continue
+ station_vault += current_acc.account_balance
+ if(!mr_moneybags || mr_moneybags.account_balance < current_acc.account_balance)
+ mr_moneybags = current_acc
+ parts += "There were [station_vault] credits collected by crew this shift.
"
+ if(total_players > 0)
+ parts += "An average of [station_vault/total_players] credits were collected.
"
+ // log_econ("Roundend credit total: [station_vault] credits. Average Credits: [station_vault/total_players]")
+ if(mr_moneybags)
+ parts += "The most affluent crew member at shift end was [mr_moneybags.account_holder] with [mr_moneybags.account_balance] cr!
"
+ else
+ parts += "Somehow, nobody made any money this shift! This'll result in some budget cuts..."
+ return parts
+
/datum/controller/subsystem/ticker/proc/medal_report()
if(GLOB.commendations.len)
var/list/parts = list()
@@ -455,16 +572,40 @@
return "[parts.Join("
")]
"
return ""
+///Generate a report for all players who made it out alive with a hardcore random character and prints their final score
+/datum/controller/subsystem/ticker/proc/hardcore_random_report()
+ . = list()
+ var/list/hardcores = list()
+ for(var/i in GLOB.player_list)
+ if(!ishuman(i))
+ continue
+ var/mob/living/carbon/human/human_player = i
+ if(!human_player.hardcore_survival_score || !human_player.onCentCom() || human_player.stat == DEAD) ///gotta escape nerd
+ continue
+ if(!human_player.mind)
+ continue
+ hardcores += human_player
+ if(!length(hardcores))
+ return
+ . += ""
+ . += "
"
+ for(var/mob/living/carbon/human/human_player in hardcores)
+ . += "- [printplayer(human_player.mind)] with a hardcore random score of [round(human_player.hardcore_survival_score)]
"
+ . += "
Winners don't use space drugs"
+ ///the list of passive skill the enemy currently has. the actual passives are added in the enemy_setup() proc
+ var/list/enemy_passive
+ ///if all the enemy's weakpoints have been triggered becomes TRUE
+ var/finishing_move = FALSE
+ ///linked to passives, when it's equal or above the max_passive finishing move will become TRUE
+ var/pissed_off = 0
+ ///the number of passives the enemy will start with
+ var/max_passive = 3
+ ///weapon wielded by the enemy, the shotgun doesn't count.
+ var/chosen_weapon
+
+ ///Player health
+ var/player_hp = 85
+ ///player magic points
+ var/player_mp = 20
+ ///used to remember the last three move of the player before this turn.
+ var/list/last_three_move
+ ///if the enemy or player died. restart the game when TRUE
+ var/gameover = FALSE
+ ///the player cannot make any move while this is set to TRUE. should only TRUE during enemy turns.
+ var/blocked = FALSE
+ ///used to clear the enemy_action proc timer when the game is restarted
+ var/timer_id
+ ///weapon used by the enemy, pure fluff.for certain actions
+ var/list/weapons
+ ///unique to the emag mode, acts as a time limit where the player dies when it reaches 0.
+ var/bomb_cooldown = 19
+
+///creates the enemy base stats for a new round along with the enemy passives
+/obj/machinery/computer/arcade/battle/proc/enemy_setup(player_skill)
+ player_hp = 85
+ player_mp = 20
+ enemy_hp = 100
+ enemy_mp = 40
+ gameover = FALSE
+ blocked = FALSE
+ finishing_move = FALSE
+ pissed_off = 0
+ last_three_move = null
+
+ enemy_passive = list("short_temper" = TRUE, "poisonous" = TRUE, "smart" = TRUE, "shotgun" = TRUE, "magical" = TRUE, "chonker" = TRUE)
+ for(var/i = LAZYLEN(enemy_passive); i > max_passive; i--) //we'll remove passives from the list until we have the number of passive we want
+ var/picked_passive = pick(enemy_passive)
+ LAZYREMOVE(enemy_passive, picked_passive)
+
+ if(LAZYACCESS(enemy_passive, "chonker"))
+ enemy_hp += 20
+
+ if(LAZYACCESS(enemy_passive, "shotgun"))
+ chosen_weapon = "shotgun"
+ else if(weapons)
+ chosen_weapon = pick(weapons)
+ else
+ chosen_weapon = "null gun" //if the weapons list is somehow empty, shouldn't happen but runtimes are sneaky bastards.
+
+ if(player_skill)
+ player_hp += player_skill * 2
/obj/machinery/computer/arcade/battle/Reset()
+ max_passive = 3
var/name_action
var/name_part1
var/name_part2
- name_action = pick("Defeat ", "Annihilate ", "Save ", "Strike ", "Stop ", "Destroy ", "Robust ", "Romance ", "Pwn ", "Own ", "Ban ")
+ if(SSevents.holidays && SSevents.holidays[HALLOWEEN])
+ name_action = pick_list(ARCADE_FILE, "rpg_action_halloween")
+ name_part1 = pick_list(ARCADE_FILE, "rpg_adjective_halloween")
+ name_part2 = pick_list(ARCADE_FILE, "rpg_enemy_halloween")
+ weapons = strings(ARCADE_FILE, "rpg_weapon_halloween")
+ else if(SSevents.holidays && SSevents.holidays[CHRISTMAS])
+ name_action = pick_list(ARCADE_FILE, "rpg_action_xmas")
+ name_part1 = pick_list(ARCADE_FILE, "rpg_adjective_xmas")
+ name_part2 = pick_list(ARCADE_FILE, "rpg_enemy_xmas")
+ weapons = strings(ARCADE_FILE, "rpg_weapon_xmas")
+ else if(SSevents.holidays && SSevents.holidays[VALENTINES])
+ name_action = pick_list(ARCADE_FILE, "rpg_action_valentines")
+ name_part1 = pick_list(ARCADE_FILE, "rpg_adjective_valentines")
+ name_part2 = pick_list(ARCADE_FILE, "rpg_enemy_valentines")
+ weapons = strings(ARCADE_FILE, "rpg_weapon_valentines")
+ else
+ name_action = pick_list(ARCADE_FILE, "rpg_action")
+ name_part1 = pick_list(ARCADE_FILE, "rpg_adjective")
+ name_part2 = pick_list(ARCADE_FILE, "rpg_enemy")
+ weapons = strings(ARCADE_FILE, "rpg_weapon")
- name_part1 = pick("the Automatic ", "Farmer ", "Lord ", "Professor ", "the Cuban ", "the Evil ", "the Dread King ", "the Space ", "Lord ", "the Great ", "Duke ", "General ")
- name_part2 = pick("Melonoid", "Murdertron", "Sorcerer", "Ruin", "Jeff", "Ectoplasm", "Crushulon", "Uhangoid", "Vhakoid", "Peteoid", "slime", "Griefer", "ERPer", "Lizard Man", "Unicorn", "Bloopers")
+ enemy_name = ("The " + name_part1 + " " + name_part2)
+ name = (name_action + " " + enemy_name)
- enemy_name = replacetext((name_part1 + name_part2), "the ", "")
- name = (name_action + name_part1 + name_part2)
+ enemy_setup(0) //in the case it's reset we assume the player skill is 0 because the VOID isn't a gamer
/obj/machinery/computer/arcade/battle/ui_interact(mob/user)
. = ..()
+ screen_setup(user)
+
+///sets up the main screen for the user
+/obj/machinery/computer/arcade/battle/proc/screen_setup(mob/user)
var/dat = "Close"
dat += "[enemy_name]
"
- dat += "
[temp]
"
+ dat += "[temp]"
dat += "
Health: [player_hp] | Magic: [player_mp] | Enemy Health: [enemy_hp]"
if (gameover)
dat += "New Game"
else
- dat += "Attack | "
- dat += "Heal | "
- dat += "Recharge Power"
+ dat += "Light attack"
+ dat += "Defend"
+ dat += "Counter attack"
+ dat += "Power attack"
dat += ""
- var/datum/browser/popup = new(user, "arcade", "Space Villain 2000")
- popup.set_content(dat)
- popup.open()
+ if(user.client) //mainly here to avoid a runtime when the player gets gibbed when losing the emag mode.
+ var/datum/browser/popup = new(user, "arcade", "Space Villain 2000")
+ popup.set_content(dat)
+ popup.open()
/obj/machinery/computer/arcade/battle/Topic(href, href_list)
if(..())
return
+ var/gamerSkill = 0
+ // if(usr?.mind)
+ // gamerSkill = usr.mind.get_skill_level(/datum/skill/gaming)
if (!blocked && !gameover)
+ var/attackamt = rand(5,7) + rand(0, gamerSkill)
+
+ if(finishing_move) //time to bonk that fucker,cuban pete will sometime survive a finishing move.
+ attackamt *= 100
+
+ //light attack suck absolute ass but it doesn't cost any MP so it's pretty good to finish an enemy off
if (href_list["attack"])
- blocked = TRUE
- var/attackamt = rand(2,6)
- temp = "You attack for [attackamt] damage!"
- playsound(loc, 'sound/arcade/hit.ogg', 50, TRUE, extrarange = -3)
- updateUsrDialog()
- if(turtle > 0)
- turtle--
-
- sleep(turn_speed)
+ temp = "
you do quick jab for [attackamt] of damage!
"
enemy_hp -= attackamt
- arcade_action(usr)
+ arcade_action(usr,"attack",attackamt)
- else if (href_list["heal"])
- blocked = TRUE
- var/pointamt = rand(1,3)
- var/healamt = rand(6,8)
- temp = "You use [pointamt] magic to heal for [healamt] damage!"
- playsound(loc, 'sound/arcade/heal.ogg', 50, TRUE, extrarange = -3)
- updateUsrDialog()
- turtle++
+ //defend lets you gain back MP and take less damage from non magical attack.
+ else if(href_list["defend"])
+ temp = "
you take a defensive stance and gain back 10 mp!
"
+ player_mp += 10
+ arcade_action(usr,"defend",attackamt)
+ playsound(src, 'sound/arcade/mana.ogg', 50, TRUE, extrarange = -3)
- sleep(turn_speed)
- player_mp -= pointamt
- player_hp += healamt
- blocked = TRUE
- updateUsrDialog()
- arcade_action(usr)
+ //mainly used to counter short temper and their absurd damage, will deal twice the damage the player took of a non magical attack.
+ else if(href_list["counter_attack"] && player_mp >= 10)
+ temp = "
you prepare yourself to counter the next attack!
"
+ player_mp -= 10
+ arcade_action(usr,"counter_attack",attackamt)
+ playsound(src, 'sound/arcade/mana.ogg', 50, TRUE, extrarange = -3)
- else if (href_list["charge"])
- blocked = TRUE
- var/chargeamt = rand(4,7)
- temp = "You regain [chargeamt] points"
- playsound(loc, 'sound/arcade/mana.ogg', 50, TRUE, extrarange = -3)
- player_mp += chargeamt
- if(turtle > 0)
- turtle--
+ else if(href_list["counter_attack"] && player_mp < 10)
+ temp = "
you don't have the mp necessary to counter attack and defend yourself instead
"
+ player_mp += 10
+ arcade_action(usr,"defend",attackamt)
+ playsound(src, 'sound/arcade/mana.ogg', 50, TRUE, extrarange = -3)
- updateUsrDialog()
- sleep(turn_speed)
- arcade_action(usr)
+ //power attack deals twice the amount of damage but is really expensive MP wise, mainly used with combos to get weakpoints.
+ else if (href_list["power_attack"] && player_mp >= 20)
+ temp = "
You attack [enemy_name] with all your might for [attackamt * 2] damage!
"
+ enemy_hp -= attackamt * 2
+ player_mp -= 20
+ arcade_action(usr,"power_attack",attackamt)
+
+ else if(href_list["power_attack"] && player_mp < 20)
+ temp = "
You don't have the mp necessary for a power attack and settle for a light attack!
"
+ enemy_hp -= attackamt
+ arcade_action(usr,"attack",attackamt)
if (href_list["close"])
usr.unset_machine()
usr << browse(null, "window=arcade")
else if (href_list["newgame"]) //Reset everything
- temp = "New Round"
- player_hp = initial(player_hp)
- player_mp = initial(player_mp)
- enemy_hp = initial(enemy_hp)
- enemy_mp = initial(enemy_mp)
- gameover = FALSE
- turtle = 0
+ temp = "
New Round"
if(obj_flags & EMAGGED)
Reset()
obj_flags &= ~EMAGGED
+ enemy_setup(gamerSkill)
+ screen_setup(usr)
+
+
add_fingerprint(usr)
updateUsrDialog()
return
-/obj/machinery/computer/arcade/battle/proc/arcade_action(mob/user)
- if ((enemy_mp <= 0) || (enemy_hp <= 0))
+///happens after a player action and before the enemy turn. the enemy turn will be cancelled if there's a gameover.
+/obj/machinery/computer/arcade/battle/proc/arcade_action(mob/user,player_stance,attackamt)
+ screen_setup(user)
+ blocked = TRUE
+ if(player_stance == "attack" || player_stance == "power_attack")
+ if(attackamt > 40)
+ playsound(src, 'sound/arcade/boom.ogg', 50, TRUE, extrarange = -3)
+ else
+ playsound(src, 'sound/arcade/hit.ogg', 50, TRUE, extrarange = -3)
+
+ timer_id = addtimer(CALLBACK(src, .proc/enemy_action,player_stance,user),1 SECONDS,TIMER_STOPPABLE)
+ gameover_check(user)
+
+///the enemy turn, the enemy's action entirely depend on their current passive and a teensy tiny bit of randomness
+/obj/machinery/computer/arcade/battle/proc/enemy_action(player_stance,mob/user)
+ var/list/list_temp = list()
+
+ switch(LAZYLEN(last_three_move)) //we keep the last three action of the player in a list here
+ if(0 to 2)
+ LAZYADD(last_three_move, player_stance)
+ if(3)
+ for(var/i in 1 to 2)
+ last_three_move[i] = last_three_move[i + 1]
+ last_three_move[3] = player_stance
+
+ if(4 to INFINITY)
+ last_three_move = null //this shouldn't even happen but we empty the list if it somehow goes above 3
+
+ var/enemy_stance
+ var/attack_amount = rand(8,10) //making the attack amount not vary too much so that it's easier to see if the enemy has a shotgun
+
+ if(player_stance == "defend")
+ attack_amount -= 5
+
+ //if emagged, cuban pete will set up a bomb acting up as a timer. when it reaches 0 the player fucking dies
+ if(obj_flags & EMAGGED)
+ switch(bomb_cooldown--)
+ if(18)
+ list_temp += "
[enemy_name] takes two valve tank and links them together, what's he planning?"
+ if(15)
+ list_temp += "
[enemy_name] adds a remote control to the tan- ho god is that a bomb?"
+ if(12)
+ list_temp += "
[enemy_name] throws the bomb next to you, you'r too scared to pick it up. "
+ if(6)
+ list_temp += "
[enemy_name]'s hand brushes the remote linked to the bomb, your heart skipped a beat. "
+ if(2)
+ list_temp += "
[enemy_name] is going to press the button! It's now or never! "
+ if(0)
+ player_hp -= attack_amount * 1000 //hey it's a maxcap we might as well go all in
+
+ //yeah I used the shotgun as a passive, you know why? because the shotgun gives +5 attack which is pretty good
+ if(LAZYACCESS(enemy_passive, "shotgun"))
+ if(weakpoint_check("shotgun","defend","defend","power_attack"))
+ list_temp += "
You manage to disarm [enemy_name] with a surprise power attack and shoot him with his shotgun until it runs out of ammo! "
+ enemy_hp -= 10
+ chosen_weapon = "empty shotgun"
+ else
+ attack_amount += 5
+
+ //heccing chonker passive, only gives more HP at the start of a new game but has one of the hardest weakpoint to trigger.
+ if(LAZYACCESS(enemy_passive, "chonker"))
+ if(weakpoint_check("chonker","power_attack","power_attack","power_attack"))
+ list_temp += "
After a lot of power attacks you manage to tip over [enemy_name] as they fall over their enormous weight "
+ enemy_hp -= 30
+
+ //smart passive trait, mainly works in tandem with other traits, makes the enemy unable to be counter_attacked
+ if(LAZYACCESS(enemy_passive, "smart"))
+ if(weakpoint_check("smart","defend","defend","attack"))
+ list_temp += "
[enemy_name] is confused by your illogical strategy! "
+ attack_amount -= 5
+
+ else if(attack_amount >= player_hp)
+ player_hp -= attack_amount
+ list_temp += "
[enemy_name] figures out you are really close to death and finishes you off with their [chosen_weapon]!"
+ enemy_stance = "attack"
+
+ else if(player_stance == "counter_attack")
+ list_temp += "
[enemy_name] is not taking your bait. "
+ if(LAZYACCESS(enemy_passive, "short_temper"))
+ list_temp += "However controlling their hatred of you still takes a toll on their mental and physical health!"
+ enemy_hp -= 5
+ enemy_mp -= 5
+ enemy_stance = "defensive"
+
+ //short temper passive trait, gets easily baited into being counter attacked but will bypass your counter when low on HP
+ if(LAZYACCESS(enemy_passive, "short_temper"))
+ if(weakpoint_check("short_temper","counter_attack","counter_attack","counter_attack"))
+ list_temp += "
[enemy_name] is getting frustrated at all your counter attacks and throws a tantrum!"
+ enemy_hp -= attack_amount
+
+ else if(player_stance == "counter_attack")
+ if(!(LAZYACCESS(enemy_passive, "smart")) && enemy_hp > 30)
+ list_temp += "
[enemy_name] took the bait and allowed you to counter attack for [attack_amount * 2] damage!"
+ player_hp -= attack_amount
+ enemy_hp -= attack_amount * 2
+ enemy_stance = "attack"
+
+ else if(enemy_hp <= 30) //will break through the counter when low enough on HP even when smart.
+ list_temp += "
[enemy_name] is getting tired of your tricks and breaks through your counter with their [chosen_weapon]!"
+ player_hp -= attack_amount
+ enemy_stance = "attack"
+
+ else if(!enemy_stance)
+ var/added_temp
+
+ if(rand())
+ added_temp = "you for [attack_amount + 5] damage!"
+ player_hp -= attack_amount + 5
+ enemy_stance = "attack"
+ else
+ added_temp = "the wall, breaking their skull in the process and losing [attack_amount] hp!" //[enemy_name] you have a literal dent in your skull
+ enemy_hp -= attack_amount
+ enemy_stance = "attack"
+
+ list_temp += "
[enemy_name] grits their teeth and charge right into [added_temp]"
+
+ //in the case none of the previous passive triggered, Mainly here to set an enemy stance for passives that needs it like the magical passive.
+ if(!enemy_stance)
+ enemy_stance = pick("attack","defensive")
+ if(enemy_stance == "attack")
+ player_hp -= attack_amount
+ list_temp += "
[enemy_name] attacks you for [attack_amount] points of damage with their [chosen_weapon]"
+ if(player_stance == "counter_attack")
+ enemy_hp -= attack_amount * 2
+ list_temp += "
You counter [enemy_name]'s attack and deal [attack_amount * 2] points of damage!"
+
+ if(enemy_stance == "defensive" && enemy_mp < 15)
+ list_temp += "
[enemy_name] take some time to get some mp back! "
+ enemy_mp += attack_amount
+
+ else if (enemy_stance == "defensive" && enemy_mp >= 15 && !(LAZYACCESS(enemy_passive, "magical")))
+ list_temp += "
[enemy_name] quickly heal themselves for 5 hp! "
+ enemy_mp -= 15
+ enemy_hp += 5
+
+ //magical passive trait, recharges MP nearly every turn it's not blasting you with magic.
+ if(LAZYACCESS(enemy_passive, "magical"))
+ if(player_mp >= 50)
+ list_temp += "
the huge amount of magical energy you have acumulated throws [enemy_name] off balance!"
+ enemy_mp = 0
+ LAZYREMOVE(enemy_passive, "magical")
+ pissed_off++
+
+ else if(LAZYACCESS(enemy_passive, "smart") && player_stance == "counter_attack" && enemy_mp >= 20)
+ list_temp += "
[enemy_name] blasts you with magic from afar for 10 points of damage before you can counter!"
+ player_hp -= 10
+ enemy_mp -= 20
+
+ else if(enemy_hp >= 20 && enemy_mp >= 40 && enemy_stance == "defensive")
+ list_temp += "
[enemy_name] Blasts you with magic from afar!"
+ enemy_mp -= 40
+ player_hp -= 30
+ enemy_stance = "attack"
+
+ else if(enemy_hp < 20 && enemy_mp >= 20 && enemy_stance == "defensive") //it's a pretty expensive spell so they can't spam it that much
+ list_temp += "
[enemy_name] heal themselves with magic and gain back 20 hp!"
+ enemy_hp += 20
+ enemy_mp -= 30
+ else
+ list_temp += "
[enemy_name]'s magical nature lets them get some mp back!"
+ enemy_mp += attack_amount
+
+ //poisonous passive trait, while it's less damage added than the shotgun it acts up even when the enemy doesn't attack at all.
+ if(LAZYACCESS(enemy_passive, "poisonous"))
+ if(weakpoint_check("poisonous","attack","attack","attack"))
+ list_temp += "
your flurry of attack throws back the poisonnous gas at [enemy_name] and makes them choke on it! "
+ enemy_hp -= 5
+ else
+ list_temp += "
the stinky breath of [enemy_name] hurts you for 3 hp! "
+ player_hp -= 3
+
+ //if all passive's weakpoint have been triggered, set finishing_move to TRUE
+ if(pissed_off >= max_passive && !finishing_move)
+ list_temp += "
You have weakened [enemy_name] enough for them to show their weak point, you will do 10 times as much damage with your next attack! "
+ finishing_move = TRUE
+
+ playsound(src, 'sound/arcade/heal.ogg', 50, TRUE, extrarange = -3)
+
+ temp = list_temp.Join()
+ gameover_check(user)
+ screen_setup(user)
+ blocked = FALSE
+
+
+/obj/machinery/computer/arcade/battle/proc/gameover_check(mob/user)
+ var/xp_gained = 0
+ if(enemy_hp <= 0)
if(!gameover)
+ if(timer_id)
+ deltimer(timer_id)
+ timer_id = null
+ if(player_hp <= 0)
+ player_hp = 1 //let's just pretend the enemy didn't kill you so not both the player and enemy look dead.
gameover = TRUE
- temp = "[enemy_name] has fallen! Rejoice!"
- playsound(loc, 'sound/arcade/win.ogg', 50, TRUE, extrarange = -3)
+ blocked = FALSE
+ temp = "
[enemy_name] has fallen! Rejoice!"
+ playsound(loc, 'sound/arcade/win.ogg', 50, TRUE)
if(obj_flags & EMAGGED)
new /obj/effect/spawner/newbomb/timer/syndicate(loc)
@@ -133,78 +402,76 @@
log_game("[key_name(usr)] has outbombed Cuban Pete and been awarded a bomb.")
Reset()
obj_flags &= ~EMAGGED
+ xp_gained += 100
else
prizevend(user)
+ xp_gained += 50
SSblackbox.record_feedback("nested tally", "arcade_results", 1, list("win", (obj_flags & EMAGGED ? "emagged":"normal")))
-
- else if ((obj_flags & EMAGGED) && (turtle >= 4))
- var/boomamt = rand(5,10)
- temp = "[enemy_name] throws a bomb, exploding you for [boomamt] damage!"
- playsound(loc, 'sound/arcade/boom.ogg', 50, TRUE, extrarange = -3)
- player_hp -= boomamt
-
- else if ((enemy_mp <= 5) && (prob(70)))
- var/stealamt = rand(2,3)
- temp = "[enemy_name] steals [stealamt] of your power!"
- playsound(loc, 'sound/arcade/steal.ogg', 50, TRUE, extrarange = -3)
- player_mp -= stealamt
- updateUsrDialog()
-
- if (player_mp <= 0)
- gameover = TRUE
- sleep(turn_speed)
- temp = "You have been drained! GAME OVER"
- playsound(loc, 'sound/arcade/lose.ogg', 50, TRUE, extrarange = -3)
- if(obj_flags & EMAGGED)
- usr.gib()
- SSblackbox.record_feedback("nested tally", "arcade_results", 1, list("loss", "mana", (obj_flags & EMAGGED ? "emagged":"normal")))
-
- else if ((enemy_hp <= 10) && (enemy_mp > 4))
- temp = "[enemy_name] heals for 4 health!"
- playsound(loc, 'sound/arcade/heal.ogg', 50, TRUE, extrarange = -3)
- enemy_hp += 4
- enemy_mp -= 4
-
- else
- var/attackamt = rand(3,6)
- temp = "[enemy_name] attacks for [attackamt] damage!"
- playsound(loc, 'sound/arcade/hit.ogg', 50, TRUE, extrarange = -3)
- player_hp -= attackamt
-
- if ((player_mp <= 0) || (player_hp <= 0))
+ else if(player_hp <= 0)
+ if(timer_id)
+ deltimer(timer_id)
+ timer_id = null
gameover = TRUE
- temp = "You have been crushed! GAME OVER"
- playsound(loc, 'sound/arcade/lose.ogg', 50, TRUE, extrarange = -3)
+ temp = "
You have been crushed! GAME OVER"
+ playsound(loc, 'sound/arcade/lose.ogg', 50, TRUE)
+ xp_gained += 10//pity points
if(obj_flags & EMAGGED)
- usr.gib()
+ var/mob/living/living_user = user
+ if (istype(living_user))
+ living_user.gib()
SSblackbox.record_feedback("nested tally", "arcade_results", 1, list("loss", "hp", (obj_flags & EMAGGED ? "emagged":"normal")))
- blocked = FALSE
- return
+ // if(gameover)
+ // user?.mind?.adjust_experience(/datum/skill/gaming, xp_gained+1)//always gain at least 1 point of XP
+
+
+///used to check if the last three move of the player are the one we want in the right order and if the passive's weakpoint has been triggered yet
+/obj/machinery/computer/arcade/battle/proc/weakpoint_check(passive,first_move,second_move,third_move)
+ if(LAZYLEN(last_three_move) < 3)
+ return FALSE
+
+ if(last_three_move[1] == first_move && last_three_move[2] == second_move && last_three_move[3] == third_move && LAZYACCESS(enemy_passive, passive))
+ LAZYREMOVE(enemy_passive, passive)
+ pissed_off++
+ return TRUE
+ else
+ return FALSE
+
+
+/obj/machinery/computer/arcade/battle/Destroy()
+ enemy_passive = null
+ weapons = null
+ last_three_move = null
+ return ..() //well boys we did it, lists are no more
/obj/machinery/computer/arcade/battle/examine_more(mob/user)
- to_chat(user, "Scribbled on the side of the Arcade Machine you notice some writing...\
- \nmagical -> >=50 power\
- \nsmart -> defend, defend, light attack\
- \nshotgun -> defend, defend, power attack\
- \nshort temper -> counter, counter, counter\
- \npoisonous -> light attack, light attack, light attack\
- \nchonker -> power attack, power attack, power attack")
- return ..()
+ var/list/msg = list("You notice some writing scribbled on the side of [src]...")
+ msg += "\tsmart -> defend, defend, light attack"
+ msg += "\tshotgun -> defend, defend, power attack"
+ msg += "\tshort temper -> counter, counter, counter"
+ msg += "\tpoisonous -> light attack, light attack, light attack"
+ msg += "\tchonker -> power attack, power attack, power attack"
+ return msg
/obj/machinery/computer/arcade/battle/emag_act(mob/user)
. = ..()
if(obj_flags & EMAGGED)
return
+
to_chat(user, "A mesmerizing Rhumba beat starts playing from the arcade machine's speakers!")
- temp = "If you die in the game, you die for real!"
- player_hp = 30
- player_mp = 10
- enemy_hp = 45
- enemy_mp = 20
+ temp = "
If you die in the game, you die for real!"
+ max_passive = 6
+ bomb_cooldown = 18
+ var/gamerSkill = 0
+ // if(usr?.mind)
+ // gamerSkill = usr.mind.get_skill_level(/datum/skill/gaming)
+ enemy_setup(gamerSkill)
+ enemy_hp += 100 //extra HP just to make cuban pete even more bullshit
+ player_hp += 30 //the player will also get a few extra HP in order to have a fucking chance
+
+ screen_setup(user)
gameover = FALSE
- blocked = FALSE
obj_flags |= EMAGGED
diff --git a/code/game/machinery/computer/arcade/minesweeper.dm b/code/game/machinery/computer/arcade/minesweeper.dm
index 35a41a855a..dbd9890c81 100644
--- a/code/game/machinery/computer/arcade/minesweeper.dm
+++ b/code/game/machinery/computer/arcade/minesweeper.dm
@@ -268,7 +268,7 @@
visible_message("[src] dispenses [itemname]!", "You hear a chime and a clunk.")
DISABLE_BITFIELD(obj_flags, EMAGGED)
else
- var/dope_prizes = (area >= 480) ? list(ARCADE_WEIGHT_RARE) : (area >= 256) ? list(ARCADE_WEIGHT_RARE, ARCADE_WEIGHT_TRICK) : null
+ var/dope_prizes = (area >= 480) ? 6 : (area >= 256) ? 4 : 2
prizevend(user, dope_prizes)
if(game_status == MINESWEEPER_GAME_WON)
diff --git a/code/game/machinery/computer/arcade/misc_arcade.dm b/code/game/machinery/computer/arcade/misc_arcade.dm
index 50633192ce..5c887e3726 100644
--- a/code/game/machinery/computer/arcade/misc_arcade.dm
+++ b/code/game/machinery/computer/arcade/misc_arcade.dm
@@ -8,7 +8,7 @@
icon_state = "arcade"
circuit = /obj/item/circuitboard/computer/arcade/amputation
-/obj/machinery/computer/arcade/amputation/on_attack_hand(mob/user, act_intent = user.a_intent, unarmed_attack_flags)
+/obj/machinery/computer/arcade/amputation/on_attack_hand(mob/user)
if(!iscarbon(user))
return
var/mob/living/carbon/c_user = user
@@ -24,8 +24,13 @@
var/obj/item/bodypart/chopchop = c_user.get_bodypart(which_hand)
chopchop.dismember()
qdel(chopchop)
- playsound(loc, 'sound/arcade/win.ogg', 50, TRUE, extrarange = -3)
- for(var/i=1; i<=rand(3,5); i++)
- prizevend(user)
+ // user.mind?.adjust_experience(/datum/skill/gaming, 100)
+ playsound(loc, 'sound/arcade/win.ogg', 50, TRUE)
+ prizevend(user, rand(3,5))
else
to_chat(c_user, "You (wisely) decide against putting your hand in the machine.")
+
+/obj/machinery/computer/arcade/amputation/festive //dispenses wrapped gifts instead of arcade prizes, also known as the ancap christmas tree
+ name = "Mediborg's Festive Amputation Adventure"
+ desc = "A picture of a blood-soaked medical cyborg wearing a Santa hat flashes on the screen. The mediborg has a speech bubble that says, \"Put your hand in the machine if you aren't a coward!\""
+ prize_override = list(/obj/item/a_gift/anything = 1)
diff --git a/code/game/machinery/computer/arcade/orion_trail.dm b/code/game/machinery/computer/arcade/orion_trail.dm
index 441010906c..58617a0cf3 100644
--- a/code/game/machinery/computer/arcade/orion_trail.dm
+++ b/code/game/machinery/computer/arcade/orion_trail.dm
@@ -1,5 +1,3 @@
-
-
// *** THE ORION TRAIL ** //
#define ORION_TRAIL_WINTURN 9
@@ -15,6 +13,8 @@
#define ORION_TRAIL_COLLISION "Collision"
#define ORION_TRAIL_SPACEPORT "Spaceport"
#define ORION_TRAIL_BLACKHOLE "BlackHole"
+#define ORION_TRAIL_OLDSHIP "Old Ship"
+#define ORION_TRAIL_SEARCH "Old Ship Search"
#define ORION_STATUS_START 1
#define ORION_STATUS_NORMAL 2
@@ -44,7 +44,8 @@
ORION_TRAIL_LING = 3,
ORION_TRAIL_MALFUNCTION = 2,
ORION_TRAIL_COLLISION = 1,
- ORION_TRAIL_SPACEPORT = 2
+ ORION_TRAIL_SPACEPORT = 2,
+ ORION_TRAIL_OLDSHIP = 2
)
var/list/stops = list()
var/list/stopblurbs = list()
@@ -55,13 +56,27 @@
var/gameStatus = ORION_STATUS_START
var/canContinueEvent = 0
+ var/obj/item/radio/Radio
+ var/list/gamers = list()
+ var/killed_crew = 0
+
+
+/obj/machinery/computer/arcade/orion_trail/Initialize()
+ . = ..()
+ Radio = new /obj/item/radio(src)
+ Radio.listening = 0
+
+/obj/machinery/computer/arcade/orion_trail/Destroy()
+ QDEL_NULL(Radio)
+ return ..()
+
/obj/machinery/computer/arcade/orion_trail/kobayashi
name = "Kobayashi Maru control computer"
desc = "A test for cadets"
icon = 'icons/obj/machines/particle_accelerator.dmi'
icon_state = "control_boxp"
events = list("Raiders" = 3, "Interstellar Flux" = 1, "Illness" = 3, "Breakdown" = 2, "Malfunction" = 2, "Collision" = 1, "Spaceport" = 2)
- prizes = list(/obj/item/paper/fluff/holodeck/trek_diploma = 1)
+ prize_override = list(/obj/item/paper/fluff/holodeck/trek_diploma = 1)
settlers = list("Kirk","Worf","Gene")
/obj/machinery/computer/arcade/orion_trail/Reset()
@@ -96,14 +111,52 @@
event = null
gameStatus = ORION_STATUS_NORMAL
lings_aboard = 0
+ killed_crew = 0
//spaceport junk
spaceport_raided = 0
spaceport_freebie = 0
last_spaceport_action = ""
-/obj/machinery/computer/arcade/orion_trail/ui_interact(mob/user)
+/obj/machinery/computer/arcade/orion_trail/proc/report_player(mob/gamer)
+ if(gamers[gamer] == -2)
+ return // enough harassing them
+
+ if(gamers[gamer] == -1)
+ say("WARNING: Continued antisocial behavior detected: Dispensing self-help literature.")
+ new /obj/item/paper/pamphlet/violent_video_games(drop_location())
+ gamers[gamer]--
+ return
+
+ if(!(gamer in gamers))
+ gamers[gamer] = 0
+
+ gamers[gamer]++ // How many times the player has 'prestiged' (massacred their crew)
+
+ if(gamers[gamer] > 2 && prob(20 * gamers[gamer]))
+
+ Radio.set_frequency(FREQ_SECURITY)
+ Radio.talk_into(src, "SECURITY ALERT: Crewmember [gamer] recorded displaying antisocial tendencies in [get_area(src)]. Please watch for violent behavior.", FREQ_SECURITY)
+
+ Radio.set_frequency(FREQ_MEDICAL)
+ Radio.talk_into(src, "PSYCH ALERT: Crewmember [gamer] recorded displaying antisocial tendencies in [get_area(src)]. Please schedule psych evaluation.", FREQ_MEDICAL)
+
+ gamers[gamer] = -1
+
+ gamer.client.give_award(/datum/award/achievement/misc/gamer, gamer) // PSYCH REPORT NOTE: patient kept rambling about how they did it for an "achievement", recommend continued holding for observation
+ // gamer.mind?.adjust_experience(/datum/skill/gaming, 50) // cheevos make u better
+
+ if(!isnull(GLOB.data_core.general))
+ for(var/datum/data/record/R in GLOB.data_core.general)
+ if(R.fields["name"] == gamer.name)
+ R.fields["m_stat"] = "*Unstable*"
+ return
+
+/obj/machinery/computer/arcade/orion_trail/ui_interact(mob/_user)
. = ..()
+ if (!isliving(_user))
+ return
+ var/mob/living/user = _user
if(fuel <= 0 || food <=0 || settlers.len == 0)
gameStatus = ORION_STATUS_GAMEOVER
event = null
@@ -136,6 +189,8 @@
desc = "Learn how our ancestors got to Orion, and have fun in the process!"
dat += "
May They Rest In Peace
"
+ // user?.mind?.adjust_experience(/datum/skill/gaming, 10)//learning from your mistakes is the first rule of roguelikes
+
else if(event)
dat = eventdat
else if(gameStatus == ORION_STATUS_NORMAL)
@@ -174,20 +229,32 @@
return
busy = TRUE
+ // var/gamerSkillLevel = 0
+ var/gamerSkill = 0
+ var/gamerSkillRands = 0
+
+ // if(usr?.mind)
+ // gamerSkillLevel = usr.mind.get_skill_level(/datum/skill/gaming)
+ // gamerSkill = usr.mind.get_skill_modifier(/datum/skill/gaming, SKILL_PROBS_MODIFIER)
+ // gamerSkillRands = usr.mind.get_skill_modifier(/datum/skill/gaming, SKILL_RANDS_MODIFIER)
+
+
+ var/xp_gained = 0
if (href_list["continue"]) //Continue your travels
if(gameStatus == ORION_STATUS_NORMAL && !event && turns != 7)
if(turns >= ORION_TRAIL_WINTURN)
win(usr)
+ xp_gained += 34
else
food -= (alive+lings_aboard)*2
fuel -= 5
- if(turns == 2 && prob(30))
+ if(turns == 2 && prob(30-gamerSkill))
event = ORION_TRAIL_COLLISION
event()
- else if(prob(75))
+ else if(prob(75-gamerSkill))
event = pickweight(events)
if(lings_aboard)
- if(event == ORION_TRAIL_LING || prob(55))
+ if(event == ORION_TRAIL_LING || prob(55-gamerSkill))
event = ORION_TRAIL_LING_ATTACK
event()
turns += 1
@@ -195,15 +262,18 @@
var/mob/living/carbon/M = usr //for some vars
switch(event)
if(ORION_TRAIL_RAIDERS)
- if(prob(50))
+ if(prob(50-gamerSkill))
to_chat(usr, "You hear battle shouts. The tramping of boots on cold metal. Screams of agony. The rush of venting air. Are you going insane?")
M.hallucination += 30
else
to_chat(usr, "Something strikes you from behind! It hurts like hell and feel like a blunt weapon, but nothing is there...")
M.take_bodypart_damage(30)
- playsound(loc, 'sound/weapons/genhit2.ogg', 100, 1)
+ playsound(loc, 'sound/weapons/genhit2.ogg', 100, TRUE)
if(ORION_TRAIL_ILLNESS)
- var/severity = rand(1,3) //pray to RNGesus. PRAY, PIGS
+ var/maxSeverity = 3
+ // if(gamerSkillLevel >= SKILL_LEVEL_EXPERT)
+ // maxSeverity = 2 //part of gitting gud is rng mitigation
+ var/severity = rand(1,maxSeverity) //pray to RNGesus. PRAY, PIGS
if(severity == 1)
to_chat(M, "You suddenly feel slightly nauseated." )
if(severity == 2)
@@ -215,16 +285,16 @@
sleep(30)
M.vomit(10, distance = 5)
if(ORION_TRAIL_FLUX)
- if(prob(75))
+ if(prob(75-gamerSkill))
M.DefaultCombatKnockdown(60)
say("A sudden gust of powerful wind slams [M] into the floor!")
M.take_bodypart_damage(25)
- playsound(loc, 'sound/weapons/genhit.ogg', 100, 1)
+ playsound(loc, 'sound/weapons/genhit.ogg', 100, TRUE)
else
to_chat(M, "A violent gale blows past you, and you barely manage to stay standing!")
if(ORION_TRAIL_COLLISION) //by far the most damaging event
- if(prob(90))
- playsound(loc, 'sound/effects/bang.ogg', 100, 1)
+ if(prob(90-gamerSkill))
+ playsound(loc, 'sound/effects/bang.ogg', 100, TRUE)
var/turf/open/floor/F
for(F in orange(1, src))
F.ScrapeAway()
@@ -232,15 +302,15 @@
if(hull)
sleep(10)
say("A new floor suddenly appears around [src]. What the hell?")
- playsound(loc, 'sound/weapons/genhit.ogg', 100, 1)
+ playsound(loc, 'sound/weapons/genhit.ogg', 100, TRUE)
var/turf/open/space/T
for(T in orange(1, src))
T.PlaceOnTop(/turf/open/floor/plating)
else
say("Something slams into the floor around [src] - luckily, it didn't get through!")
- playsound(loc, 'sound/effects/bang.ogg', 50, 1)
+ playsound(loc, 'sound/effects/bang.ogg', 50, TRUE)
if(ORION_TRAIL_MALFUNCTION)
- playsound(loc, 'sound/effects/empulse.ogg', 50, 1)
+ playsound(loc, 'sound/effects/empulse.ogg', 50, TRUE)
visible_message("[src] malfunctions, randomizing in-game stats!")
var/oldfood = food
var/oldfuel = fuel
@@ -254,7 +324,7 @@
audible_message("[src] lets out a somehow ominous chime.")
food = oldfood
fuel = oldfuel
- playsound(loc, 'sound/machines/chime.ogg', 50, 1)
+ playsound(loc, 'sound/machines/chime.ogg', 50, TRUE)
else if(href_list["newgame"]) //Reset everything
if(gameStatus == ORION_STATUS_START)
@@ -266,6 +336,10 @@
food = 80
fuel = 60
settlers = list("Harry","Larry","Bob")
+ else if(href_list["search"]) //search old ship
+ if(event == ORION_TRAIL_OLDSHIP)
+ event = ORION_TRAIL_SEARCH
+ event()
else if(href_list["slow"]) //slow down
if(event == ORION_TRAIL_FLUX)
food -= (alive+lings_aboard)*2
@@ -302,11 +376,11 @@
event = null
else if(href_list["blackhole"]) //keep speed past a black hole
if(turns == 7)
- if(prob(75))
+ if(prob(75-gamerSkill))
event = ORION_TRAIL_BLACKHOLE
event()
if(obj_flags & EMAGGED)
- playsound(loc, 'sound/effects/supermatter.ogg', 100, 1)
+ playsound(loc, 'sound/effects/supermatter.ogg', 100, TRUE)
say("A miniature black hole suddenly appears in front of [src], devouring [usr] alive!")
if(isliving(usr))
var/mob/living/L = usr
@@ -328,22 +402,29 @@
else if(href_list["killcrew"]) //shoot a crewmember
if(gameStatus == ORION_STATUS_NORMAL || event == ORION_TRAIL_LING)
var/sheriff = remove_crewmember() //I shot the sheriff
- playsound(loc,'sound/weapons/gunshot.ogg', 100, 1)
+ playsound(loc,'sound/weapons/gunshot.ogg', 100, TRUE)
+ killed_crew++
+
+ var/mob/living/user = usr
if(settlers.len == 0 || alive == 0)
say("The last crewmember [sheriff], shot themselves, GAME OVER!")
if(obj_flags & EMAGGED)
- usr.death(0)
- obj_flags &= EMAGGED
+ user.death(FALSE)
gameStatus = ORION_STATUS_GAMEOVER
event = null
+
+ if(killed_crew >= 4)
+ xp_gained -= 15//no cheating by spamming game overs
+ report_player(usr)
else if(obj_flags & EMAGGED)
if(usr.name == sheriff)
say("The crew of the ship chose to kill [usr.name]!")
- usr.death(0)
+ user.death(FALSE)
if(event == ORION_TRAIL_LING) //only ends the ORION_TRAIL_LING event, since you can do this action in multiple places
event = null
+ killed_crew-- // the kill was valid
//Spaceport specific interactions
//they get a header because most of them don't reset event (because it's a shop, you leave when you want to)
@@ -356,6 +437,7 @@
fuel -= 10
food -= 10
event()
+ killed_crew-- // I mean not really but you know
else if(href_list["sellcrew"]) //sell a crewmember
if(gameStatus == ORION_STATUS_MARKET)
@@ -377,15 +459,16 @@
else if(href_list["raid_spaceport"])
if(gameStatus == ORION_STATUS_MARKET)
if(!spaceport_raided)
- var/success = min(15 * alive,100) //default crew (4) have a 60% chance
+ var/success = min(15 * alive + gamerSkill,100) //default crew (4) have a 60% chance
spaceport_raided = 1
var/FU = 0
var/FO = 0
if(prob(success))
- FU = rand(5,15)
- FO = rand(5,15)
+ FU = rand(5 + gamerSkillRands,15 + gamerSkillRands)
+ FO = rand(5 + gamerSkillRands,15 + gamerSkillRands)
last_spaceport_action = "You successfully raided the spaceport! You gained [FU] Fuel and [FO] Food! (+[FU]FU,+[FO]FO)"
+ xp_gained += 10
else
FU = rand(-5,-15)
FO = rand(-5,-15)
@@ -444,8 +527,7 @@
add_fingerprint(usr)
updateUsrDialog()
busy = FALSE
- return
-
+ // usr?.mind?.adjust_experience(/datum/skill/gaming, xp_gained+1)
/obj/machinery/computer/arcade/orion_trail/proc/event()
eventdat = "[event]
"
@@ -474,6 +556,38 @@
eventdat += "Slow Down Continue
"
eventdat += "Close
"
+ if(ORION_TRAIL_OLDSHIP)
+ eventdat += "
Your crew spots an old ship floating through space. It might have some supplies, but then again it looks rather unsafe."
+ eventdat += "Search itLeave it
Close
"
+ canContinueEvent = 1
+
+ if(ORION_TRAIL_SEARCH)
+ switch(rand(100))
+ if(0 to 15)
+ var/rescued = add_crewmember()
+ var/oldfood = rand(1,7)
+ var/oldfuel = rand(4,10)
+ food += oldfood
+ fuel += oldfuel
+ eventdat += "
As you look through it you find some supplies and a living person!"
+ eventdat += "
[rescued] was rescued from the abandoned ship!"
+ eventdat += "
You found [oldfood] Food and [oldfuel] Fuel."
+ if(15 to 35)
+ var/lfuel = rand(4,7)
+ var/deadname = remove_crewmember()
+ fuel -= lfuel
+ eventdat += "
[deadname] was lost deep in the wreckage, and your own vessel lost [lfuel] Fuel maneuvering to the the abandoned ship."
+ if(35 to 65)
+ var/oldfood = rand(5,11)
+ food += oldfood
+ engine++
+ eventdat += "
You found [oldfood] Food and some parts amongst the wreck."
+ else
+ eventdat += "
As you look through the wreck you cannot find much of use."
+ eventdat += "Continue
"
+ eventdat += "Close
"
+ canContinueEvent = 1
+
if(ORION_TRAIL_ILLNESS)
eventdat += "A deadly illness has been contracted!"
var/deadname = remove_crewmember()
@@ -687,7 +801,7 @@
//Add Random/Specific crewmember
-/obj/machinery/computer/arcade/orion_trail/proc/add_crewmember(var/specific = "")
+/obj/machinery/computer/arcade/orion_trail/proc/add_crewmember(specific = "")
var/newcrew = ""
if(specific)
newcrew = specific
@@ -703,7 +817,7 @@
//Remove Random/Specific crewmember
-/obj/machinery/computer/arcade/orion_trail/proc/remove_crewmember(var/specific = "", var/dont_remove = "")
+/obj/machinery/computer/arcade/orion_trail/proc/remove_crewmember(specific = "", dont_remove = "")
var/list/safe2remove = settlers
var/removed = ""
if(dont_remove)
@@ -779,14 +893,14 @@
to_chat(user, "You flip the switch on the underside of [src].")
active = 1
visible_message("[src] softly beeps and whirs to life!")
- playsound(loc, 'sound/machines/defib_SaftyOn.ogg', 25, 1)
+ playsound(loc, 'sound/machines/defib_SaftyOn.ogg', 25, TRUE)
say("This is ship ID #[rand(1,1000)] to Orion Port Authority. We're coming in for landing, over.")
sleep(20)
visible_message("[src] begins to vibrate...")
say("Uh, Port? Having some issues with our reactor, could you check it out? Over.")
sleep(30)
say("Oh, God! Code Eight! CODE EIGHT! IT'S GONNA BL-")
- playsound(loc, 'sound/machines/buzz-sigh.ogg', 25, 1)
+ playsound(loc, 'sound/machines/buzz-sigh.ogg', 25, TRUE)
sleep(3.6)
visible_message("[src] explodes!")
explosion(loc, 2,4,8, flame_range = 16)
diff --git a/code/game/machinery/computer/atmos_control.dm b/code/game/machinery/computer/atmos_control.dm
index 75a181b922..98d8811948 100644
--- a/code/game/machinery/computer/atmos_control.dm
+++ b/code/game/machinery/computer/atmos_control.dm
@@ -92,6 +92,7 @@ GLOBAL_LIST_EMPTY(atmos_air_controllers)
icon_screen = "tank"
icon_keyboard = "atmos_key"
circuit = /obj/item/circuitboard/computer/atmos_control
+ light_color = LIGHT_COLOR_CYAN
var/frequency = FREQ_ATMOS_STORAGE
var/list/sensors = list(
@@ -102,6 +103,20 @@ GLOBAL_LIST_EMPTY(atmos_air_controllers)
ATMOS_GAS_MONITOR_SENSOR_N2O = "Nitrous Oxide Tank",
ATMOS_GAS_MONITOR_SENSOR_AIR = "Mixed Air Tank",
ATMOS_GAS_MONITOR_SENSOR_MIX = "Mix Tank",
+ // ATMOS_GAS_MONITOR_SENSOR_BZ = "BZ Tank",
+ // ATMOS_GAS_MONITOR_SENSOR_FREON = "Freon Tank",
+ // ATMOS_GAS_MONITOR_SENSOR_HALON = "Halon Tank",
+ // ATMOS_GAS_MONITOR_SENSOR_HEALIUM = "Healium Tank",
+ // ATMOS_GAS_MONITOR_SENSOR_H2 = "Hydrogen Tank",
+ // ATMOS_GAS_MONITOR_SENSOR_HYPERNOBLIUM = "Hypernoblium Tank",
+ // ATMOS_GAS_MONITOR_SENSOR_MIASMA = "Miasma Tank",
+ // ATMOS_GAS_MONITOR_SENSOR_NO2 = "Nitryl Tank",
+ // ATMOS_GAS_MONITOR_SENSOR_PLUOXIUM = "Pluoxium Tank",
+ // ATMOS_GAS_MONITOR_SENSOR_PROTO_NITRATE = "Proto-Nitrate Tank",
+ // ATMOS_GAS_MONITOR_SENSOR_STIMULUM = "Stimulum Tank",
+ // ATMOS_GAS_MONITOR_SENSOR_TRITIUM = "Tritium Tank",
+ // ATMOS_GAS_MONITOR_SENSOR_H2O = "Water Vapor Tank",
+ // ATMOS_GAS_MONITOR_SENSOR_ZAUKER = "Zauker Tank",
ATMOS_GAS_MONITOR_LOOP_DISTRIBUTION = "Distribution Loop",
ATMOS_GAS_MONITOR_LOOP_ATMOS_WASTE = "Atmos Waste Loop",
ATMOS_GAS_MONITOR_SENSOR_INCINERATOR = "Incinerator Chamber",
@@ -110,7 +125,6 @@ GLOBAL_LIST_EMPTY(atmos_air_controllers)
var/list/sensor_information = list()
var/datum/radio_frequency/radio_connection
- light_color = LIGHT_COLOR_CYAN
/obj/machinery/computer/atmos_control/Initialize()
. = ..()
@@ -165,15 +179,10 @@ GLOBAL_LIST_EMPTY(atmos_air_controllers)
/obj/machinery/computer/atmos_control/incinerator
name = "Incinerator Air Control"
sensors = list(ATMOS_GAS_MONITOR_SENSOR_INCINERATOR = "Incinerator Chamber")
- ui_x = 400
- ui_y = 300
-
//Toxins mix sensor only
/obj/machinery/computer/atmos_control/toxinsmix
name = "Toxins Mixing Air Control"
sensors = list(ATMOS_GAS_MONITOR_SENSOR_TOXINS_LAB = "Toxins Mixing Chamber")
- ui_x = 400
- ui_y = 300
/////////////////////////////////////////////////////////////
// LARGE TANK CONTROL
@@ -184,13 +193,9 @@ GLOBAL_LIST_EMPTY(atmos_air_controllers)
var/output_tag
frequency = FREQ_ATMOS_STORAGE
circuit = /obj/item/circuitboard/computer/atmos_control/tank
-
var/list/input_info
var/list/output_info
- ui_x = 500
- ui_y = 315
-
/obj/machinery/computer/atmos_control/tank/oxygen_tank
name = "Oxygen Supply Control"
input_tag = ATMOS_GAS_MONITOR_INPUT_O2
@@ -236,7 +241,7 @@ GLOBAL_LIST_EMPTY(atmos_air_controllers)
// This hacky madness is the evidence of the fact that a lot of machines were never meant to be constructable, im so sorry you had to see this
/obj/machinery/computer/atmos_control/tank/proc/reconnect(mob/user)
var/list/IO = list()
- var/datum/radio_frequency/freq = SSradio.return_frequency(FREQ_ATMOS_STORAGE)
+ var/datum/radio_frequency/freq = SSradio.return_frequency(frequency)
var/list/devices = freq.devices["_default"]
for(var/obj/machinery/atmospherics/components/unary/vent_pump/U in devices)
var/list/text = splittext(U.id_tag, "_")
@@ -252,10 +257,11 @@ GLOBAL_LIST_EMPTY(atmos_air_controllers)
src.output_tag = "[S]_out"
name = "[uppertext(S)] Supply Control"
var/list/new_devices = freq.devices["4"]
+ sensors.Cut()
for(var/obj/machinery/air_sensor/U in new_devices)
var/list/text = splittext(U.id_tag, "_")
if(text[1] == S)
- sensors = list("[S]_sensor" = "Tank")
+ sensors = list("[S]_sensor" = "[S] Tank")
break
for(var/obj/machinery/atmospherics/components/unary/outlet_injector/U in devices)
@@ -268,13 +274,16 @@ GLOBAL_LIST_EMPTY(atmos_air_controllers)
data["tank"] = TRUE
data["inputting"] = input_info ? input_info["power"] : FALSE
data["inputRate"] = input_info ? input_info["volume_rate"] : 0
+ data["maxInputRate"] = input_info ? MAX_TRANSFER_RATE : 0
data["outputting"] = output_info ? output_info["power"] : FALSE
data["outputPressure"] = output_info ? output_info["internal"] : 0
-
+ data["maxOutputPressure"] = output_info ? MAX_OUTPUT_PRESSURE : 0
return data
/obj/machinery/computer/atmos_control/tank/ui_act(action, params)
- if(..() || !radio_connection)
+ . = ..()
+
+ if(. || !radio_connection)
return
var/datum/signal/signal = new(list("sigtype" = "command", "user" = usr))
switch(action)
diff --git a/code/game/machinery/computer/camera.dm b/code/game/machinery/computer/camera.dm
index 03a5a17493..a62d2cd102 100644
--- a/code/game/machinery/computer/camera.dm
+++ b/code/game/machinery/computer/camera.dm
@@ -1,3 +1,5 @@
+#define DEFAULT_MAP_SIZE 15
+
/obj/machinery/computer/security
name = "security camera console"
desc = "Used to access the various cameras on the station."
@@ -8,15 +10,19 @@
var/list/network = list("ss13")
var/obj/machinery/camera/active_camera
+ /// The turf where the camera was last updated.
+ var/turf/last_camera_turf
var/list/concurrent_users = list()
// Stuff needed to render the map
var/map_name
- var/const/default_map_size = 15
- var/obj/screen/cam_screen
- var/obj/screen/plane_master/lighting/cam_plane_master
+ var/obj/screen/map_view/cam_screen
+ /// All the plane masters that need to be applied.
+ var/list/cam_plane_masters
var/obj/screen/background/cam_background
+ interaction_flags_machine = INTERACT_MACHINE_ALLOW_SILICON | INTERACT_MACHINE_SET_MACHINE //| INTERACT_MACHINE_REQUIRES_SIGHT
+
/obj/machinery/computer/security/Initialize()
. = ..()
// Map name has to start and end with an A-Z character,
@@ -33,18 +39,20 @@
cam_screen.assigned_map = map_name
cam_screen.del_on_map_removal = FALSE
cam_screen.screen_loc = "[map_name]:1,1"
- cam_plane_master = new
- cam_plane_master.name = "plane_master"
- cam_plane_master.assigned_map = map_name
- cam_plane_master.del_on_map_removal = FALSE
- cam_plane_master.screen_loc = "[map_name]:CENTER"
+ cam_plane_masters = list()
+ for(var/plane in subtypesof(/obj/screen/plane_master))
+ var/obj/screen/instance = new plane()
+ instance.assigned_map = map_name
+ instance.del_on_map_removal = FALSE
+ instance.screen_loc = "[map_name]:CENTER"
+ cam_plane_masters += instance
cam_background = new
cam_background.assigned_map = map_name
cam_background.del_on_map_removal = FALSE
/obj/machinery/computer/security/Destroy()
qdel(cam_screen)
- qdel(cam_plane_master)
+ QDEL_LIST(cam_plane_masters)
qdel(cam_background)
return ..()
@@ -56,9 +64,10 @@
/obj/machinery/computer/security/ui_interact(mob/user, datum/tgui/ui)
// Update UI
ui = SStgui.try_update_ui(user, src, ui)
- // Show static if can't use the camera
- if(!active_camera?.can_use())
- show_camera_static()
+
+ // Update the camera, showing static if necessary and updating data if the location has moved.
+ update_active_camera_screen()
+
if(!ui)
var/user_ref = REF(user)
var/is_living = isliving(user)
@@ -72,7 +81,7 @@
use_power(active_power_usage)
// Register map objects
user.client.register_map_obj(cam_screen)
- for(var/plane in cam_plane_master)
+ for(var/plane in cam_plane_masters)
user.client.register_map_obj(plane)
user.client.register_map_obj(cam_background)
// Open UI
@@ -100,6 +109,7 @@
data["cameras"] += list(list(
name = C.c_tag,
))
+
return data
/obj/machinery/computer/security/ui_act(action, params)
@@ -110,31 +120,51 @@
if(action == "switch_camera")
var/c_tag = params["name"]
var/list/cameras = get_available_cameras()
- var/obj/machinery/camera/C = cameras[c_tag]
- active_camera = C
+ var/obj/machinery/camera/selected_camera = cameras[c_tag]
+ active_camera = selected_camera
playsound(src, get_sfx("terminal_type"), 25, FALSE)
- // Show static if can't use the camera
- if(!active_camera?.can_use())
- show_camera_static()
+ if(!selected_camera)
return TRUE
- var/list/visible_turfs = list()
- for(var/turf/T in (C.isXRay() \
- ? range(C.view_range, C) \
- : view(C.view_range, C)))
- visible_turfs += T
-
- var/list/bbox = get_bbox_of_atoms(visible_turfs)
- var/size_x = bbox[3] - bbox[1] + 1
- var/size_y = bbox[4] - bbox[2] + 1
-
- cam_screen.vis_contents = visible_turfs
- cam_background.icon_state = "clear"
- cam_background.fill_rect(1, 1, size_x, size_y)
+ update_active_camera_screen()
return TRUE
+/obj/machinery/computer/security/proc/update_active_camera_screen()
+ // Show static if can't use the camera
+ if(!active_camera?.can_use())
+ show_camera_static()
+ return
+
+ var/list/visible_turfs = list()
+
+ // Is this camera located in or attached to a living thing? If so, assume the camera's loc is the living thing.
+ var/cam_location = isliving(active_camera.loc) ? active_camera.loc : active_camera
+
+ // If we're not forcing an update for some reason and the cameras are in the same location,
+ // we don't need to update anything.
+ // Most security cameras will end here as they're not moving.
+ var/newturf = get_turf(cam_location)
+ if(last_camera_turf == newturf)
+ return
+
+ // Cameras that get here are moving, and are likely attached to some moving atom such as cyborgs.
+ last_camera_turf = get_turf(cam_location)
+
+ var/list/visible_things = active_camera.isXRay() ? range(active_camera.view_range, cam_location) : view(active_camera.view_range, cam_location)
+
+ for(var/turf/visible_turf in visible_things)
+ visible_turfs += visible_turf
+
+ var/list/bbox = get_bbox_of_atoms(visible_turfs)
+ var/size_x = bbox[3] - bbox[1] + 1
+ var/size_y = bbox[4] - bbox[2] + 1
+
+ cam_screen.vis_contents = visible_turfs
+ cam_background.icon_state = "clear"
+ cam_background.fill_rect(1, 1, size_x, size_y)
+
/obj/machinery/computer/security/ui_close(mob/user)
var/user_ref = REF(user)
var/is_living = isliving(user)
@@ -151,7 +181,7 @@
/obj/machinery/computer/security/proc/show_camera_static()
cam_screen.vis_contents.Cut()
cam_background.icon_state = "scanline2"
- cam_background.fill_rect(1, 1, default_map_size, default_map_size)
+ cam_background.fill_rect(1, 1, DEFAULT_MAP_SIZE, DEFAULT_MAP_SIZE)
// Returns the list of cameras accessible from this computer
/obj/machinery/computer/security/proc/get_available_cameras()
@@ -179,7 +209,7 @@
name = "security camera monitor"
desc = "An old TV hooked into the station's camera network."
icon_state = "television"
- icon_keyboard = null
+ icon_keyboard = "no_keyboard"
icon_screen = "detective_tv"
pass_flags = PASSTABLE
@@ -211,7 +241,7 @@
/obj/machinery/computer/security/qm
name = "\improper Quartermaster's camera console"
- desc = "A console with access to the mining, auxillary base and vault camera networks."
+ desc = "A console with access to the mining, auxiliary base and vault camera networks."
network = list("mine", "auxbase", "vault")
circuit = null
@@ -222,17 +252,12 @@
desc = "Used for watching an empty arena."
icon = 'icons/obj/stationobjs.dmi'
icon_state = "telescreen"
+ layer = SIGN_LAYER
network = list("thunder")
density = FALSE
circuit = null
light_power = 0
-/obj/machinery/computer/security/telescreen/Initialize()
- . = ..()
- var/turf/T = get_turf_pixel(src)
- if(iswallturf(T))
- plane = ABOVE_WALL_PLANE
-
/obj/machinery/computer/security/telescreen/update_icon_state()
icon_state = initial(icon_state)
if(stat & BROKEN)
@@ -246,21 +271,19 @@
network = list("thunder")
density = FALSE
circuit = null
- //interaction_flags_atom = NONE // interact() is called by BigClick()
+ interaction_flags_atom = NONE // interact() is called by BigClick()
var/icon_state_off = "entertainment_blank"
var/icon_state_on = "entertainment"
-/* If someone would like to try to get this long-distance viewing thing working, be my guest. I tried everything I could possibly think of and it just refused to operate correctly.
-
/obj/machinery/computer/security/telescreen/entertainment/Initialize()
. = ..()
RegisterSignal(src, COMSIG_CLICK, .proc/BigClick)
// Bypass clickchain to allow humans to use the telescreen from a distance
/obj/machinery/computer/security/telescreen/entertainment/proc/BigClick()
- interact(usr)
+ SIGNAL_HANDLER
-*/
+ INVOKE_ASYNC(src, /atom.proc/interact, usr)
/obj/machinery/computer/security/telescreen/entertainment/proc/notify(on)
if(on && icon_state == icon_state_off)
@@ -279,8 +302,8 @@
network = list("rd", "aicore", "aiupload", "minisat", "xeno", "test")
/obj/machinery/computer/security/telescreen/circuitry
- name = "circuitry telescreen"
- desc = "Used for watching the other eggheads from the safety of the circuitry lab."
+ name = "research telescreen"
+ desc = "A telescreen with access to the research division's camera network."
network = list("rd")
/obj/machinery/computer/security/telescreen/ce
@@ -324,8 +347,8 @@
network = list("prison")
/obj/machinery/computer/security/telescreen/auxbase
- name = "auxillary base monitor"
- desc = "A telescreen that connects to the auxillary base's camera."
+ name = "auxiliary base monitor"
+ desc = "A telescreen that connects to the auxiliary base's camera."
network = list("auxbase")
/obj/machinery/computer/security/telescreen/minisat
@@ -346,3 +369,5 @@
for(var/i in network)
network -= i
network += "[idnum][i]"
+
+#undef DEFAULT_MAP_SIZE
diff --git a/code/game/machinery/computer/communications.dm b/code/game/machinery/computer/communications.dm
index 3ef887b156..ff65a6e159 100755
--- a/code/game/machinery/computer/communications.dm
+++ b/code/game/machinery/computer/communications.dm
@@ -1,14 +1,10 @@
-#define STATE_DEFAULT 1
-#define STATE_CALLSHUTTLE 2
-#define STATE_CANCELSHUTTLE 3
-#define STATE_MESSAGELIST 4
-#define STATE_VIEWMESSAGE 5
-#define STATE_DELMESSAGE 6
-#define STATE_STATUSDISPLAY 7
-#define STATE_ALERT_LEVEL 8
-#define STATE_CONFIRM_LEVEL 9
-#define STATE_TOGGLE_EMERGENCY 10
-#define STATE_PURCHASE 11
+#define IMPORTANT_ACTION_COOLDOWN (60 SECONDS)
+#define MAX_STATUS_LINE_LENGTH 40
+
+#define STATE_BUYING_SHUTTLE "buying_shuttle"
+#define STATE_CHANGING_STATUS "changing_status"
+#define STATE_MAIN "main"
+#define STATE_MESSAGES "messages"
// The communications computer
/obj/machinery/computer/communications
@@ -19,423 +15,53 @@
req_access = list(ACCESS_HEADS)
circuit = /obj/item/circuitboard/computer/communications
light_color = LIGHT_COLOR_BLUE
- var/auth_id = "Unknown" //Who is currently logged in?
- var/list/datum/comm_message/messages = list()
- var/datum/comm_message/currmsg
- var/datum/comm_message/aicurrmsg
- var/state = STATE_DEFAULT
- var/aistate = STATE_DEFAULT
- var/message_cooldown = 0
- var/ai_message_cooldown = 0
- var/tmp_alertlevel = 0
- var/static/security_level_cd // used to stop mass spam.
- var/stat_msg1
- var/stat_msg2
+ /// Cooldown for important actions, such as messaging CentCom or other sectors
+ COOLDOWN_DECLARE(static/important_action_cooldown)
+ /// The current state of the UI
+ var/state = STATE_MAIN
-/obj/machinery/computer/communications/proc/checkCCcooldown()
- var/obj/item/circuitboard/computer/communications/CM = circuit
- if(CM.lastTimeUsed + 600 > world.time)
- return FALSE
- return TRUE
+ /// The current state of the UI for AIs
+ var/cyborg_state = STATE_MAIN
+
+ /// The name of the user who logged in
+ var/authorize_name
+
+ /// The access that the card had on login
+ var/list/authorize_access
+
+ /// The messages this console has been sent
+ var/list/datum/comm_message/messages
+
+ /// How many times the alert level has been changed
+ /// Used to clear the modal to change alert level
+ var/alert_level_tick = 0
+
+ /// The last lines used for changing the status display
+ var/static/last_status_display
/obj/machinery/computer/communications/Initialize()
. = ..()
GLOB.shuttle_caller_list += src
-/obj/machinery/computer/communications/Topic(href, href_list)
- if(..())
- return
- if(!usr.canUseTopic(src, !issilicon(usr)))
- return
- if(!is_station_level(z) && !is_reserved_level(z)) //Can only use in transit and on SS13
- to_chat(usr, "Unable to establish a connection: \black You're too far away from the station!")
- return
- usr.set_machine(src)
+/// Are we NOT a silicon, AND we're logged in as the captain?
+/obj/machinery/computer/communications/proc/authenticated_as_non_silicon_captain(mob/user)
+ if (issilicon(user))
+ return FALSE
+ return ACCESS_CAPTAIN in authorize_access
+/// Are we a silicon, OR we're logged in as the captain?
+/obj/machinery/computer/communications/proc/authenticated_as_silicon_or_captain(mob/user)
+ if (issilicon(user))
+ return TRUE
+ return ACCESS_CAPTAIN in authorize_access
- if(!href_list["operation"])
- return
- var/obj/item/circuitboard/computer/communications/CM = circuit
- switch(href_list["operation"])
- // main interface
- if("main")
- state = STATE_DEFAULT
- playsound(src, 'sound/machines/terminal_prompt_deny.ogg', 50, FALSE)
- if("login")
- var/mob/M = usr
-
- var/obj/item/card/id/I = M.get_idcard(TRUE)
-
- if(I && istype(I))
- if(check_access(I))
- authenticated = 1
- auth_id = "[I.registered_name] ([I.assignment])"
- if((ACCESS_CAPTAIN in I.access))
- authenticated = 2
- playsound(src, 'sound/machines/terminal_on.ogg', 50, FALSE)
- if(obj_flags & EMAGGED)
- authenticated = 2
- auth_id = "Unknown"
- to_chat(M, "[src] lets out a quiet alarm as its login is overridden.")
- playsound(src, 'sound/machines/terminal_on.ogg', 50, FALSE)
- playsound(src, 'sound/machines/terminal_alert.ogg', 25, FALSE)
- if(prob(25))
- for(var/mob/living/silicon/ai/AI in active_ais())
- SEND_SOUND(AI, sound('sound/machines/terminal_alert.ogg', volume = 10)) //Very quiet for balance reasons
- if("logout")
- authenticated = 0
- playsound(src, 'sound/machines/terminal_off.ogg', 50, FALSE)
-
- if("swipeidseclevel")
- var/mob/M = usr
- var/obj/item/card/id/I = M.get_active_held_item()
- if (istype(I, /obj/item/pda))
- var/obj/item/pda/pda = I
- I = pda.id
- if (I && istype(I))
- if(ACCESS_CAPTAIN in I.access)
- if(security_level_cd > world.time)
- to_chat(usr, "Security level protocols are currently on cooldown. Please stand by.")
- return
- var/old_level = GLOB.security_level
- if(!tmp_alertlevel)
- tmp_alertlevel = SEC_LEVEL_GREEN
- if(tmp_alertlevel < SEC_LEVEL_GREEN)
- tmp_alertlevel = SEC_LEVEL_GREEN
- if(tmp_alertlevel > SEC_LEVEL_AMBER)
- tmp_alertlevel = SEC_LEVEL_AMBER //Cannot engage delta with this
- set_security_level(tmp_alertlevel)
- security_level_cd = world.time + 15 SECONDS
- if(GLOB.security_level != old_level)
- to_chat(usr, "Authorization confirmed. Modifying security level.")
- playsound(src, 'sound/machines/terminal_prompt_confirm.ogg', 50, FALSE)
- //Only notify people if an actual change happened
- var/security_level = NUM2SECLEVEL(GLOB.security_level)
- log_game("[key_name(usr)] has changed the security level to [security_level] with [src] at [AREACOORD(usr)].")
- message_admins("[ADMIN_LOOKUPFLW(usr)] has changed the security level to [security_level] with [src] at [AREACOORD(usr)].")
- deadchat_broadcast("[usr.real_name] has changed the security level to [security_level] with [src] at [get_area_name(usr, TRUE)].", usr)
- tmp_alertlevel = 0
- else
- to_chat(usr, "You are not authorized to do this!")
- playsound(src, 'sound/machines/terminal_prompt_deny.ogg', 50, FALSE)
- tmp_alertlevel = 0
- state = STATE_DEFAULT
- else
- to_chat(usr, "You need to swipe your ID!")
- playsound(src, 'sound/machines/terminal_prompt_deny.ogg', 50, FALSE)
-
- if("announce")
- if(authenticated==2)
- playsound(src, 'sound/machines/terminal_prompt.ogg', 50, FALSE)
- make_announcement(usr)
-
- if("crossserver")
- if(authenticated==2)
- var/dest = href_list["cross_dest"]
- if(!checkCCcooldown())
- to_chat(usr, "Arrays recycling. Please stand by.")
- playsound(src, 'sound/machines/terminal_prompt_deny.ogg', 50, FALSE)
- return
- var/warning = dest == "all" ? "Please choose a message to transmit to allied stations." : "Please choose a message to transmit to [dest] sector station."
- var/input = stripped_multiline_input(usr, "[warning] Please be aware that this process is very expensive, and abuse will lead to... termination.", "Send a message to an allied station.", "")
- if(!input || !(usr in view(1,src)) || !checkCCcooldown())
- return
- playsound(src, 'sound/machines/terminal_prompt_confirm.ogg', 50, FALSE)
- if(dest == "all")
- send2otherserver("[station_name()]", input,"Comms_Console")
- else
- send2otherserver("[station_name()]", input,"Comms_Console", list(dest))
- minor_announce(input, title = "Outgoing message to allied station")
- usr.log_talk(input, LOG_SAY, tag="message to the other server")
- message_admins("[ADMIN_LOOKUPFLW(usr)] has sent a message to the other server.")
- deadchat_broadcast("[usr.real_name] has sent an outgoing message to the other station(s).", usr)
- CM.lastTimeUsed = world.time
-
- if("purchase_menu")
- state = STATE_PURCHASE
-
- if("buyshuttle")
- if(authenticated==2)
- var/list/shuttles = flatten_list(SSmapping.shuttle_templates)
- var/datum/map_template/shuttle/S = locate(href_list["chosen_shuttle"]) in shuttles
- if(S && istype(S))
- if(SSshuttle.emergency.mode != SHUTTLE_RECALL && SSshuttle.emergency.mode != SHUTTLE_IDLE)
- to_chat(usr, "It's a bit late to buy a new shuttle, don't you think?")
- return
- if(SSshuttle.shuttle_purchased)
- to_chat(usr, "A replacement shuttle has already been purchased.")
- else if(!S.prerequisites_met())
- to_chat(usr, "You have not met the requirements for purchasing this shuttle.")
- else
- var/points_to_check
- var/datum/bank_account/D = SSeconomy.get_dep_account(ACCOUNT_CAR)
- if(D)
- points_to_check = D.account_balance
- if(points_to_check >= S.credit_cost)
- SSshuttle.shuttle_purchased = TRUE
- SSshuttle.unload_preview()
- SSshuttle.load_template(S)
- SSshuttle.existing_shuttle = SSshuttle.emergency
- SSshuttle.action_load(S)
- D.adjust_money(-S.credit_cost)
- minor_announce("[usr.real_name] has purchased [S.name] for [S.credit_cost] credits." , "Shuttle Purchase")
- message_admins("[ADMIN_LOOKUPFLW(usr)] purchased [S.name].")
- log_shuttle("[key_name(usr)] has purchased [S.name].")
- SSblackbox.record_feedback("text", "shuttle_purchase", 1, "[S.name]")
- else
- to_chat(usr, "Insufficient credits.")
-
- if("callshuttle")
- state = STATE_DEFAULT
- if(authenticated && SSshuttle.canEvac(usr))
- state = STATE_CALLSHUTTLE
- if("callshuttle2")
- if(authenticated)
- SSshuttle.requestEvac(usr, href_list["call"])
- if(SSshuttle.emergency.timer)
- post_status("shuttle")
- state = STATE_DEFAULT
- if("cancelshuttle")
- state = STATE_DEFAULT
- if(authenticated)
- state = STATE_CANCELSHUTTLE
- if("cancelshuttle2")
- if(authenticated)
- if(SSshuttle.endvote_passed) //Citadel Edit - endvote passing = no recalls
- say("Warning: Emergency shuttle recalls have been blocked by Central Command due to ongoing crew transfer procedures.")
- else
- SSshuttle.cancelEvac(usr)
- state = STATE_DEFAULT
- if("messagelist")
- currmsg = 0
- state = STATE_MESSAGELIST
- if("viewmessage")
- state = STATE_VIEWMESSAGE
- if (!currmsg)
- if(href_list["message-num"])
- var/msgnum = text2num(href_list["message-num"])
- currmsg = messages[msgnum]
- else
- state = STATE_MESSAGELIST
- if("delmessage")
- state = currmsg ? STATE_DELMESSAGE : STATE_MESSAGELIST
- if("delmessage2")
- if(authenticated)
- if(currmsg)
- if(aicurrmsg == currmsg)
- aicurrmsg = null
- messages -= currmsg
- currmsg = null
- state = STATE_MESSAGELIST
- else
- state = STATE_VIEWMESSAGE
- if("respond")
- var/answer = text2num(href_list["answer"])
- if(!currmsg || !answer || currmsg.possible_answers.len < answer)
- state = STATE_MESSAGELIST
- else
- if(!currmsg.answered)
- currmsg.answered = answer
- log_game("[key_name(usr)] answered [currmsg.title] comm message. Answer : [currmsg.answered]")
- if(currmsg)
- currmsg.answer_callback.InvokeAsync()
- state = STATE_VIEWMESSAGE
- updateDialog()
- if("status")
- state = STATE_STATUSDISPLAY
- if("securitylevel")
- tmp_alertlevel = text2num( href_list["newalertlevel"] )
- if(!tmp_alertlevel)
- tmp_alertlevel = 0
- state = STATE_CONFIRM_LEVEL
- if("changeseclevel")
- state = STATE_ALERT_LEVEL
-
- if("emergencyaccess")
- state = STATE_TOGGLE_EMERGENCY
- if("enableemergency")
- make_maint_all_access()
- log_game("[key_name(usr)] enabled emergency maintenance access.")
- message_admins("[ADMIN_LOOKUPFLW(usr)] enabled emergency maintenance access.")
- deadchat_broadcast("[usr.real_name] enabled emergency maintenance access at [get_area_name(usr, TRUE)].", usr)
- state = STATE_DEFAULT
- if("disableemergency")
- revoke_maint_all_access()
- log_game("[key_name(usr)] disabled emergency maintenance access.")
- message_admins("[ADMIN_LOOKUPFLW(usr)] disabled emergency maintenance access.")
- deadchat_broadcast("[usr.real_name] disabled emergency maintenance access at [get_area_name(usr, TRUE)].", usr)
- state = STATE_DEFAULT
-
- // Status display stuff
- if("setstat")
- playsound(src, "terminal_type", 50, FALSE)
- switch(href_list["statdisp"])
- if("message")
- post_status("message", stat_msg1, stat_msg2)
- if("alert")
- post_status("alert", href_list["alert"])
- else
- post_status(href_list["statdisp"])
-
- if("setmsg1")
- stat_msg1 = reject_bad_text(input("Line 1", "Enter Message Text", stat_msg1) as text|null, 40)
- updateDialog()
- if("setmsg2")
- stat_msg2 = reject_bad_text(input("Line 2", "Enter Message Text", stat_msg2) as text|null, 40)
- updateDialog()
-
- // OMG CENTCOM LETTERHEAD
- if("MessageCentCom")
- if(authenticated)
- if(!checkCCcooldown())
- to_chat(usr, "Arrays recycling. Please stand by.")
- return
- var/input = stripped_input(usr, "Please choose a message to transmit to CentCom via quantum entanglement. Please be aware that this process is very expensive, and abuse will lead to... termination. Transmission does not guarantee a response.", "Send a message to CentCom.", "")
- if(!input || !(usr in view(1,src)) || !checkCCcooldown())
- return
- playsound(src, 'sound/machines/terminal_prompt_confirm.ogg', 50, FALSE)
- CentCom_announce(input, usr)
- to_chat(usr, "Message transmitted to Central Command.")
- for(var/client/X in GLOB.admins)
- if(X.prefs.toggles & SOUND_ADMINHELP)
- SEND_SOUND(X, sound('sound/effects/printer.ogg'))
- window_flash(X, ignorepref = FALSE)
- usr.log_talk(input, LOG_SAY, tag="CentCom announcement")
- deadchat_broadcast("[usr.real_name] has messaged CentCom, \"[input]\" at [get_area_name(usr, TRUE)].", usr)
- CM.lastTimeUsed = world.time
-
- // OMG SYNDICATE ...LETTERHEAD
- if("MessageSyndicate")
- if((authenticated) && (obj_flags & EMAGGED))
- if(!checkCCcooldown())
- to_chat(usr, "Arrays recycling. Please stand by.")
- playsound(src, 'sound/machines/terminal_prompt_deny.ogg', 50, FALSE)
- return
- var/input = stripped_input(usr, "Please choose a message to transmit to \[ABNORMAL ROUTING COORDINATES\] via quantum entanglement. Please be aware that this process is very expensive, and abuse will lead to... termination. Transmission does not guarantee a response.", "Send a message to /??????/.", "")
- if(!input || !(usr in view(1,src)) || !checkCCcooldown())
- return
- playsound(src, 'sound/machines/terminal_prompt_confirm.ogg', 50, FALSE)
- Syndicate_announce(input, usr)
- to_chat(usr, "SYSERR @l(19833)of(transmit.dm): !@$ MESSAGE TRANSMITTED TO SYNDICATE COMMAND.")
- for(var/client/X in GLOB.admins)
- if(X.prefs.toggles & SOUND_ADMINHELP)
- SEND_SOUND(X, sound('sound/effects/printer.ogg'))
- window_flash(X, ignorepref = FALSE)
- usr.log_talk(input, LOG_SAY, tag="Syndicate announcement")
- deadchat_broadcast("[usr.real_name] has messaged the Syndicate, \"[input]\" at [get_area_name(usr, TRUE)].", usr)
- CM.lastTimeUsed = world.time
-
- if("RestoreBackup")
- to_chat(usr, "Backup routing data restored!")
- playsound(src, 'sound/machines/terminal_prompt_confirm.ogg', 50, FALSE)
- obj_flags &= ~EMAGGED
- updateDialog()
-
- if("nukerequest") //When there's no other way
- if(authenticated==2)
- if(!checkCCcooldown())
- to_chat(usr, "Arrays recycling. Please stand by.")
- return
- var/input = stripped_input(usr, "Please enter the reason for requesting the nuclear self-destruct codes. Misuse of the nuclear request system will not be tolerated under any circumstances. Transmission does not guarantee a response.", "Self-Destruct Code Request.","")
- if(!input || !(usr in view(1,src)) || !checkCCcooldown())
- return
- Nuke_request(input, usr)
- to_chat(usr, "Request sent.")
- usr.log_message("has requested the nuclear codes from CentCom with reason \"[input]\"", LOG_SAY)
- priority_announce("The codes for the on-station nuclear self-destruct have been requested by [usr]. Confirmation or denial of this request will be sent shortly.", "Nuclear Self Destruct Codes Requested","commandreport")
- CM.lastTimeUsed = world.time
-
-
- // AI interface
- if("ai-main")
- aicurrmsg = null
- aistate = STATE_DEFAULT
- if("ai-callshuttle")
- aistate = STATE_DEFAULT
- if(SSshuttle.canEvac(usr))
- aistate = STATE_CALLSHUTTLE
- if("ai-callshuttle2")
- SSshuttle.requestEvac(usr, href_list["call"])
- aistate = STATE_DEFAULT
- if("ai-messagelist")
- aicurrmsg = null
- aistate = STATE_MESSAGELIST
- if("ai-viewmessage")
- aistate = STATE_VIEWMESSAGE
- if (!aicurrmsg)
- if(href_list["message-num"])
- var/msgnum = text2num(href_list["message-num"])
- aicurrmsg = messages[msgnum]
- else
- aistate = STATE_MESSAGELIST
- if("ai-delmessage")
- aistate = aicurrmsg ? STATE_DELMESSAGE : STATE_MESSAGELIST
- if("ai-delmessage2")
- if(aicurrmsg)
- if(currmsg == aicurrmsg)
- currmsg = null
- messages -= aicurrmsg
- aicurrmsg = null
- aistate = STATE_MESSAGELIST
- if("ai-respond")
- var/answer = text2num(href_list["answer"])
- if(!aicurrmsg || !answer || aicurrmsg.possible_answers.len < answer)
- aistate = STATE_MESSAGELIST
- else
- if(!aicurrmsg.answered)
- aicurrmsg.answered = answer
- log_game("[key_name(usr)] answered [aicurrmsg.title] comm message. Answer : [aicurrmsg.answered]")
- if(aicurrmsg.answer_callback)
- aicurrmsg.answer_callback.InvokeAsync()
- aistate = STATE_VIEWMESSAGE
- if("ai-status")
- aistate = STATE_STATUSDISPLAY
- if("ai-announce")
- make_announcement(usr, 1)
- if("ai-securitylevel")
- if(security_level_cd > world.time)
- to_chat(usr, "Security level protocols are currently on cooldown. Please stand by.")
- return
- tmp_alertlevel = text2num( href_list["newalertlevel"] )
- if(!tmp_alertlevel)
- tmp_alertlevel = SEC_LEVEL_GREEN
- var/old_level = GLOB.security_level
- if(!tmp_alertlevel)
- tmp_alertlevel = SEC_LEVEL_GREEN
- if(tmp_alertlevel < SEC_LEVEL_GREEN)
- tmp_alertlevel = SEC_LEVEL_GREEN
- if(tmp_alertlevel > SEC_LEVEL_AMBER)
- tmp_alertlevel = SEC_LEVEL_AMBER //Cannot engage delta with this
- set_security_level(tmp_alertlevel)
- security_level_cd = world.time + 15 SECONDS
- if(GLOB.security_level != old_level)
- //Only notify people if an actual change happened
- var/security_level = NUM2SECLEVEL(GLOB.security_level)
- log_game("[key_name(usr)] has changed the security level to [security_level] from [src] at [AREACOORD(usr)].")
- message_admins("[ADMIN_LOOKUPFLW(usr)] has changed the security level to [security_level] from [src] at [AREACOORD(usr)].")
- deadchat_broadcast("[usr.real_name] has changed the security level to [security_level] from [src] at [get_area_name(usr, TRUE)].", usr)
- tmp_alertlevel = 0
- aistate = STATE_DEFAULT
- if("ai-changeseclevel")
- aistate = STATE_ALERT_LEVEL
- if("ai-emergencyaccess")
- aistate = STATE_TOGGLE_EMERGENCY
- if("ai-enableemergency")
- make_maint_all_access()
- log_game("[key_name(usr)] enabled emergency maintenance access.")
- message_admins("[ADMIN_LOOKUPFLW(usr)] enabled emergency maintenance access.")
- deadchat_broadcast("[usr.real_name] enabled emergency maintenance access.", usr)
- aistate = STATE_DEFAULT
- if("ai-disableemergency")
- revoke_maint_all_access()
- log_game("[key_name(usr)] disabled emergency maintenance access.")
- message_admins("[ADMIN_LOOKUPFLW(usr)] disabled emergency maintenance access.")
- deadchat_broadcast("[usr.real_name] disabled emergency maintenance access.", usr)
- aistate = STATE_DEFAULT
-
- updateUsrDialog()
+/// Are we a silicon, OR logged in?
+/obj/machinery/computer/communications/proc/authenticated(mob/user)
+ if (issilicon(user))
+ return TRUE
+ return authenticated
/obj/machinery/computer/communications/attackby(obj/I, mob/user, params)
if(istype(I, /obj/item/card/id))
@@ -445,292 +71,413 @@
/obj/machinery/computer/communications/emag_act(mob/user)
. = ..()
- if(obj_flags & EMAGGED)
+ if (obj_flags & EMAGGED)
return
obj_flags |= EMAGGED
- SSshuttle.shuttle_purchase_requirements_met |= "emagged"
- if(authenticated == 1)
- authenticated = 2
+ if (authenticated)
+ authorize_access = get_all_accesses()
to_chat(user, "You scramble the communication routing circuits!")
playsound(src, 'sound/machines/terminal_alert.ogg', 50, FALSE)
+ return
+
+/obj/machinery/computer/communications/ui_act(action, list/params)
+ var/static/list/approved_states = list(STATE_BUYING_SHUTTLE, STATE_CHANGING_STATUS, STATE_MAIN, STATE_MESSAGES)
+ var/static/list/approved_status_pictures = list("biohazard", "blank", "default", "lockdown", "redalert", "shuttle")
+
+ . = ..()
+ if (.)
+ return
+
+ if (!has_communication())
+ return
+
+ . = TRUE
+
+ switch (action)
+ if ("answerMessage")
+ if (!authenticated(usr))
+ return
+ var/answer_index = text2num(params["answer"])
+ var/message_index = text2num(params["message"])
+ if (!answer_index || !message_index || answer_index < 1 || message_index < 1)
+ return
+ var/datum/comm_message/message = messages[message_index]
+ if (message.answered)
+ return
+ message.answered = answer_index
+ message.answer_callback.InvokeAsync()
+ if ("callShuttle")
+ if (!authenticated(usr) || !SSshuttle.canEvac(usr, TRUE))
+ return
+ var/reason = trim(params["reason"], MAX_MESSAGE_LEN)
+ if (length(reason) < CALL_SHUTTLE_REASON_LENGTH)
+ return
+ SSshuttle.requestEvac(usr, reason)
+ post_status("shuttle")
+ if ("changeSecurityLevel")
+ if (!authenticated_as_silicon_or_captain(usr))
+ return
+
+ // Check if they have
+ if (!issilicon(usr))
+ var/obj/item/held_item = usr.get_active_held_item()
+ var/obj/item/card/id/id_card = held_item?.GetID()
+ if (!istype(id_card))
+ to_chat(usr, "You need to swipe your ID!")
+ playsound(src, 'sound/machines/terminal_prompt_deny.ogg', 50, FALSE)
+ return
+ if (!(ACCESS_CAPTAIN in id_card.access))
+ to_chat(usr, "You are not authorized to do this!")
+ playsound(src, 'sound/machines/terminal_prompt_deny.ogg', 50, FALSE)
+ return
+
+ var/new_sec_level = SECLEVEL2NUM(params["newSecurityLevel"])
+ if (new_sec_level != SEC_LEVEL_GREEN && new_sec_level != SEC_LEVEL_BLUE && new_sec_level != SEC_LEVEL_AMBER)
+ return
+ if (GLOB.security_level == new_sec_level)
+ return
+
+ set_security_level(new_sec_level)
+
+ to_chat(usr, "Authorization confirmed. Modifying security level.")
+ playsound(src, 'sound/machines/terminal_prompt_confirm.ogg', 50, FALSE)
+
+ // Only notify people if an actual change happened
+ log_game("[key_name(usr)] has changed the security level to [params["newSecurityLevel"]] with [src] at [AREACOORD(usr)].")
+ message_admins("[ADMIN_LOOKUPFLW(usr)] has changed the security level to [params["newSecurityLevel"]] with [src] at [AREACOORD(usr)].")
+ deadchat_broadcast(" has changed the security level to [params["newSecurityLevel"]] with [src] at [get_area_name(usr, TRUE)].", "[usr.real_name]", usr)
+
+ alert_level_tick += 1
+ if ("deleteMessage")
+ if (!authenticated(usr))
+ return
+ var/message_index = text2num(params["message"])
+ if (!message_index)
+ return
+ LAZYREMOVE(messages, LAZYACCESS(messages, message_index))
+ if ("makePriorityAnnouncement")
+ if (!authenticated_as_silicon_or_captain(usr))
+ return
+ make_announcement(usr)
+ if ("messageAssociates")
+ if (!authenticated_as_non_silicon_captain(usr))
+ return
+ if (!COOLDOWN_FINISHED(src, important_action_cooldown))
+ return
+
+ playsound(src, 'sound/machines/terminal_prompt_confirm.ogg', 50, FALSE)
+ var/message = trim(html_encode(params["message"]), MAX_MESSAGE_LEN)
+
+ var/emagged = obj_flags & EMAGGED
+ if (emagged)
+ message_syndicate(message, usr)
+ to_chat(usr, "SYSERR @l(19833)of(transmit.dm): !@$ MESSAGE TRANSMITTED TO SYNDICATE COMMAND.")
+ else
+ message_centcom(message, usr)
+ to_chat(usr, "Message transmitted to Central Command.")
+
+ var/associates = emagged ? "the Syndicate": "CentCom"
+ usr.log_talk(message, LOG_SAY, tag = "message to [associates]")
+ deadchat_broadcast(" has messaged [associates], \"[message]\" at [get_area_name(usr, TRUE)].", "[usr.real_name]", usr)
+ COOLDOWN_START(src, important_action_cooldown, IMPORTANT_ACTION_COOLDOWN)
+ if ("purchaseShuttle")
+ var/can_buy_shuttles_or_fail_reason = can_buy_shuttles(usr)
+ if (can_buy_shuttles_or_fail_reason != TRUE)
+ if (can_buy_shuttles_or_fail_reason != FALSE)
+ to_chat(usr, "[can_buy_shuttles_or_fail_reason]")
+ return
+ var/list/shuttles = flatten_list(SSmapping.shuttle_templates)
+ var/datum/map_template/shuttle/shuttle = locate(params["shuttle"]) in shuttles
+ if (!istype(shuttle))
+ return
+ if (!shuttle.prerequisites_met())
+ to_chat(usr, "You have not met the requirements for purchasing this shuttle.")
+ return
+ var/datum/bank_account/bank_account = SSeconomy.get_dep_account(ACCOUNT_CAR)
+ if (bank_account.account_balance < shuttle.credit_cost)
+ return
+ SSshuttle.shuttle_purchased = SHUTTLEPURCHASE_PURCHASED
+ SSshuttle.unload_preview()
+ SSshuttle.existing_shuttle = SSshuttle.emergency
+ SSshuttle.action_load(shuttle, replace = TRUE)
+ bank_account.adjust_money(-shuttle.credit_cost)
+ minor_announce("[usr.real_name] has purchased [shuttle.name] for [shuttle.credit_cost] credits.[shuttle.extra_desc ? " [shuttle.extra_desc]" : ""]" , "Shuttle Purchase")
+ message_admins("[ADMIN_LOOKUPFLW(usr)] purchased [shuttle.name].")
+ log_shuttle("[key_name(usr)] has purchased [shuttle.name].")
+ SSblackbox.record_feedback("text", "shuttle_purchase", 1, shuttle.name)
+ state = STATE_MAIN
+ if ("recallShuttle")
+ // AIs cannot recall the shuttle
+ if (!authenticated(usr) || issilicon(usr))
+ return
+ SSshuttle.cancelEvac(usr)
+ if ("requestNukeCodes")
+ if (!authenticated_as_non_silicon_captain(usr))
+ return
+ if (!COOLDOWN_FINISHED(src, important_action_cooldown))
+ return
+ var/reason = trim(html_encode(params["reason"]), MAX_MESSAGE_LEN)
+ nuke_request(reason, usr)
+ to_chat(usr, "Request sent.")
+ usr.log_message("has requested the nuclear codes from CentCom with reason \"[reason]\"", LOG_SAY)
+ priority_announce("The codes for the on-station nuclear self-destruct have been requested by [usr]. Confirmation or denial of this request will be sent shortly.", "Nuclear Self-Destruct Codes Requested", "commandreport")
+ playsound(src, 'sound/machines/terminal_prompt.ogg', 50, FALSE)
+ COOLDOWN_START(src, important_action_cooldown, IMPORTANT_ACTION_COOLDOWN)
+ if ("restoreBackupRoutingData")
+ if (!authenticated_as_non_silicon_captain(usr))
+ return
+ if (!(obj_flags & EMAGGED))
+ return
+ to_chat(usr, "Backup routing data restored.")
+ playsound(src, 'sound/machines/terminal_prompt_confirm.ogg', 50, FALSE)
+ obj_flags &= ~EMAGGED
+ if ("sendToOtherSector")
+ if (!authenticated_as_non_silicon_captain(usr))
+ return
+ if (!can_send_messages_to_other_sectors(usr))
+ return
+ if (!COOLDOWN_FINISHED(src, important_action_cooldown))
+ return
+
+ var/message = trim(html_encode(params["message"]), MAX_MESSAGE_LEN)
+ if (!message)
+ return
+
+ playsound(src, 'sound/machines/terminal_prompt_confirm.ogg', 50, FALSE)
+
+ var/destination = params["destination"]
+ var/list/payload = list()
+
+ var/network_name = CONFIG_GET(string/cross_comms_network)
+ if (network_name)
+ payload["network"] = network_name
+
+ send2otherserver(station_name(), message, "Comms_Console", destination == "all" ? null : list(destination), additional_data = payload)
+ minor_announce(message, title = "Outgoing message to allied station")
+ usr.log_talk(message, LOG_SAY, tag = "message to the other server")
+ message_admins("[ADMIN_LOOKUPFLW(usr)] has sent a message to the other server\[s].")
+ deadchat_broadcast(" has sent an outgoing message to the other station(s).", "[usr.real_name]", usr)
+
+ COOLDOWN_START(src, important_action_cooldown, IMPORTANT_ACTION_COOLDOWN)
+ if ("setState")
+ if (!authenticated(usr))
+ return
+ if (!(params["state"] in approved_states))
+ return
+ if (state == STATE_BUYING_SHUTTLE && can_buy_shuttles(usr) != TRUE)
+ return
+ set_state(usr, params["state"])
+ playsound(src, "terminal_type", 50, FALSE)
+ if ("setStatusMessage")
+ if (!authenticated(usr))
+ return
+ var/line_one = reject_bad_text(params["lineOne"] || "", MAX_STATUS_LINE_LENGTH)
+ var/line_two = reject_bad_text(params["lineTwo"] || "", MAX_STATUS_LINE_LENGTH)
+ post_status("alert", "blank")
+ post_status("message", line_one, line_two)
+ last_status_display = list(line_one, line_two)
+ playsound(src, "terminal_type", 50, FALSE)
+ if ("setStatusPicture")
+ if (!authenticated(usr))
+ return
+ var/picture = params["picture"]
+ if (!(picture in approved_status_pictures))
+ return
+ post_status("alert", picture)
+ playsound(src, "terminal_type", 50, FALSE)
+ if ("toggleAuthentication")
+ // Log out if we're logged in
+ if (authorize_name)
+ authenticated = FALSE
+ authorize_access = null
+ authorize_name = null
+ playsound(src, 'sound/machines/terminal_off.ogg', 50, FALSE)
+ return
+
+ if (obj_flags & EMAGGED)
+ authenticated = TRUE
+ authorize_access = get_all_accesses()
+ authorize_name = "Unknown"
+ to_chat(usr, "[src] lets out a quiet alarm as its login is overridden.")
+ playsound(src, 'sound/machines/terminal_alert.ogg', 25, FALSE)
+ else if(isliving(usr))
+ var/mob/living/L = usr
+ var/obj/item/card/id/id_card = L.get_idcard(hand_first = TRUE)
+ if (check_access(id_card))
+ authenticated = TRUE
+ authorize_access = id_card.access
+ authorize_name = "[id_card.registered_name] - [id_card.assignment]"
+
+ state = STATE_MAIN
+ playsound(src, 'sound/machines/terminal_on.ogg', 50, FALSE)
+ if ("toggleEmergencyAccess")
+ if (!authenticated_as_silicon_or_captain(usr))
+ return
+ if (GLOB.emergency_access)
+ revoke_maint_all_access()
+ log_game("[key_name(usr)] disabled emergency maintenance access.")
+ message_admins("[ADMIN_LOOKUPFLW(usr)] disabled emergency maintenance access.")
+ deadchat_broadcast(" disabled emergency maintenance access at [get_area_name(usr, TRUE)].", "[usr.real_name]", usr)
+ else
+ make_maint_all_access()
+ log_game("[key_name(usr)] enabled emergency maintenance access.")
+ message_admins("[ADMIN_LOOKUPFLW(usr)] enabled emergency maintenance access.")
+ deadchat_broadcast(" enabled emergency maintenance access at [get_area_name(usr, TRUE)].", "[usr.real_name]", usr)
+
+/obj/machinery/computer/communications/ui_data(mob/user)
+ var/list/data = list(
+ "authenticated" = FALSE,
+ "emagged" = FALSE,
+ "hasConnection" = has_communication(),
+ )
+
+ var/ui_state = issilicon(user) ? cyborg_state : state
+
+ if (authenticated || issilicon(user))
+ data["authenticated"] = TRUE
+ data["canLogOut"] = !issilicon(user)
+ data["page"] = ui_state
+
+ if (obj_flags & EMAGGED)
+ data["emagged"] = TRUE
+
+ switch (ui_state)
+ if (STATE_MAIN)
+ data["canBuyShuttles"] = can_buy_shuttles(user)
+ data["canMakeAnnouncement"] = FALSE
+ data["canMessageAssociates"] = FALSE
+ data["canRecallShuttles"] = !issilicon(user)
+ data["canRequestNuke"] = FALSE
+ data["canSendToSectors"] = FALSE
+ data["canSetAlertLevel"] = FALSE
+ data["canToggleEmergencyAccess"] = FALSE
+ data["importantActionReady"] = COOLDOWN_FINISHED(src, important_action_cooldown)
+ data["shuttleCalled"] = FALSE
+ data["shuttleLastCalled"] = FALSE
+
+ data["alertLevel"] = NUM2SECLEVEL(GLOB.security_level)
+ data["authorizeName"] = authorize_name
+ data["canLogOut"] = !issilicon(user)
+ data["shuttleCanEvacOrFailReason"] = SSshuttle.canEvac(user, TRUE)
+
+ if (authenticated_as_non_silicon_captain(user))
+ data["canMessageAssociates"] = TRUE
+ data["canRequestNuke"] = TRUE
+
+ if (can_send_messages_to_other_sectors(user))
+ data["canSendToSectors"] = TRUE
+
+ var/list/sectors = list()
+ var/our_id = CONFIG_GET(string/cross_comms_name)
+
+ for (var/server in CONFIG_GET(keyed_list/cross_server))
+ if (server == our_id)
+ continue
+ sectors += server
+
+ data["sectors"] = sectors
+
+ if (authenticated_as_silicon_or_captain(user))
+ data["canToggleEmergencyAccess"] = TRUE
+ data["emergencyAccess"] = GLOB.emergency_access
+
+ data["alertLevelTick"] = alert_level_tick
+ data["canMakeAnnouncement"] = TRUE
+ data["canSetAlertLevel"] = issilicon(user) ? "NO_SWIPE_NEEDED" : "SWIPE_NEEDED"
+
+ if (SSshuttle.emergency.mode != SHUTTLE_IDLE && SSshuttle.emergency.mode != SHUTTLE_RECALL)
+ data["shuttleCalled"] = TRUE
+ data["shuttleRecallable"] = SSshuttle.canRecall()
+
+ if (SSshuttle.emergencyCallAmount)
+ data["shuttleCalledPreviously"] = TRUE
+ if (SSshuttle.emergencyLastCallLoc)
+ data["shuttleLastCalled"] = format_text(SSshuttle.emergencyLastCallLoc.name)
+ if (STATE_MESSAGES)
+ data["messages"] = list()
+
+ if (messages)
+ for (var/_message in messages)
+ var/datum/comm_message/message = _message
+ data["messages"] += list(list(
+ "answered" = message.answered,
+ "content" = message.content,
+ "title" = message.title,
+ "possibleAnswers" = message.possible_answers,
+ ))
+ if (STATE_BUYING_SHUTTLE)
+ var/datum/bank_account/bank_account = SSeconomy.get_dep_account(ACCOUNT_CAR)
+ var/list/shuttles = list()
+
+ for (var/shuttle_id in SSmapping.shuttle_templates)
+ var/datum/map_template/shuttle/shuttle_template = SSmapping.shuttle_templates[shuttle_id]
+ if (!shuttle_template.can_be_bought || shuttle_template.credit_cost == INFINITY)
+ continue
+ shuttles += list(list(
+ "name" = shuttle_template.name,
+ "description" = shuttle_template.description,
+ "creditCost" = shuttle_template.credit_cost,
+ "prerequisites" = shuttle_template.prerequisites,
+ "ref" = REF(shuttle_template),
+ ))
+
+ data["budget"] = bank_account.account_balance
+ data["shuttles"] = shuttles
+ if (STATE_CHANGING_STATUS)
+ data["lineOne"] = last_status_display ? last_status_display[1] : ""
+ data["lineTwo"] = last_status_display ? last_status_display[2] : ""
+
+ return data
+
+/obj/machinery/computer/communications/ui_interact(mob/user, datum/tgui/ui)
+ ui = SStgui.try_update_ui(user, src, ui)
+ if (!ui)
+ ui = new(user, src, "CommunicationsConsole")
+ ui.open()
+
+/obj/machinery/computer/communications/ui_static_data(mob/user)
+ return list(
+ "callShuttleReasonMinLength" = CALL_SHUTTLE_REASON_LENGTH,
+ "maxStatusLineLength" = MAX_STATUS_LINE_LENGTH,
+ "maxMessageLength" = MAX_MESSAGE_LEN,
+ )
+
+/// Returns whether or not the communications console can communicate with the station
+/obj/machinery/computer/communications/proc/has_communication()
+ var/turf/current_turf = get_turf(src)
+ var/z_level = current_turf.z
+ return is_station_level(z_level) || is_centcom_level(z_level)
+
+/obj/machinery/computer/communications/proc/set_state(mob/user, new_state)
+ if (issilicon(user))
+ cyborg_state = new_state
+ else
+ state = new_state
+
+/// Returns TRUE if the user can buy shuttles.
+/// If they cannot, returns FALSE or a string detailing why.
+/obj/machinery/computer/communications/proc/can_buy_shuttles(mob/user)
+ if (!SSmapping.config.allow_custom_shuttles)
+ return FALSE
+ if (!authenticated_as_non_silicon_captain(user))
+ return FALSE
+ if (SSshuttle.emergency.mode != SHUTTLE_RECALL && SSshuttle.emergency.mode != SHUTTLE_IDLE)
+ return "The shuttle is already in transit."
+ if (SSshuttle.shuttle_purchased == SHUTTLEPURCHASE_PURCHASED)
+ return "A replacement shuttle has already been purchased."
+ if (SSshuttle.shuttle_purchased == SHUTTLEPURCHASE_FORCED)
+ return "Due to unforseen circumstances, shuttle purchasing is no longer available."
return TRUE
-/obj/machinery/computer/communications/ui_interact(mob/user)
- . = ..()
- if (z > 6)
- to_chat(user, "Unable to establish a connection: \black You're too far away from the station!")
+/obj/machinery/computer/communications/proc/can_send_messages_to_other_sectors(mob/user)
+ if (!authenticated_as_non_silicon_captain(user))
return
- var/dat = ""
- if(SSshuttle.emergency.mode == SHUTTLE_CALL)
- var/timeleft = SSshuttle.emergency.timeLeft()
- dat += "Emergency shuttle\n
\nETA: [timeleft / 60 % 60]:[add_leading(num2text(timeleft % 60), 2, "0")]"
+ return length(CONFIG_GET(keyed_list/cross_server)) > 0
-
- var/datum/browser/popup = new(user, "communications", "Communications Console", 400, 500)
-
- if(issilicon(user))
- var/dat2 = interact_ai(user) // give the AI a different interact proc to limit its access
- if(dat2)
- dat += dat2
- popup.set_content(dat)
- popup.open()
- return
-
- switch(state)
- if(STATE_DEFAULT)
- if (authenticated)
- if(SSshuttle.emergencyCallAmount)
- if(SSshuttle.emergencyLastCallLoc)
- dat += "Most recent shuttle call/recall traced to: [format_text(SSshuttle.emergencyLastCallLoc.name)]
"
- else
- dat += "Unable to trace most recent shuttle call/recall signal.
"
- dat += "Logged in as: [auth_id]"
- dat += "
"
- dat += "
\[ Log Out \]
"
- dat += "
General Functions"
- dat += "
\[ Message List \]"
- switch(SSshuttle.emergency.mode)
- if(SHUTTLE_IDLE, SHUTTLE_RECALL)
- dat += "
\[ Call Emergency Shuttle \]"
- else
- dat += "
\[ Cancel Shuttle Call \]"
-
- dat += "
\[ Set Status Display \]"
- if (authenticated==2)
- dat += "
Captain Functions"
- dat += "
\[ Make a Captain's Announcement \]"
- var/list/cross_servers = CONFIG_GET(keyed_list/cross_server)
- var/our_id = CONFIG_GET(string/cross_comms_name)
- if(cross_servers.len)
- for(var/server in cross_servers)
- if(server == our_id)
- continue
- dat += "
\[ Send a message to station in [server] sector. \]"
- if(cross_servers.len > 2)
- dat += "
\[ Send a message to all allied stations \]"
- if(SSmapping.config.allow_custom_shuttles)
- dat += "
\[ Purchase Shuttle \]"
- dat += "
\[ Change Alert Level \]"
- dat += "
\[ Emergency Maintenance Access \]"
- dat += "
\[ Request Nuclear Authentication Codes \]"
- if(!(obj_flags & EMAGGED))
- dat += "
\[ Send Message to CentCom \]"
- else
- dat += "
\[ Send Message to \[UNKNOWN\] \]"
- dat += "
\[ Restore Backup Routing Data \]"
- else
- dat += "
\[ Log In \]"
- if(STATE_CALLSHUTTLE)
- dat += get_call_shuttle_form()
- playsound(src, 'sound/machines/terminal_prompt.ogg', 50, FALSE)
- if(STATE_CANCELSHUTTLE)
- dat += get_cancel_shuttle_form()
- playsound(src, 'sound/machines/terminal_prompt.ogg', 50, FALSE)
- if(STATE_MESSAGELIST)
- dat += "Messages:"
- for(var/i in 1 to messages.len)
- var/datum/comm_message/M = messages[i]
- dat += "
[M.title]"
- playsound(src, 'sound/machines/terminal_prompt_confirm.ogg', 50, FALSE)
- if(STATE_VIEWMESSAGE)
- if (currmsg)
- dat += "[currmsg.title]
[currmsg.content]"
- if(!currmsg.answered && currmsg.possible_answers.len)
- for(var/i in 1 to currmsg.possible_answers.len)
- var/answer = currmsg.possible_answers[i]
- dat += "
\[ Answer : [answer] \]"
- else if(currmsg.answered)
- var/answered = currmsg.possible_answers[currmsg.answered]
- dat += "
Archived Answer : [answered]"
- dat += "
\[ Delete \]"
- else
- aistate = STATE_MESSAGELIST
- attack_hand(user)
- return
- if(STATE_DELMESSAGE)
- if (currmsg)
- dat += "Are you sure you want to delete this message? \[ OK | Cancel \]"
- else
- state = STATE_MESSAGELIST
- attack_hand(user)
- return
- if(STATE_STATUSDISPLAY)
- dat += "Set Status Displays
"
- dat += "\[ Clear \]
"
- dat += "\[ Shuttle ETA \]
"
- dat += "\[ Message \]"
- dat += "
"
- dat += "\[ Alert: None |"
- dat += " Red Alert |"
- dat += " Lockdown |"
- dat += " Biohazard \]
"
- playsound(src, 'sound/machines/terminal_prompt_confirm.ogg', 50, FALSE)
- if(STATE_ALERT_LEVEL)
- dat += "Current alert level: [NUM2SECLEVEL(GLOB.security_level)]
"
- if(GLOB.security_level == SEC_LEVEL_DELTA)
- dat += "The self-destruct mechanism is active. Find a way to deactivate the mechanism to lower the alert level or evacuate."
- else
- dat += "Amber
"
- dat += "Blue
"
- dat += "Green"
- if(STATE_CONFIRM_LEVEL)
- dat += "Current alert level: [NUM2SECLEVEL(GLOB.security_level)]
"
- dat += "Confirm the change to: [NUM2SECLEVEL(tmp_alertlevel)]
"
- dat += "Swipe ID to confirm change.
"
- if(STATE_TOGGLE_EMERGENCY)
- playsound(src, 'sound/machines/terminal_prompt.ogg', 50, FALSE)
- if(GLOB.emergency_access == 1)
- dat += "Emergency Maintenance Access is currently ENABLED"
- dat += "
Restore maintenance access restrictions?
\[ OK | Cancel \]"
- else
- dat += "Emergency Maintenance Access is currently DISABLED"
- dat += "
Lift access restrictions on maintenance and external airlocks?
\[ OK | Cancel \]"
-
- if(STATE_PURCHASE)
- var/datum/bank_account/D = SSeconomy.get_dep_account(ACCOUNT_CAR)
- dat += "Budget: [D.account_balance] Credits.
"
- dat += "
"
- dat += "Caution: Purchasing dangerous shuttles may lead to mutiny and/or death.
"
- dat += "
"
- for(var/shuttle_id in SSmapping.shuttle_templates)
- var/datum/map_template/shuttle/S = SSmapping.shuttle_templates[shuttle_id]
- if(S.can_be_bought && S.credit_cost < INFINITY)
- dat += "[S.name] | [S.credit_cost] Credits
"
- dat += "[S.description]
"
- if(S.prerequisites)
- dat += "Prerequisites: [S.prerequisites]
"
- dat += "(Purchase)
"
-
- dat += "
\[ [(state != STATE_DEFAULT) ? "Main Menu | " : ""]Close \]"
-
- popup.set_content(dat)
- popup.open()
-
-/obj/machinery/computer/communications/proc/get_javascript_header(form_id)
- var/dat = {""}
- return dat
-
-/obj/machinery/computer/communications/proc/get_call_shuttle_form(ai_interface = 0)
- var/form_id = "callshuttle"
- var/dat = get_javascript_header(form_id)
- dat += "