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

[EVENT] GAMESHOW (ACTUAL) TESTMERGE #59825

Closed
wants to merge 86 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
86 commits
Select commit Hold shift + click to select a range
beb6c3e
EVENTMODE AGAIN (#121)
CitrusGender May 31, 2021
be9263a
Merge remote-tracking branch 'origin/master' into gameshow
May 31, 2021
6e80422
Merge remote-tracking branch 'origin/master' into gameshow
Jun 1, 2021
20a295b
stops decals from being removed on maps being loaded in.
Jun 2, 2021
d6d86a9
Merge remote-tracking branch 'origin/master' into gameshow
Jun 14, 2021
05d3dd1
Disables pointing for non-admins (#130)
Ryll-Ryll Jun 14, 2021
4457022
again (#125)
NamelessFairy Jun 14, 2021
6f142b9
Arcane's puzzle map for Tourny (#128)
ArcaneMusic Jun 15, 2021
93c2b8d
Revert "Disables pointing for non-admins (#130)" (#136)
CitrusGender Jun 19, 2021
06824a0
The pointing PR but at the correct branch (#135)
Ryll-Ryll Jun 19, 2021
131b324
Add patient spawner for Medical Challenge (#127)
coiax Jun 19, 2021
5a83125
team hud for all (#132)
Wayland-Smithy Jun 19, 2021
ef60bdb
Merge remote-tracking branch 'upstream/master'
Jun 19, 2021
2ab3b65
adds battle royal areas
Jun 19, 2021
21d4231
Battle Royal Storm Controller (#122)
CitrusGender Jun 19, 2021
525fd60
adds event map, fixes air
Jun 19, 2021
ba9d1aa
Merge remote-tracking branch 'upstream/master'
Jun 19, 2021
915152c
Merge remote-tracking branch 'origin/master' into gameshow
Jun 19, 2021
d7492a5
changes up map to have computer on it, made battle royale map fullbri…
Jun 19, 2021
440d540
adds maps and changes up event area
Jun 19, 2021
ad116b1
actually adds maps
Jun 19, 2021
5a48651
Disarm deathsquad patient in Medical Challenge (#137)
coiax Jun 19, 2021
c681f4a
Merge remote-tracking branch 'upstream/master'
Jun 20, 2021
f2716c3
Merge remote-tracking branch 'origin/master' into gameshow
Jun 20, 2021
f12cd58
Merge branch 'gameshow' of github.com:CitrusGender/tgstation into gam…
Jun 20, 2021
1ece7aa
Fixed all the issues with the robotics map (#141)
NamelessFairy Jun 21, 2021
8151bcd
#125 but good (#139)
Fikou Jun 21, 2021
4c1b96a
Maptext portals (#140)
dragomagol Jun 21, 2021
59eb773
stops decals from being removed on event turfs, updates cooking round…
Jun 21, 2021
3a15957
slight edit
Jun 21, 2021
5a4ac33
errrr one last edit
Jun 21, 2021
9b18fb8
updated botany to have nondynamic lighting, cargo round now works (ha…
Jun 21, 2021
5dab185
speeders (#143)
dragomagol Jun 21, 2021
305ab90
Arcane puzzle map V2: WORKS edition featuring bugfixes and the newer …
ArcaneMusic Jun 21, 2021
4664e1b
changes puzzle map
Jun 21, 2021
bea2cc7
misc fixes (#144)
dragomagol Jun 22, 2021
5777fb6
add spawn protection, battle_royal -> battle_royale (#145)
Ryll-Ryll Jun 22, 2021
1fc0664
battle royal map has more boxes, botany round has spawn protection, c…
Jun 22, 2021
9b2eef4
Merge branch 'gameshow' of github.com:CitrusGender/tgstation into gam…
Jun 22, 2021
687a958
redid the type
Jun 22, 2021
1abfb05
FUCK I overwrote that shit, tdome should have good lighting now.
Jun 22, 2021
4a69cc1
defg
Ryll-Ryll Jun 22, 2021
1c85b13
Merge pull request #146 from Ryll-Ryll/forgot-define
Ryll-Ryll Jun 22, 2021
3827408
temporarily removes the spawn protection teamcheck code until roster
Ryll-Ryll Jun 22, 2021
e810f40
Merge remote-tracking branch 'CitrusGender/gameshow' into gameshow
Ryll-Ryll Jun 22, 2021
0a29fd5
moves the define temporarily to holosign (shouldn't be a problem)
Jun 22, 2021
6f80fcc
adds arena start and end
Jun 22, 2021
5f41946
Fix event map supplypod bays (#150)
Wayland-Smithy Jun 22, 2021
0972ff4
Removes ethereal respawn ability (#149)
dragomagol Jun 22, 2021
ff3a273
new battle royale storm sprite (#151)
yeeyeh Jun 22, 2021
f8ccbe9
adds late spawn, additional assistant spawns, and removes shutters
Jun 24, 2021
61c34c2
adds machine and deletes shutters.
Jun 24, 2021
6840101
fix merge conflict
Jun 24, 2021
81636fc
[HEAVY WIP] Core Tourney Code (#126)
Ryll-Ryll Jun 24, 2021
90f5cc8
moves the computer
Jun 24, 2021
40441d7
updates battle royal maps to have boxes spread out. Removes old cargo…
Jun 24, 2021
5ef2c69
removes traps in botany round, adds courtcase paper to court case rou…
Jun 25, 2021
fa2e836
should compile now
Jun 25, 2021
b8209fa
Merge remote-tracking branch 'upstream/master' into gameshow
Jun 26, 2021
9806d14
Last minute roster system changes (#153)
Ryll-Ryll Jun 26, 2021
9407a5a
sigulo ebent (#152)
Fikou Jun 26, 2021
d59a5d3
COME ON FIKOU, MAKE SURE IT COMPILES BEFOREHAND
Jun 26, 2021
e485363
a ton of last second fixes
Ryll-Ryll Jun 26, 2021
7eb39aa
allow felinids
Ryll-Ryll Jun 26, 2021
bf1206b
Merge pull request #154 from Ryll-Ryll/last-last-minute
Ryll-Ryll Jun 26, 2021
4b33b06
fixes cargo map, fixes cooking map, adds comms and observer landmark …
Jun 26, 2021
d32b984
[OPEN UPSTREAM] Drastic Lag Mitigation Subsystem: SSlag_switch (#134)
Wayland-Smithy Jun 26, 2021
0213be2
Makes robotics 3v3 and also adds a new walltype to stop broken minera…
NamelessFairy Jun 27, 2021
8f4e00c
Fix contestant auto TRAIT_BYPASS_MEASURES and radio freq switch (#156)
Wayland-Smithy Jun 27, 2021
15e3338
show rounds_participated (#157)
Wayland-Smithy Jun 27, 2021
de581f8
singularity round and family feud edit
Jun 27, 2021
8d4f216
Changes names to be easier to be read on the machine.
Jun 27, 2021
a2ca4c7
lmao deleted all the maps but didn't add them back
Jun 27, 2021
1ad79a0
dust on finish
Ryll-Ryll Jun 27, 2021
133e706
no participant votes (#158)
Wayland-Smithy Jun 27, 2021
51550e7
changes area for cooking map, adds green spawn for robotics map, and …
Jun 27, 2021
c95bfe8
Merge remote-tracking branch 'upstream/master'
Jun 27, 2021
0022a97
Merge branch 'master' into gameshow
Jun 27, 2021
6503a13
compiles now
Jun 27, 2021
c3b8e9d
OH FUCK OH SHIT DON'T FUCK UP THE BASE GAME MAP
Jun 27, 2021
5f9ff2c
Makes Dreathtil's suggested changes and kills blue team (#159)
NamelessFairy Jun 27, 2021
bddea18
stuff (#161)
Fikou Jun 27, 2021
d755223
Fixes a runtime: Entered() passing the wrong args (#162)
Wayland-Smithy Jun 27, 2021
d05a9e3
changed the AAAAAAAAAAAAAAAAAAAAAAA
Jun 27, 2021
8d11d2c
Merge remote-tracking branch 'upstream/master'
Jun 27, 2021
73abd30
Merge branch 'master' into gameshow
Jun 27, 2021
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1,522 changes: 1,522 additions & 0 deletions _maps/RandomRuins/IceRuins/RandomRuins_IceRuins_ToolboxSlamPuzzlePanic(1).dmm

Large diffs are not rendered by default.

4,744 changes: 4,744 additions & 0 deletions _maps/RandomRuins/IceRuins/toolbox_slam_puzzle_final.dmm

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion _maps/_basemap.dm
@@ -1,4 +1,4 @@
//#define LOWMEMORYMODE //uncomment this to load centcom and runtime station and thats it.
#define LOWMEMORYMODE //uncomment this to load centcom and runtime station and thats it.

#include "map_files\generic\CentCom.dmm"

Expand Down
3 changes: 3 additions & 0 deletions _maps/deltastation.json
Expand Up @@ -3,6 +3,9 @@
"map_name": "Delta Station",
"map_path": "map_files/Deltastation",
"map_file": "DeltaStation2.dmm",
"space_ruin_levels": 0,
"space_empty_levels": 0,
"minetype": "none",
"shuttles": {
"emergency": "emergency_delta",
"ferry": "ferry_fancy",
Expand Down
9 changes: 9 additions & 0 deletions _maps/eventmap.json
@@ -0,0 +1,9 @@
{
"version": 1,
"map_name": "Event Map",
"map_path": "map_files/debug",
"map_file": "eventmap.dmm",
"shuttles": {
"cargo": "cargo_delta"
}
}