Commit Graph

2251 Commits

Author SHA1 Message Date
keronshb a8f6f409f8 Another round of reverts for unintended changes 2021-11-21 10:55:53 -05:00
keronshb 5498d7ed13 Reverts unintended area changes to other maps 2021-11-21 10:50:22 -05:00
keronshb ef37f4b3b8 more area fixes 2021-11-21 00:42:19 -05:00
keronshb 05a7e25ced Fixes the area names 2021-11-21 00:27:34 -05:00
keronshb e91928b0a4 Area change test 2021-11-21 00:12:08 -05:00
keronshb bcf3376ae6 Fixes up the last runtimes 2021-11-20 22:31:07 -05:00
keronshb c52a411938 Fixes some area/apc runtimes. 2021-11-20 18:29:56 -05:00
keronshb af83fb9611 FestiveMap 2021 2021-11-20 12:04:35 -05:00
Lin efa02148d1 Merge pull request #15275 from keronshb/halloweenball2021
Spookystation (Ball Map) and Vector Cars
2021-11-17 16:26:07 +00:00
TripleShades 1f7f0ea35e Update PubbyStation.dmm (#15366) 2021-11-15 22:28:51 +01:00
TripleShades 083f49ff12 Update PubbyStation.dmm 2021-11-12 19:50:52 -05:00
TripleShades 3ebca5a737 Update PubbyStation.dmm 2021-11-12 19:22:20 -05:00
TripleShades 97512a2ba5 Update PubbyStation.dmm 2021-11-10 17:20:28 -05:00
TripleShades 54187da577 Update PubbyStation.dmm 2021-11-10 17:09:36 -05:00
silicons 9ca95e9313 Merge pull request #15340 from Ethan4303/fdmm-patch-72342162-Ethan4303
Fixes some lambda stuff
2021-11-09 09:57:04 -08:00
dapnee 1ad852a174 Adding trash piles to meta and also maybe not everyone should be able to get into xenobio
was going to be a simple access change on the buttons, but hey, trash is fun
2021-11-06 04:12:13 -06:00
Ezhan 24f4b404cf Fixes some lambda stuff 2021-11-05 16:53:37 -04:00
dapnee a7017991fc Hey, that's not supposed to over there (More Pubby Fixes)
oh god oh fuck
2021-11-02 14:16:15 -06:00
dapnee 1101e62503 Fixes Table Air Alarm on Pubby and Redundant Fire Lock on Box 2021-11-01 06:09:44 -06:00
keronshb 9b72ca150c Bye signpost 2021-10-30 16:24:21 -04:00
keronshb 581f2cccbe Adds road to cars 2021-10-30 16:20:09 -04:00
keronshb 84dc63b95a Orion Trail 2021-10-30 16:11:47 -04:00
keronshb f7325767f2 Fixes door and tile error 2021-10-30 15:57:26 -04:00
silicons d6d037de43 Merge pull request #15232 from Putnam3145/minesweeper-removal
Removes minesweeper
2021-10-27 05:11:48 -07:00
keronshb dc2ad20fa0 Fixes the runtimes 2021-10-16 16:04:44 -04:00
keronshb 956025447d Should fix the final linter 2021-10-16 15:51:56 -04:00
keronshb 14feb77550 TGM for 2021 map, removal of 2019 map 2021-10-16 15:45:37 -04:00
keronshb 1b38913867 Some linter fixes 2021-10-16 15:28:41 -04:00
keronshb 27773d75d9 The correct files are now ticked/unticked 2021-10-16 15:20:58 -04:00
keronshb cf60b3d6d8 Basemap 2021-10-16 11:02:06 -04:00
keronshb 9f13c7d8f3 Last roundup of fixes 2021-10-16 10:45:44 -04:00
keronshb 3cfea7eb92 Ball2021 2021-10-16 00:02:05 -04:00
silicons c449bfcdf6 Merge pull request #15262 from dapnee/pubbyonceagain
Moves Pubby Court and Adds the BEPIS to Science
2021-10-15 00:18:19 -07:00
Lin 4be484f101 Merge pull request #15261 from MrJWhit/delta
Throwing trash in delta
2021-10-11 23:56:57 -07:00
dapnee 24ce9d4de7 oopsy missed a brig wall near maint
aaaa
2021-10-10 17:42:37 -06:00
dapnee de678585f0 Moves Pubby Court and Adds the BEPIS to Science
Moved courtroom, it's now adjacent to security. This means the monastery power/air supply room got moved back to where it was. While moving around the courtroom, interrogation got moved slightly higher up and now sec/cap's maintenance has a supply-ish room for repairs.

Also BEPIS
2021-10-10 17:29:14 -06:00
MrJWhit e83f53c423 Update DeltaStation2.dmm 2021-10-10 16:25:42 -04:00
MrJWhit 58f4a0f7b9 Trash and Fire to a box 2021-10-10 16:07:55 -04:00
Chayse Ramsay d1611ddf42 Lavaland ruin rad storm fix (#15242)
* Lavaland rad storm fix

* whoops

* double whoops

* Update Lavaland.dmm
2021-10-06 17:28:29 +02:00
silicons 73d6266f89 fix (#15248) 2021-10-05 19:42:26 +02:00
Putnam3145 82e6b6cf98 maps 2021-10-01 23:29:45 -07:00
WanderingFox95 83987db48a Merge branch 'Citadel-Station-13:master' into WanderingFox95-TribalOverhaul 2021-10-01 18:51:46 +02:00
Hatterhat 469387881f live eggs? in 2021? (#15216)
Co-authored-by: Hatterhat <Hatterhat@users.noreply.github.com>
2021-09-29 20:18:11 +02:00
zerothebigboy 8aef919c19 NI 2021-09-28 03:17:46 -04:00
silicons d6e7a096e6 Merge pull request #15206 from zeroisthebiggay/metaprison
meta station prison remapping
2021-09-28 00:13:13 -07:00
silicons 78d461b58a Merge pull request #15201 from zeroisthebiggay/slur
fixes monkey shuttle brig
2021-09-28 00:12:45 -07:00
WanderingFox95 4e87044845 Merge branch 'Citadel-Station-13:master' into WanderingFox95-TribalOverhaul 2021-09-27 18:15:34 +02:00
zeroisthebiggay 41169d4366 helter skelter fixes so it doesn't break comms and does not come with a fucking uplink (#15210)
* .

* .
2021-09-27 17:49:01 +02:00
zerothebigboy 02c705fd6a lmao 2021-09-25 21:04:49 -04:00
zerothebigboy e6612e3f15 lol lmao kek wtf 2021-09-24 19:32:08 -04:00