Commit Graph
1538 Commits
Author SHA1 Message Date
siliconsandGitHub 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
siliconsandGitHub 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
LinandGitHub 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
Putnam3145andGitHub 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
siliconsandGitHub ed191b9513 Merge pull request #14972 from MrJWhit/farts
Random Boxstation Fixes (Space edition)
2021-07-29 22:42:19 -07:00
siliconsandGitHub 5e868e9808 Merge pull request #14957 from TripleShades/pubbyyyy
Pubby Deco
2021-07-29 22:40:54 -07:00
LinandGitHub 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
MrJWhit b2ccb22888 fixing theater access and adding a whoopsie light 2021-07-22 15:09:44 -04:00
TripleShades 398ac759b5 Update PubbyStation.dmm 2021-07-20 13:18:56 -04:00
silicons 806ecf63ca why 2021-07-18 15:16:34 -07:00
siliconsandGitHub 3fcf8dc78b Merge pull request #14935 from bunny232/metatestinglab
Meta station toxins
2021-07-12 12:32:02 -07:00
LinandGitHub 97f8698f8a Merge pull request #14918 from MrJWhit/pubby-cap-mirror
Pubby mirror for the captains office
2021-07-12 00:04:21 -07:00
LinandGitHub 975846c7eb Merge pull request #14932 from MrJWhit/pubby-atmos-fixins
Makes it so AIs can plasmaflood in pubby
2021-07-08 17:11:15 -07:00
bunny232 6aebfb08fc Update MetaStation.dmm 2021-07-08 12:35:31 -04:00
MrJWhit 9063ad262b Update PubbyStation.dmm 2021-07-07 16:21:40 -04:00
MrJWhit 46937f67ce areas 2021-07-06 23:00:34 -04:00
MrJWhit 3f5f639c42 Update PubbyStation.dmm 2021-07-06 01:45:44 -04:00
MrJWhit e1f8b5ba55 AAAAAAAAAH 2021-07-06 01:34:15 -04:00
MrJWhit 8e092394e1 Update PubbyStation.dmm 2021-07-03 19:20:48 -04:00
MrJWhit b09d305f1d I hate APCs 2021-07-01 00:35:26 -04:00
MrJWhit 7ebee01f70 another room 2021-07-01 00:14:49 -04:00
MrJWhit 8ca5b7624d Update BoxStation.dmm 2021-06-30 23:45:46 -04:00
MrJWhit 36de878d54 I hate APCs, did you know that? 2021-06-30 22:52:27 -04:00
MrJWhit d5edba7d7e WAITSHITFUCK 2021-06-30 22:46:18 -04:00
MrJWhit d3056e3f84 Boxstation rooms 'n stuff 2021-06-30 22:26:18 -04:00