Commit Graph

2309 Commits

Author SHA1 Message Date
Lin
d7cbb017f6 Fix few instances of bleeding white blood (#15398)
* no longer bleed white blood

* parentheses man

* fix that one bdm map spawn too
2022-01-09 17:23:48 +01:00
MrJWhit
d942664b7f Update OmegaStation.dmm 2022-01-03 23:14:06 -05:00
MrJWhit
e7571c42be Update OmegaStation.dmm 2022-01-03 23:11:09 -05:00
Lin
e62214af38 Merge pull request #15446 from MrJWhit/golden-omega
Making Omega Playable
2022-01-03 22:35:20 +00:00
TripleShades
a0e3dd5205 Meta Atmos Layout (#15445)
* Update MetaStation.dmm

* Update MetaStation.dmm

* Update MetaStation.dmm
2022-01-02 02:15:21 +01:00
MrJWhit
2fa435f992 Update OmegaStation.dmm 2021-12-29 16:18:54 -05:00
Lin
0ba9f4254c Merge pull request #15435 from TripleShades/aaaaa
Festive Station Fixes
2021-12-28 21:35:28 +00:00
TripleShades
2de8cafa49 fuck 2021-12-24 20:31:17 -05:00
TripleShades
0089b44df2 a 2021-12-23 17:57:15 -05:00
TripleShades
d0eb0e1e3a Update FestiveStation.dmm 2021-12-19 18:40:15 -05:00
TripleShades
a13f15660e Update FestiveStation.dmm 2021-12-19 17:42:11 -05:00
TripleShades
f92ea0c54b Update FestiveStation.dmm 2021-12-19 17:23:28 -05:00
TripleShades
f6fcee118e Update FestiveStation.dmm 2021-12-19 03:25:23 -05:00
TripleShades
bba3a4b092 Update PubbyStation.dmm (#15410) 2021-12-08 18:51:10 +01:00
Lin
76fbc0994f ball map weather (#15405) 2021-12-08 18:49:43 +01:00
TripleShades
b1691e0dfa Update PubbyStation.dmm 2021-12-06 23:11:00 -05:00
Lin
daa751d686 Merge pull request #15406 from TripleShades/fixies
Box Perma Fixes
2021-12-04 22:36:03 +00:00
TripleShades
a8fb8afecb Update BoxStation.dmm 2021-12-02 20:32:40 -05:00
Lin
4b7b814e70 Merge pull request #15403 from TripleShades/fixies
Pubby Holopad
2021-12-02 02:42:03 +00:00
TripleShades
85a0452c6d Update PubbyStation.dmm 2021-11-30 14:36:43 -05:00
Lin
336a66edd5 Merge pull request #15386 from keronshb/winterball2021
FestiveMap (Winter Ball 2021)
2021-11-27 23:44:51 +00:00
Linzolle
fb3fa9ac17 mores wires :^) 2021-11-26 22:59:02 -07:00
Linzolle
f74872970e wiring shenanigans 2021-11-26 22:36:52 -07:00
Linzolle
9756528f63 why are there space tiles here 2021-11-26 22:22:29 -07:00
Linzolle
eddf853b74 dumb gas mix var 2021-11-26 21:52:58 -07:00
Linzolle
fdf4b88f6b observer runtime 2021-11-26 21:37:00 -07:00
Linzolle
34a7953b2f maybe don't have lavaland atmos on the ball map 2021-11-26 21:29:53 -07:00
Linzolle
8ec47864b7 cool atmos bro 2021-11-26 21:24:55 -07:00
Linzolle
5bd3ab6e61 make sure the streets have power 2021-11-26 21:08:09 -07:00
Linzolle
3084ef1231 areas and power and atmos oh my 2021-11-26 20:50:39 -07:00
Linzolle
afe81f711b Merge branch 'winterball2021' of github.com:keronshb/Citadel-Station-13 into winterball 2021-11-26 18:46:57 -07:00
keronshb
2152e5b749 Critical map fix 2021-11-26 20:40:31 -05:00
TripleShades
a92464d0ce a 2021-11-24 20:31:23 -05:00
TripleShades
27ab217ab7 a 2021-11-24 16:36:47 -05:00
TripleShades
c56eb47692 Update DeltaStation2.dmm 2021-11-24 16:35:02 -05:00
TripleShades
bd67872e5d Update DeltaStation2.dmm 2021-11-24 16:26:29 -05:00
TripleShades
e5ddf722e7 Update BoxStation.dmm 2021-11-24 16:23:36 -05:00
TripleShades
e6d8bae3d0 Update PubbyStation.dmm 2021-11-24 16:20:35 -05:00
TripleShades
1666cbc6fb Update BoxStation.dmm 2021-11-24 16:20:29 -05:00
TripleShades
6f40296734 Update BoxStation.dmm 2021-11-24 16:14:17 -05:00
TripleShades
ff19a277a4 Update BoxStation.dmm 2021-11-24 16:13:19 -05:00
TripleShades
cc2cb3a5c1 Update BoxStation.dmm 2021-11-24 16:12:19 -05:00
TripleShades
aadffe30c6 Update MetaStation.dmm 2021-11-24 16:09:27 -05:00
TripleShades
e2caec8aad Update MetaStation.dmm 2021-11-24 16:08:00 -05:00
TripleShades
0f548093bb Update MetaStation.dmm 2021-11-24 16:06:31 -05:00
TripleShades
5bf52a61f3 Update MetaStation.dmm
Meta Solars Light Fixture
2021-11-24 16:04:41 -05:00
TripleShades
74437c1fb7 Update MetaStation.dmm 2021-11-24 16:01:14 -05:00
Lin
6d5882fcfd Merge pull request #15389 from TripleShades/pubby
Pubby Paramedical
2021-11-22 22:02:50 +00:00
keronshb
c4a81b4388 Missed one 2021-11-21 10:57:38 -05:00
keronshb
a8f6f409f8 Another round of reverts for unintended changes 2021-11-21 10:55:53 -05:00