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
4be484f101
Merge pull request #15261 from MrJWhit/delta
...
Throwing trash in delta
2021-10-11 23:56:57 -07:00
24ce9d4de7
oopsy missed a brig wall near maint
...
aaaa
2021-10-10 17:42:37 -06:00
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
e83f53c423
Update DeltaStation2.dmm
2021-10-10 16:25:42 -04:00
58f4a0f7b9
Trash and Fire to a box
2021-10-10 16:07:55 -04:00
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
73d6266f89
fix ( #15248 )
2021-10-05 19:42:26 +02:00
83987db48a
Merge branch 'Citadel-Station-13:master' into WanderingFox95-TribalOverhaul
2021-10-01 18:51:46 +02:00
8aef919c19
NI
2021-09-28 03:17:46 -04:00
02c705fd6a
lmao
2021-09-25 21:04:49 -04:00
9b3d8ab01e
wowihatemapping
2021-09-20 14:30:44 -04:00
fe8a652689
Merge branch 'Citadel-Station-13:master' into WanderingFox95-TribalOverhaul
2021-09-19 21:32:03 +02:00
62ab6e4fb6
removes the slabs on more up to date maps?
2021-09-19 20:41:39 +02:00
516f5ba81f
Merge pull request #15168 from dapnee/map-fixies
...
Pubby and Beach Away Fixes
2021-09-19 11:08:17 -07:00
9af0d9c8f2
wiresandshityeah
2021-09-18 22:39:02 -04:00
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
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
ba14896889
balls
2021-09-16 13:05:02 -04:00
82c5518256
fixthefunnypipes
2021-09-14 11:57:07 -04:00
2995a767a6
theseshouldhavecommitted
2021-09-14 09:42:32 -04:00
3ef6436a4a
whoopsiforgotsareas
2021-09-14 09:27:40 -04:00
b4dcbb638e
shit
2021-09-14 09:19:19 -04:00
8bb364df0a
fix ( #15128 )
2021-09-14 02:25:10 +02:00
68e2eb1d7a
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into prisoners
2021-09-10 12:12:57 -04:00
3c23a09b56
bannedforbeingcringeist
2021-09-07 21:10:24 -04:00
103d6255a0
Update PubbyStation.dmm
2021-09-04 16:59:05 -04:00
e1a5fe7894
pain
2021-09-03 07:45:52 -04:00
7ded23f9ba
Merge pull request #15006 from TripleShades/pubby
...
Pubby Additions + Touchups
2021-08-19 13:46:24 -05:00
de3c7b9bc5
Update OmegaStation.dmm
2021-08-14 16:37:31 -07:00
e8778510db
Update PubbyStation.dmm
2021-08-11 15:53:23 -04:00
27a3b04518
Update OmegaStation.dmm
2021-08-10 22:31:42 -07:00
9ed9fbcc73
Merge pull request #14973 from TripleShades/pubbyyyy
...
[FAST MERGE] Pubby Deco Fix
2021-07-31 21:25:40 -07:00
7d7525825d
deco waterrrr
2021-07-30 23:51:57 -04:00
b682d886e9
Update PubbyStation.dmm
2021-07-30 23:44:15 -04:00
52659ffe53
Update PubbyStation.dmm
2021-07-30 23:38:36 -04:00
4eb8b2701d
Update PubbyStation.dmm
2021-07-30 23:10:28 -04:00
4dd67d35e4
Update PubbyStation.dmm
2021-07-30 23:00:55 -04:00
ed191b9513
Merge pull request #14972 from MrJWhit/farts
...
Random Boxstation Fixes (Space edition)
2021-07-29 22:42:19 -07:00
5e868e9808
Merge pull request #14957 from TripleShades/pubbyyyy
...
Pubby Deco
2021-07-29 22:40:54 -07:00
79456d8d63
Merge pull request #14964 from EmeraldSundisk/omega719
...
Round 1 of initial fixes/changes for OmegaStation.
2021-07-28 14:31:28 -05:00
70a23bebf2
Update BoxStation.dmm
2021-07-28 02:15:31 -04:00
b232baf568
random fixes
2021-07-28 02:11:15 -04:00
4c58c1a427
Merge branch 'master' of github.com:Citadel-Station-13/Citadel-Station-13 into mrjwhit-boxstation
2021-07-23 13:18:33 -07:00
441289e675
firsttrymaybe
2021-07-22 20:34:21 -07:00
96878c28cf
Update BoxStation.dmm
2021-07-22 15:12:41 -04:00
b2ccb22888
fixing theater access and adding a whoopsie light
2021-07-22 15:09:44 -04:00
398ac759b5
Update PubbyStation.dmm
2021-07-20 13:18:56 -04:00
f074fc2927
Removes Slabs from Lavaland
2021-07-20 19:15:26 +02:00
806ecf63ca
why
2021-07-18 15:16:34 -07:00
silicons