keronshb
8978ee10fe
Merge remote-tracking branch 'upstream/master' into familyport
2021-10-28 14:41:46 -04:00
silicons and GitHub
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
keronshb
6b23d177c8
Merge remote-tracking branch 'upstream/master'
2021-10-15 19:25:41 -04:00
keronshb
1cd2c59776
Merge branch 'master' into familyport
2021-10-15 14:43:53 -04:00
silicons and GitHub
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
keronshb
1971e65be3
Fixes the linter
2021-10-14 20:55:58 -04:00
Lin and GitHub
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 and GitHub
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 and GitHub
73d6266f89
fix ( #15248 )
2021-10-05 19:42:26 +02:00
Putnam3145
82e6b6cf98
maps
2021-10-01 23:29:45 -07:00
WanderingFox95 and GitHub
83987db48a
Merge branch 'Citadel-Station-13:master' into WanderingFox95-TribalOverhaul
2021-10-01 18:51:46 +02:00
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 and GitHub
d6e7a096e6
Merge pull request #15206 from zeroisthebiggay/metaprison
...
meta station prison remapping
2021-09-28 00:13:13 -07:00
silicons and GitHub
78d461b58a
Merge pull request #15201 from zeroisthebiggay/slur
...
fixes monkey shuttle brig
2021-09-28 00:12:45 -07:00
WanderingFox95 and GitHub
4e87044845
Merge branch 'Citadel-Station-13:master' into WanderingFox95-TribalOverhaul
2021-09-27 18:15:34 +02:00
zeroisthebiggay and GitHub
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
zerothebigboy
9b3d8ab01e
wowihatemapping
2021-09-20 14:30:44 -04:00
WanderingFox95 and GitHub
fe8a652689
Merge branch 'Citadel-Station-13:master' into WanderingFox95-TribalOverhaul
2021-09-19 21:32:03 +02:00
WanderingFox95 and GitHub
dce9801616
another slab gone
2021-09-19 20:42:16 +02:00
WanderingFox95 and GitHub
62ab6e4fb6
removes the slabs on more up to date maps?
2021-09-19 20:41:39 +02:00
silicons and GitHub
516f5ba81f
Merge pull request #15168 from dapnee/map-fixies
...
Pubby and Beach Away Fixes
2021-09-19 11:08:17 -07:00
zerothebigboy
9af0d9c8f2
wiresandshityeah
2021-09-18 22:39:02 -04:00
dapnee
d59c933fde
even more shit
...
pubby now has a court room and some other misc. things that will make certain areas a bit less boring
2021-09-18 16:13:57 -06:00
dapnee
20f1d8b57b
Pubby and Beach Away Fixes
...
The one vent bothered me enough to make a map edit.
2021-09-17 04:32:28 -06:00
zerothebigboy
ba14896889
balls
2021-09-16 13:05:02 -04:00
zerothebigboy
82c5518256
fixthefunnypipes
2021-09-14 11:57:07 -04:00
zerothebigboy
2995a767a6
theseshouldhavecommitted
2021-09-14 09:42:32 -04:00
zerothebigboy
3ef6436a4a
whoopsiforgotsareas
2021-09-14 09:27:40 -04:00
zerothebigboy
b4dcbb638e
shit
2021-09-14 09:19:19 -04:00
silicons and GitHub
8bb364df0a
fix ( #15128 )
2021-09-14 02:25:10 +02:00
zerothebigboy
68e2eb1d7a
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into prisoners
2021-09-10 12:12:57 -04:00
zerothebigboy
04af8ae302
Merge branch 'prisoners' of https://github.com/zeroisthebiggay/Citadel-Station-13 into prisoners
2021-09-07 21:11:12 -04:00
zerothebigboy
3c23a09b56
bannedforbeingcringeist
2021-09-07 21:10:24 -04:00
zeroisthebiggay and GitHub
7717c7446c
Update SnowCabin.dmm
2021-09-07 19:39:29 -04:00
zeroisthebiggay and GitHub
6a900e4ec4
Update SnowCabin.dmm
2021-09-07 19:38:40 -04:00
keronshb