Commit Graph

1557 Commits

Author SHA1 Message Date
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
silicons
d6d037de43 Merge pull request #15232 from Putnam3145/minesweeper-removal
Removes minesweeper
2021-10-27 05:11:48 -07: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
zerothebigboy
8aef919c19 NI 2021-09-28 03:17:46 -04:00
zerothebigboy
02c705fd6a lmao 2021-09-25 21:04:49 -04:00
zerothebigboy
9b3d8ab01e wowihatemapping 2021-09-20 14:30:44 -04:00
WanderingFox95
fe8a652689 Merge branch 'Citadel-Station-13:master' into WanderingFox95-TribalOverhaul 2021-09-19 21:32:03 +02:00
WanderingFox95
62ab6e4fb6 removes the slabs on more up to date maps? 2021-09-19 20:41:39 +02:00
silicons
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
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
3c23a09b56 bannedforbeingcringeist 2021-09-07 21:10:24 -04:00
bunny232
103d6255a0 Update PubbyStation.dmm 2021-09-04 16:59:05 -04:00
zerothebigboy
e1a5fe7894 pain 2021-09-03 07:45:52 -04:00
Lin
7ded23f9ba Merge pull request #15006 from TripleShades/pubby
Pubby Additions + Touchups
2021-08-19 13:46:24 -05:00
EmeraldSundisk
de3c7b9bc5 Update OmegaStation.dmm 2021-08-14 16:37:31 -07:00
TripleShades
e8778510db Update PubbyStation.dmm 2021-08-11 15:53:23 -04:00
EmeraldSundisk
27a3b04518 Update OmegaStation.dmm 2021-08-10 22:31:42 -07:00
Putnam3145
9ed9fbcc73 Merge pull request #14973 from TripleShades/pubbyyyy
[FAST MERGE] Pubby Deco Fix
2021-07-31 21:25:40 -07:00
TripleShades
7d7525825d deco waterrrr 2021-07-30 23:51:57 -04:00
TripleShades
b682d886e9 Update PubbyStation.dmm 2021-07-30 23:44:15 -04:00
TripleShades
52659ffe53 Update PubbyStation.dmm 2021-07-30 23:38:36 -04:00
TripleShades
4eb8b2701d Update PubbyStation.dmm 2021-07-30 23:10:28 -04:00
TripleShades
4dd67d35e4 Update PubbyStation.dmm 2021-07-30 23:00:55 -04:00
silicons
ed191b9513 Merge pull request #14972 from MrJWhit/farts
Random Boxstation Fixes (Space edition)
2021-07-29 22:42:19 -07:00
silicons
5e868e9808 Merge pull request #14957 from TripleShades/pubbyyyy
Pubby Deco
2021-07-29 22:40:54 -07:00
Lin
79456d8d63 Merge pull request #14964 from EmeraldSundisk/omega719
Round 1 of initial fixes/changes for OmegaStation.
2021-07-28 14:31:28 -05:00
MrJWhit
70a23bebf2 Update BoxStation.dmm 2021-07-28 02:15:31 -04:00
MrJWhit
b232baf568 random fixes 2021-07-28 02:11:15 -04:00
Linzolle
4c58c1a427 Merge branch 'master' of github.com:Citadel-Station-13/Citadel-Station-13 into mrjwhit-boxstation 2021-07-23 13:18:33 -07:00
EmeraldSundisk
441289e675 firsttrymaybe 2021-07-22 20:34:21 -07:00
MrJWhit
96878c28cf Update BoxStation.dmm 2021-07-22 15:12:41 -04:00