 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
|
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
|
7717c7446c
|
Update SnowCabin.dmm
|
2021-09-07 19:39:29 -04:00 |
|
|
zeroisthebiggay
|
6a900e4ec4
|
Update SnowCabin.dmm
|
2021-09-07 19:38:40 -04:00 |
|
|
Lin
|
56b3eafe6c
|
Merge pull request #15077 from bunny232/master
woopsies, pubby xenobio jank
|
2021-09-06 13:58:47 -05: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 |
|
|
Emily
|
04284f8025
|
Un-Spaces the Library and also removes some leftover snow.
|
2021-09-02 20:11:49 +02:00 |
|
|
Lin
|
51e884b0ba
|
Merge pull request #15022 from Putnam3145/beach-tweaks
Adds some showers to the beach
|
2021-08-19 13:49:45 -05:00 |
|
|
Lin
|
7ded23f9ba
|
Merge pull request #15006 from TripleShades/pubby
Pubby Additions + Touchups
|
2021-08-19 13:46:24 -05:00 |
|
|
Lin
|
e0f919e0d7
|
Merge pull request #15009 from EmeraldSundisk/omega83
Ship happens on OmegaStation.
|
2021-08-19 12:33:08 -05:00 |
|
|
Putnam3145
|
cc0fb99029
|
Adds some showers to the beach
|
2021-08-18 10:19:29 -07: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 |
|
|
EmeraldSundisk
|
306b5e5a99
|
Revert "dum"
This reverts commit 0e24ce9ce8.
|
2021-08-03 18:53:52 -07:00 |
|
|
Artur
|
772bfaba75
|
line ending fuckery
|
2021-08-03 00:59:48 +03:00 |
|
|
EmeraldSundisk
|
0e24ce9ce8
|
dum
|
2021-08-02 14:51:43 -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 |
|
|
silicons
|
c5438c73be
|
Merge pull request #14879 from WanderingFox95/WanderingFox95-IcemoonRuinsOnLavaland
[Review/Testmerge] Icemoon Ruins but on Lavaland!
|
2021-07-29 22:39:42 -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 |
|
|
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 |
|
|
silicons
|
3fcf8dc78b
|
Merge pull request #14935 from bunny232/metatestinglab
Meta station toxins
|
2021-07-12 12:32:02 -07:00 |
|
|
Lin
|
97f8698f8a
|
Merge pull request #14918 from MrJWhit/pubby-cap-mirror
Pubby mirror for the captains office
|
2021-07-12 00:04:21 -07:00 |
|
|
Lin
|
108c9dba9e
|
Merge pull request #14936 from shellspeed1/woops
fixes to the new survival pod.
|
2021-07-10 12:06:26 -07:00 |
|
|
shellspeed1
|
5eff532b03
|
Woops, lets fix that
|
2021-07-09 01:12:10 -07:00 |
|
|
Lin
|
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 |
|
|
Lin
|
b152052c70
|
Merge pull request #14929 from MrJWhit/engine-map-fixes
Adds another wall to the AM engine
|
2021-07-08 12:16:27 -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
|
26b186d24f
|
Update engine_am.dmm
|
2021-07-06 16:29:45 -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 |
|