Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

TG live PR #112

Merged
merged 155 commits into from
Sep 28, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
155 commits
Select commit Hold shift + click to select a range
adc8eb4
equalises `screech.ogg` (#86818)
Sadboysuss Sep 22, 2024
e7f83af
Automatic changelog for PR #86818 [ci skip]
tgstation-ci[bot] Sep 22, 2024
3853bb5
replace magma.ogg with a new sound (#86821)
Sadboysuss Sep 22, 2024
d1c80c5
Automatic changelog for PR #86821 [ci skip]
tgstation-ci[bot] Sep 22, 2024
ccbad77
Build(deps): Bump JamesIves/github-pages-deploy-action from 3.7.1 to …
dependabot[bot] Sep 22, 2024
d3393ee
Build(deps): Bump actions/stale from 4 to 9 (#86804)
dependabot[bot] Sep 22, 2024
e1d37f5
Build(deps): Bump actions/setup-python from 1 to 5 (#86805)
dependabot[bot] Sep 22, 2024
e93e920
Build(deps): Bump robinraju/release-downloader from 1.9 to 1.11 (#86806)
dependabot[bot] Sep 22, 2024
f9d06dc
Fix TGS Test (#86840)
Cyberboss Sep 22, 2024
061ba1a
Intentional *scream is audible again, now w/ 5s cooldown (#86782)
Likteer Sep 22, 2024
ddfb7c3
Emergency shuttle console no longer reopens its UI on its own (#86822)
SmArtKar Sep 22, 2024
42cb158
Replaces QDEL_NULL with QDEL_LIST in infective component (#86812)
SmArtKar Sep 22, 2024
5c0112c
Automatic changelog for PR #86782 [ci skip]
tgstation-ci[bot] Sep 22, 2024
8b3d495
Automatic changelog for PR #86822 [ci skip]
tgstation-ci[bot] Sep 22, 2024
a10a06a
Automatic changelog for PR #86812 [ci skip]
tgstation-ci[bot] Sep 22, 2024
58f75ea
Express console code refactor, cleanup and fixes (#86634)
SmArtKar Sep 22, 2024
5ecd64d
Automatic changelog for PR #86634 [ci skip]
tgstation-ci[bot] Sep 22, 2024
05ea6b9
Build(deps): Bump actions/setup-dotnet from 2 to 4 (#86801)
dependabot[bot] Sep 22, 2024
981890b
Add radial icons and overlays to linkable fishing spots (#86774)
Ghommie Sep 22, 2024
5108d16
Automatic changelog for PR #86774 [ci skip]
tgstation-ci[bot] Sep 22, 2024
66d88ee
Fishing skill now improves cast range and reeling objects, and slight…
Ghommie Sep 22, 2024
1a7c6a0
Automatic changelog for PR #86776 [ci skip]
tgstation-ci[bot] Sep 22, 2024
ff2760e
Adds new tasty fish to deep fryers. (#86690)
Ghommie Sep 22, 2024
0840146
Automatic changelog for PR #86690 [ci skip]
tgstation-ci[bot] Sep 22, 2024
431bbf7
Changeling buffs: Absorbs increment your ability to readapt, last res…
Metekillot Sep 22, 2024
a15f716
Automatic changelog for PR #86605 [ci skip]
tgstation-ci[bot] Sep 22, 2024
b9fad92
Adds achievement-unlockables hats for orbies (feat. big rollies from …
Ghommie Sep 22, 2024
6b4de75
Automatic changelog for PR #86098 [ci skip]
tgstation-ci[bot] Sep 22, 2024
a2f3e5f
[NO GBP] Nerfs Void Conduit. (#86808)
EnterTheJake Sep 22, 2024
53dbf2e
Automatic changelog for PR #86808 [ci skip]
tgstation-ci[bot] Sep 22, 2024
6cb8ce7
Automatic changelog compile [ci skip]
tgstation-ci[bot] Sep 23, 2024
7daf456
Makes the Beer Six pack use cans. (#86830)
theselfish Sep 23, 2024
dd96e3b
Automatic changelog for PR #86830 [ci skip]
tgstation-ci[bot] Sep 23, 2024
09998dd
Fixes some stuff with the Living Heart ritual (#86831)
Absolucy Sep 23, 2024
ccddd23
Automatic changelog for PR #86831 [ci skip]
tgstation-ci[bot] Sep 23, 2024
8c494a4
Automatic changelog compile [ci skip]
tgstation-ci[bot] Sep 24, 2024
58501dc
Reorganizes the sound folder (#86726)
Sadboysuss Sep 24, 2024
e27489d
Automatic changelog for PR #86726 [ci skip]
tgstation-ci[bot] Sep 24, 2024
5e66d87
Fixes soapbox component hooking into literally every atom [NO GBP] (#…
imedial Sep 24, 2024
96fa7bd
Automatic changelog for PR #86861 [ci skip]
tgstation-ci[bot] Sep 24, 2024
196960f
Gelatinous cubes stop digesting dead mobs instead of mobs with 200 br…
Sealed101 Sep 24, 2024
c1ca5c5
Automatic changelog for PR #86817 [ci skip]
tgstation-ci[bot] Sep 24, 2024
0571357
Fixes storage UI breaking upon an observer detaching while having you…
SmArtKar Sep 24, 2024
f3f13d3
Automatic changelog for PR #86842 [ci skip]
tgstation-ci[bot] Sep 24, 2024
48b7b89
Demotes the asstainers (#86880)
MrMelbert Sep 24, 2024
6a654b1
Fix link for rules button (#86860)
Jewelry-x Sep 24, 2024
e17da3b
Automatic changelog for PR #86860 [ci skip]
tgstation-ci[bot] Sep 24, 2024
418e322
[NO GBP] Fixes the fishing experience gain from reeling objects (#86845)
Ghommie Sep 24, 2024
9e3cf3f
Fix the greeting message you get upon becoming an imaginary friend in…
00-Steven Sep 24, 2024
7055202
Automatic changelog for PR #86866 [ci skip]
tgstation-ci[bot] Sep 24, 2024
bb8fdcb
Automatic changelog compile [ci skip]
tgstation-ci[bot] Sep 25, 2024
3f36ddf
Emote audio cooldown is now shared between all audible emotes (#86846)
Sadboysuss Sep 25, 2024
56f1310
Automatic changelog for PR #86846 [ci skip]
tgstation-ci[bot] Sep 25, 2024
5717a49
Fixes an oversight with bank accounts (#86850)
vinylspiders Sep 25, 2024
15a0ca0
Fixes augs not being able to cable heal if they aren't wearing a jump…
Metekillot Sep 25, 2024
50a9c7f
Automatic changelog for PR #86705 [ci skip]
tgstation-ci[bot] Sep 25, 2024
5955036
Un-varedits kilo whiteship turrets (#86855)
SmArtKar Sep 25, 2024
7989074
Automatic changelog for PR #86855 [ci skip]
tgstation-ci[bot] Sep 25, 2024
24548c1
Respriting the experimentor (#86848)
Ghommie Sep 25, 2024
26cc667
Automatic changelog for PR #86848 [ci skip]
tgstation-ci[bot] Sep 25, 2024
ddc6a2f
Add fire proof flag to item that are lava proofed by xenobio potion (…
TheBoondock Sep 25, 2024
e1637f7
Automatic changelog for PR #86871 [ci skip]
tgstation-ci[bot] Sep 25, 2024
df3fc8c
Fixes cat ear layering, makes getFlatIcon account for RESET_COLOR on …
00-Steven Sep 25, 2024
8c3c9a6
Automatic changelog for PR #86757 [ci skip]
tgstation-ci[bot] Sep 25, 2024
0a3ec28
Implement functionality to toggle broadcast camera microphone on and …
Jewelry-x Sep 25, 2024
bcfe54f
Automatic changelog for PR #86694 [ci skip]
tgstation-ci[bot] Sep 25, 2024
c42d4dc
Health Analyzer Rework (medial mains inquire within) (#86666)
MrMelbert Sep 25, 2024
858d488
Automatic changelog for PR #86666 [ci skip]
tgstation-ci[bot] Sep 25, 2024
fac6932
Automatic changelog compile [ci skip]
tgstation-ci[bot] Sep 26, 2024
1cfb3bf
removes a few unused sound files (#86875)
Sadboysuss Sep 26, 2024
10909f4
Fixes flashing render when positioning cached TGUI windows (at cost …
ZeWaka Sep 26, 2024
c95458f
Fixes water overlays showing on toilets facing directions other than …
Ghommie Sep 26, 2024
1f401f2
Automatic changelog for PR #86868 [ci skip]
tgstation-ci[bot] Sep 26, 2024
b924587
Automatic changelog for PR #86878 [ci skip]
tgstation-ci[bot] Sep 26, 2024
8fa9207
Removes particles from Slimed and Slime Food status effects to fix fp…
Iamgoofball Sep 26, 2024
49a7e23
Automatic changelog for PR #86701 [ci skip]
tgstation-ci[bot] Sep 26, 2024
42ff7bf
[NO GBP] The Pun Pun job trait actually removes the premapped Pun Pun…
Ghommie Sep 26, 2024
52d81d9
Automatic changelog for PR #86877 [ci skip]
tgstation-ci[bot] Sep 26, 2024
ad111f4
Spacemove refactor - Newtonian physics (#84869)
SmArtKar Sep 26, 2024
1922158
Automatic changelog for PR #84869 [ci skip]
tgstation-ci[bot] Sep 26, 2024
54d9795
fixes password paper in museum (#86913)
mc-oofert Sep 26, 2024
25e4346
Automatic changelog for PR #86913 [ci skip]
tgstation-ci[bot] Sep 26, 2024
68b3e98
You can now smack people on the head with cardboard rolls and wrappin…
optimumtact Sep 26, 2024
4fd9d30
Automatic changelog for PR #86882 [ci skip]
tgstation-ci[bot] Sep 26, 2024
4221033
Lead pipe readjustments (#86835)
Sadboysuss Sep 26, 2024
2dd3af7
Automatic changelog for PR #86835 [ci skip]
tgstation-ci[bot] Sep 26, 2024
9a7dbd6
Fix for sprite not updating properly when planting a new seed (#86876)
Jewelry-x Sep 26, 2024
7ced5e9
you can now use the toy codex cicatrix as base for the codex ritual (…
carlarctg Sep 26, 2024
6e99f55
Automatic changelog for PR #86876 [ci skip]
tgstation-ci[bot] Sep 26, 2024
a985fbe
Automatic changelog for PR #86824 [ci skip]
tgstation-ci[bot] Sep 26, 2024
38c5210
maintenance for click.ogg (#86874)
Sadboysuss Sep 26, 2024
d4ac95a
Nobody expects the span inquisition: replaces most <span>s with macro…
SmArtKar Sep 26, 2024
693b348
Automatic changelog for PR #86874 [ci skip]
tgstation-ci[bot] Sep 26, 2024
c7f02d7
Fixes touch spells on_hand hit signals (#86849)
EnterTheJake Sep 26, 2024
37b6ac2
Automatic changelog for PR #86849 [ci skip]
tgstation-ci[bot] Sep 26, 2024
06675a4
Removes the chunkyfingers trait from insuls (#86903)
dragomagol Sep 26, 2024
a8af27f
Automatic changelog for PR #86903 [ci skip]
tgstation-ci[bot] Sep 26, 2024
60dea65
Fix broken span defines, fixes broken traitor panel (#86924)
00-Steven Sep 26, 2024
811f430
Automatic changelog for PR #86924 [ci skip]
tgstation-ci[bot] Sep 26, 2024
e2cd476
Automatic changelog compile [ci skip]
tgstation-ci[bot] Sep 27, 2024
3ce81d8
Removes intentional ling check in health analyzer (#86893)
MrMelbert Sep 27, 2024
d46d0fd
Automatic changelog for PR #86893 [ci skip]
tgstation-ci[bot] Sep 27, 2024
66dc106
Replaces the unusable Blink spell in the Necromancer deathmatch kit w…
Rhials Sep 27, 2024
cae7155
Automatic changelog for PR #86890 [ci skip]
tgstation-ci[bot] Sep 27, 2024
a6bf8c1
Removes a bookcase from the holdout simulation (#86907)
Goat-Real Sep 27, 2024
42863ba
Fixes typos with the closets (#86900)
Soupfgc Sep 27, 2024
eda0774
Automatic changelog for PR #86900 [ci skip]
tgstation-ci[bot] Sep 27, 2024
3ceaf41
Automatic changelog for PR #86907 [ci skip]
tgstation-ci[bot] Sep 27, 2024
2cf34ec
Reduces volume of the nuke sound (#86888)
Sadboysuss Sep 27, 2024
7f2961a
Automatic changelog for PR #86888 [ci skip]
tgstation-ci[bot] Sep 27, 2024
18ffabc
Laser Musket & Smoothbore Disabler BUFFS (Crank it AND Run) (#86867)
Cheshify Sep 27, 2024
764ad4f
Automatic changelog for PR #86867 [ci skip]
tgstation-ci[bot] Sep 27, 2024
20d9e3a
Gives Debug chem synthesizer temperature control (#86911)
SyncIt21 Sep 27, 2024
078a242
Automatic changelog for PR #86911 [ci skip]
tgstation-ci[bot] Sep 27, 2024
12ffd52
Automatic changelog compile [ci skip]
tgstation-ci[bot] Sep 28, 2024
5b8358c
raptor retaliate targetting fix (#86925)
Ben10Omintrix Sep 28, 2024
b275647
Automatic changelog for PR #86925 [ci skip]
tgstation-ci[bot] Sep 28, 2024
e5f023a
Fixes polling causing an unexpected return value when there are 0 pla…
vinylspiders Sep 28, 2024
36fb349
Automatic changelog for PR #86912 [ci skip]
tgstation-ci[bot] Sep 28, 2024
2c9f0ad
Mindswap can no longer be used inside of pipes (#86909)
SmArtKar Sep 28, 2024
0cadbaf
Automatic changelog for PR #86909 [ci skip]
tgstation-ci[bot] Sep 28, 2024
83ec2a2
[NO GBP] Changes stagger animation to use animate chains instead of s…
SmArtKar Sep 28, 2024
97c2492
Fix air alarm helper to ignore gas when appropriate (#86915)
timothymtorres Sep 28, 2024
ab71e87
Automatic changelog for PR #86897 [ci skip]
tgstation-ci[bot] Sep 28, 2024
d260b6f
Fix air alarms not updating icon (#86914)
timothymtorres Sep 28, 2024
ff057be
Automatic changelog for PR #86915 [ci skip]
tgstation-ci[bot] Sep 28, 2024
fb3ae62
Adds missing venue prices for certain foods and reagents (#86873)
SmArtKar Sep 28, 2024
f845655
Automatic changelog for PR #86914 [ci skip]
tgstation-ci[bot] Sep 28, 2024
9cb7c7c
Automatic changelog for PR #86873 [ci skip]
tgstation-ci[bot] Sep 28, 2024
ba7e7d3
Fix missing pour sounds from reagent dispensers (#86859)
timothymtorres Sep 28, 2024
5994ab2
Automatic changelog for PR #86859 [ci skip]
tgstation-ci[bot] Sep 28, 2024
777a8ef
Show a feedback message for whispers you cannot hear (#86791)
00-Steven Sep 28, 2024
7cc0f6e
Automatic changelog for PR #86791 [ci skip]
tgstation-ci[bot] Sep 28, 2024
2966308
Fix air alarm not checking missing gases (#86918)
timothymtorres Sep 28, 2024
7a35055
Automatic changelog for PR #86918 [ci skip]
tgstation-ci[bot] Sep 28, 2024
1bfe537
Fix air alarms warning message to use pressure & temp settings (#86917)
timothymtorres Sep 28, 2024
8f8f9fd
Automatic changelog for PR #86917 [ci skip]
tgstation-ci[bot] Sep 28, 2024
652a253
Fixes ethereal APC drain/charge attack (#86910)
SyncIt21 Sep 28, 2024
8d0ca9d
Adjusts offset values for Nukie Infiltrator shuttle's nav console so …
Sealed101 Sep 28, 2024
fe1987b
Automatic changelog for PR #86910 [ci skip]
tgstation-ci[bot] Sep 28, 2024
5fa6a53
Automatic changelog for PR #86922 [ci skip]
tgstation-ci[bot] Sep 28, 2024
80e9133
Fix Meta and Wawa coldrooms (#86923)
timothymtorres Sep 28, 2024
f24b601
Automatic changelog for PR #86923 [ci skip]
tgstation-ci[bot] Sep 28, 2024
47430a4
A smattering of boulder-related QOL and fixes. (#86834)
ArcaneMusic Sep 28, 2024
5cff026
Automatic changelog for PR #86834 [ci skip]
tgstation-ci[bot] Sep 28, 2024
38b3031
Add NTNRC client to pAIs digital messenger (#86820)
00-Steven Sep 28, 2024
3347370
Automatic changelog for PR #86820 [ci skip]
tgstation-ci[bot] Sep 28, 2024
199a5ef
Fix imaginary friends not being able to hear their host, some minor a…
00-Steven Sep 28, 2024
a4e5d26
Automatic changelog for PR #86863 [ci skip]
tgstation-ci[bot] Sep 28, 2024
396ed10
Imaginary friend smite shows target name to ghosts polled, now also t…
00-Steven Sep 28, 2024
17e376c
Automatic changelog for PR #86865 [ci skip]
tgstation-ci[bot] Sep 28, 2024
509c618
Merge branch 'master' into tg-live
carpotoxin Sep 28, 2024
85ae872
Merge branch 'main' into tg-live
carpotoxin Sep 28, 2024
c39cd4f
test
carpotoxin Sep 28, 2024
ee4804a
Revert "test"
carpotoxin Sep 28, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
The diff you're trying to view is too large. We only load the first 3000 changed files.
2 changes: 1 addition & 1 deletion .github/workflows/ci_suite.yml
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ jobs:
path: tools/icon_cutter/cache
key: ${{ runner.os }}-cutter-${{ hashFiles('dependencies.sh') }}
- name: Install OpenDream
uses: robinraju/release-downloader@v1.9
uses: robinraju/release-downloader@v1.11
with:
repository: "OpenDreamProject/OpenDream"
tag: "latest"
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/compile_changelogs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ jobs:

- name: "Setup python"
if: steps.value_holder.outputs.ACTIONS_ENABLED
uses: actions/setup-python@v1
uses: actions/setup-python@v5
with:
python-version: '3.x'

Expand Down
11 changes: 5 additions & 6 deletions .github/workflows/generate_documentation.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,10 +27,9 @@ jobs:
touch dmdoc/.nojekyll
echo codedocs.tgstation13.org > dmdoc/CNAME
- name: Deploy
uses: JamesIves/github-pages-deploy-action@3.7.1
uses: JamesIves/github-pages-deploy-action@v4.6.4
with:
BRANCH: gh-pages
CLEAN: true
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
SINGLE_COMMIT: true
FOLDER: dmdoc
branch: gh-pages
clean: true
single-commit: true
folder: dmdoc
2 changes: 1 addition & 1 deletion .github/workflows/stale.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
runs-on: ubuntu-22.04

steps:
- uses: actions/stale@v4
- uses: actions/stale@v9
with:
repo-token: ${{ secrets.GITHUB_TOKEN }}
stale-pr-message: "This PR has been inactive for long enough to be automatically marked as stale. This means it is at risk of being auto closed in ~ 7 days, please address any outstanding review items and ensure your PR is finished, if these are all true and you are auto-staled anyway, you need to actively ask maintainers if your PR will be merged. Once you have done any of the previous actions then you should request a maintainer remove the stale label on your PR, to reset the stale timer. If you feel no maintainer will respond in that time, you may wish to close this PR youself, while you seek maintainer comment, as you will then be able to reopen the PR yourself"
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/tgs_test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ jobs:
- 5000:5000 #Can't use env here for some reason
steps:
- name: Setup dotnet
uses: actions/setup-dotnet@v2
uses: actions/setup-dotnet@v4
with:
dotnet-version: 8.0.x

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@
/obj/effect/step_trigger/sound_effect{
happens_once = 1;
name = "\proper a grave mistake";
sound = 'sound/hallucinations/i_see_you1.ogg';
sound = 'sound/effects/hallucinations/i_see_you1.ogg';
triggerer_only = 1
},
/obj/effect/step_trigger/message{
Expand Down
6 changes: 3 additions & 3 deletions _maps/RandomZLevels/museum.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -1235,7 +1235,7 @@
},
/obj/item/reagent_containers/cup/glass/coffee,
/obj/item/paper/fluff/scrambled_pass{
puzzle_id = "museum_r_wing_puzzle"
puzzle_id = "museum_right_wing"
},
/turf/open/floor/iron/dark,
/area/awaymission/museum)
Expand Down Expand Up @@ -34926,7 +34926,7 @@ FK
FK
FK
FK
FO
FK
FK
FK
FK
Expand Down Expand Up @@ -37490,7 +37490,7 @@ GQ
FK
FK
vb
FK
FO
FK
FK
PP
Expand Down
1 change: 1 addition & 0 deletions _maps/map_files/MetaStation/MetaStation.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -10266,6 +10266,7 @@
/obj/item/food/popsicle/creamsicle_orange,
/obj/machinery/airalarm/directional/north,
/obj/effect/turf_decal/tile/dark_blue/half/contrasted,
/obj/effect/mapping_helpers/airalarm/tlv_cold_room,
/turf/open/floor/iron/kitchen_coldroom,
/area/station/medical/coldroom)
"dLq" = (
Expand Down
86 changes: 54 additions & 32 deletions _maps/map_files/wawastation/wawastation.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -1631,7 +1631,7 @@
/obj/effect/landmark/event_spawn,
/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2,
/turf/open/floor/iron/kitchen_coldroom/freezerfloor,
/area/station/service/kitchen)
/area/station/service/kitchen/coldroom)
"aAk" = (
/obj/machinery/holopad,
/obj/effect/turf_decal/box,
Expand Down Expand Up @@ -2135,7 +2135,7 @@
/obj/structure/reagent_dispensers/cooking_oil,
/obj/machinery/camera/autoname/directional/south,
/turf/open/floor/iron/kitchen_coldroom/freezerfloor,
/area/station/service/kitchen)
/area/station/service/kitchen/coldroom)
"aJz" = (
/obj/structure/railing,
/obj/structure/table,
Expand Down Expand Up @@ -4200,7 +4200,7 @@
"byb" = (
/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4,
/turf/open/floor/iron/kitchen_coldroom/freezerfloor,
/area/station/service/kitchen)
/area/station/service/kitchen/coldroom)
"byf" = (
/obj/structure/closet/emcloset/anchored,
/turf/open/floor/plating,
Expand Down Expand Up @@ -8267,7 +8267,7 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/mob/living/basic/goat/pete,
/turf/open/floor/iron/kitchen_coldroom/freezerfloor,
/area/station/service/kitchen)
/area/station/service/kitchen/coldroom)
"cYP" = (
/obj/effect/landmark/event_spawn,
/obj/structure/cable,
Expand Down Expand Up @@ -10056,7 +10056,7 @@
"dCh" = (
/obj/machinery/gibber,
/turf/open/floor/iron/kitchen_coldroom/freezerfloor,
/area/station/service/kitchen)
/area/station/service/kitchen/coldroom)
"dCi" = (
/obj/structure/table/reinforced/rglass,
/obj/item/storage/backpack/duffelbag/sec,
Expand Down Expand Up @@ -16256,7 +16256,7 @@
"fNy" = (
/obj/structure/closet/secure_closet/freezer/meat,
/turf/open/floor/iron/kitchen_coldroom/freezerfloor,
/area/station/service/kitchen)
/area/station/service/kitchen/coldroom)
"fNB" = (
/obj/effect/turf_decal/tile/red/anticorner/contrasted{
dir = 1
Expand Down Expand Up @@ -36207,6 +36207,9 @@
/obj/effect/turf_decal/sand/plating,
/turf/open/floor/plating,
/area/station/maintenance/department/cargo)
"mMT" = (
/turf/closed/wall,
/area/station/service/kitchen/coldroom)
"mNl" = (
/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2,
/turf/open/floor/iron,
Expand Down Expand Up @@ -37574,6 +37577,13 @@
/obj/structure/disposalpipe/segment,
/turf/open/floor/iron/white,
/area/station/medical/medbay/central)
"nlz" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/obj/structure/cable,
/obj/machinery/power/apc/auto_name/directional/west,
/turf/open/floor/iron/kitchen_coldroom/freezerfloor,
/area/station/service/kitchen/coldroom)
"nlI" = (
/obj/effect/landmark/start/depsec/engineering,
/obj/effect/turf_decal/trimline/red/filled/line{
Expand Down Expand Up @@ -40888,8 +40898,10 @@
/area/station/maintenance/department/science)
"oBU" = (
/obj/machinery/food_cart,
/obj/machinery/airalarm/directional/north,
/obj/effect/mapping_helpers/airalarm/tlv_cold_room,
/turf/open/floor/iron/kitchen_coldroom/freezerfloor,
/area/station/service/kitchen)
/area/station/service/kitchen/coldroom)
"oCb" = (
/obj/machinery/atmospherics/pipe/smart/simple/green/visible{
dir = 1
Expand Down Expand Up @@ -44775,7 +44787,7 @@
/obj/structure/kitchenspike,
/obj/machinery/light/directional/west,
/turf/open/floor/iron/kitchen_coldroom/freezerfloor,
/area/station/service/kitchen)
/area/station/service/kitchen/coldroom)
"pTt" = (
/obj/structure/disposalpipe/segment{
dir = 9
Expand Down Expand Up @@ -47955,6 +47967,16 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/iron/white,
/area/station/ai_monitored/turret_protected/ai_upload_foyer)
"rbt" = (
/obj/machinery/door/airlock{
name = "Kitchen Cold Room"
},
/obj/effect/mapping_helpers/airlock/access/all/service/kitchen,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/obj/structure/cable,
/turf/open/floor/iron/kitchen_coldroom/freezerfloor,
/area/station/service/kitchen/coldroom)
"rbw" = (
/obj/effect/decal/cleanable/dirt,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden,
Expand Down Expand Up @@ -50245,7 +50267,7 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/iron/kitchen_coldroom/freezerfloor,
/area/station/service/kitchen)
/area/station/service/kitchen/coldroom)
"rNJ" = (
/turf/closed/wall,
/area/station/maintenance/solars/port/fore)
Expand Down Expand Up @@ -53736,7 +53758,7 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/iron/kitchen_coldroom/freezerfloor,
/area/station/service/kitchen)
/area/station/service/kitchen/coldroom)
"sUM" = (
/obj/item/radio/intercom/directional/west,
/turf/open/openspace,
Expand Down Expand Up @@ -55255,7 +55277,7 @@
/obj/structure/kitchenspike,
/obj/item/radio/intercom/directional/west,
/turf/open/floor/iron/kitchen_coldroom/freezerfloor,
/area/station/service/kitchen)
/area/station/service/kitchen/coldroom)
"txo" = (
/obj/effect/turf_decal/caution/stand_clear,
/turf/open/floor/engine,
Expand Down Expand Up @@ -59791,7 +59813,7 @@
"uZg" = (
/obj/machinery/icecream_vat,
/turf/open/floor/iron/kitchen_coldroom/freezerfloor,
/area/station/service/kitchen)
/area/station/service/kitchen/coldroom)
"uZx" = (
/turf/closed/wall,
/area/station/hallway/primary/central)
Expand Down Expand Up @@ -93333,10 +93355,10 @@ bIi
acc
jrX
gGm
enu
enu
enu
enu
mMT
mMT
mMT
mMT
edv
eBb
hRB
Expand Down Expand Up @@ -93589,12 +93611,12 @@ kYl
sUD
dGc
fDN
enu
enu
mMT
mMT
twW
pTn
enu
enu
mMT
mMT
hwk
hRB
jkF
Expand Down Expand Up @@ -93846,12 +93868,12 @@ heh
jUd
acc
fDN
enu
mMT
uZg
byb
rNs
rNs
sUI
nlz
rbt
cXL
enu
tGt
Expand Down Expand Up @@ -94103,12 +94125,12 @@ acc
acc
acc
fDN
enu
mMT
oBU
aAg
cYH
aJv
enu
mMT
drJ
shG
vMb
Expand Down Expand Up @@ -94360,12 +94382,12 @@ acB
jmn
atX
mUW
enu
mMT
fNy
rNs
rNs
dCh
enu
mMT
alP
enu
nii
Expand Down Expand Up @@ -94617,12 +94639,12 @@ gGS
bcu
bcu
pPy
enu
enu
mMT
mMT
sUI
enu
enu
enu
mMT
mMT
mMT
duS
pQM
pYu
Expand Down
9 changes: 1 addition & 8 deletions _maps/shuttles/whiteship_kilo.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -399,14 +399,7 @@
/turf/open/floor/plating,
/area/shuttle/abandoned/cargo)
"ry" = (
/obj/machinery/porta_turret/centcom_shuttle/weak{
dir = 4;
name = "Old Mining Turret";
lethal_projectile = /obj/projectile/kinetic/miner;
lethal_projectile_sound = 'sound/weapons/kinetic_accel.ogg';
stun_projectile = /obj/projectile/kinetic/miner;
stun_projectile_sound = 'sound/weapons/kinetic_accel.ogg'
},
/obj/machinery/porta_turret/centcom_shuttle/weak/mining,
/turf/closed/wall/mineral/titanium,
/area/shuttle/abandoned/bar)
"rC" = (
Expand Down
8 changes: 1 addition & 7 deletions _maps/templates/holodeck_holdoutbunker.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -28,12 +28,6 @@
},
/turf/open/floor/holofloor/asteroid,
/area/template_noop)
"x" = (
/obj/structure/foamedmetal,
/obj/structure/window/spawner/directional/east,
/obj/structure/bookcase/random/fiction,
/turf/open/floor/holofloor/asteroid,
/area/template_noop)
"I" = (
/obj/structure/table,
/obj/item/gun/energy/laser,
Expand Down Expand Up @@ -62,7 +56,7 @@ a
"}
(2,1,1) = {"
b
x
b
b
b
b
Expand Down
3 changes: 3 additions & 0 deletions code/__DEFINES/actions.dm
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@
#define AB_CHECK_INCAPACITATED (1<<4)
///Action button checks if user is jaunting
#define AB_CHECK_PHASED (1<<5)
///Action button checks if user is not on an open turf
#define AB_CHECK_OPEN_TURF (1<<6)

DEFINE_BITFIELD(check_flags, list(
"CHECK IF HANDS BLOCKED" = AB_CHECK_HANDS_BLOCKED,
Expand All @@ -18,6 +20,7 @@ DEFINE_BITFIELD(check_flags, list(
"CHECK IF CONSCIOUS" = AB_CHECK_CONSCIOUS,
"CHECK IF INCAPACITATED" = AB_CHECK_INCAPACITATED,
"CHECK IF TEMPORARILY INCORPOREAL" = AB_CHECK_PHASED,
"CHECK IF NOT ON AN OPEN TURF" = AB_CHECK_OPEN_TURF,
))

///Action button triggered with right click
Expand Down
Loading
Loading