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 |
|
silicons
|
472fda9504
|
Merge pull request #14833 from zeroisthebiggay/finallytools
TG Resprite Compendium Atomization Project | Episode Eight: The Finale: TG Tools
|
2021-07-04 10:59:43 -07: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 |
|
WanderingFox95
|
5dab84ad81
|
Okay, let's try this again.
I don't like you, you don't like me,
can we please just get along?
|
2021-06-29 18:30:04 +02:00 |
|
silicons
|
e04c940819
|
Merge pull request #14861 from bunny232/pubbymos
Pubby xenobiology atmospherics update among other things
|
2021-06-29 08:49:54 -07:00 |
|
silicons
|
c7766b0f02
|
Merge pull request #14895 from shellspeed1/another-pod
Adds a new survival pod, the penthouse pod.
|
2021-06-29 08:48:55 -07:00 |
|
silicons
|
f4c6888f96
|
Merge pull request #14822 from qweq12yt/more-cargo-features
Solving inconsistencies regarding QM being command
|
2021-06-29 08:46:33 -07:00 |
|
silicons
|
5204f5a6d9
|
Merge pull request #13991 from Putnam3145/auxtools-atmos
Replaces extools with auxtools; atmos overhaul
|
2021-06-27 11:01:32 -07:00 |
|
shellspeed1
|
d6b69b2800
|
The actual map
|
2021-06-27 03:39:21 -07:00 |
|
Lin
|
2064da4842
|
Merge pull request #14887 from MrJWhit/teg-reinforced-floors
Swapping some floors on the TEG-map
|
2021-06-24 14:45:53 -07:00 |
|
MrJWhit
|
084ec04782
|
Update engine_sm_5x5.dmm
|
2021-06-23 12:51:30 -04:00 |
|
MrJWhit
|
b5e38ba4b3
|
Update engine_teg.dmm
|
2021-06-23 02:07:59 -04:00 |
|
WanderingFox95
|
74ae090f8f
|
Now it shouldn't spawn plating around the shack.
kinda ruins the immersion.
|
2021-06-23 03:14:16 +02:00 |
|
WanderingFox95
|
2f801dd9a3
|
Not needed. Was just big and empty anyway.
|
2021-06-22 17:18:02 +02:00 |
|
WanderingFox95
|
f15a1d551c
|
Miner in the mining site, no more underground needed.
|
2021-06-22 17:17:28 +02:00 |
|