LightFire53
c000e22d53
Cleans Up DeltaStation Permanent Detention and Adds Riot Control Systems ( #16807 )
...
* Jani-ERT
* In Which I Actually Commit a Change
* Call me Ghandi
* Alice Amelia Chown
Also where I fix some minor issues with the escape pod by engineering. Mostly with a floor and a light.
* Make Love Not Conflicts
* Mumble Grumble
2021-10-15 21:10:10 +01:00
S34N
ab4aeec128
Metastation fixes (number who knows anymore) ( #16836 )
...
* centcomm doors changed, weird carpets fixed, tinted windows fixed, atmos piping fixed, execution floor iconstates fixed, ai upload turret control fixed, ai slipper icon state fixed
* removes chapel nullrod and smoke spellbook
* door tweak, wire cleanup
* merge conflict part 2
* filing cabinet deletion
* admin shuttle dock streched
* shimmy on over some more, dock
2021-10-09 18:06:33 +01:00
meow20
cbd8bd16bd
Deltastation: fixes few things my PR broke ( #16855 )
...
* Update delta.dmm
* Update delta.dmm
2021-10-07 16:45:47 +01:00
datlo
2aa0abde72
Replace maintenance batswarm by regular bats ( #16872 )
2021-10-04 13:49:00 +01:00
variableundefined
cacf756c7b
Merge pull request #16854 from LightFire53/Airlock-Problems
...
Fixes DeltaStation Mishaps in Engineering
2021-10-03 20:46:39 -05:00
S34N
05055e7b5c
fixes space in maints ( #16866 )
2021-10-03 21:51:53 +01:00
LightFire53
af45261896
Mis-click, why
2021-10-02 21:25:31 -07:00
LightFire53
70875696a3
Uh oh spaghetti-o
2021-10-02 21:18:37 -07:00
AffectedArc07
5eb1c6382b
FIxes a scuffed wall
2021-10-02 15:59:00 +01:00
AffectedArc07
509d9caadb
Line endings matter
2021-10-02 15:29:31 +01:00
AffectedArc07
04f53956af
Dw about it
2021-10-02 15:26:39 +01:00
AffectedArc07
3cbade7820
S34N's remap
2021-10-02 15:22:00 +01:00
AffectedArc07
7604f54b81
I swear I mapmerged this
2021-10-02 13:41:55 +01:00
AffectedArc07
6675cac09b
Map compile pass 1
2021-10-02 13:39:20 +01:00
AffectedArc07
129318891d
Nukes spacepods and associated jobs
2021-10-02 13:16:24 +01:00
variableundefined
e3a63a9a2c
Merge pull request #16806 from meow20/deltabeacons
...
Deltastation: Add's more mulebot destinations.
2021-09-30 18:04:47 -05:00
meow20
801d9a1512
Update delta.dmm
2021-09-27 11:00:49 +02:00
meow20
e347f5bbfc
Update delta.dmm
2021-09-27 10:57:15 +02:00
meow20
a5502602bd
Update delta.dmm
2021-09-27 10:37:59 +02:00
meow20
2181487710
Merge remote-tracking branch 'upstream/master' into deltabeacons
2021-09-27 10:26:26 +02:00
LightFire53
b9305e6e0c
Bertrand Russell
2021-09-26 21:23:11 -07:00
variableundefined
f80bba36d0
Merge pull request #16803 from LightFire53/Engi-Pod-and-SM
...
Adds an Escape Pod to the left side of DeltaStation Maintenance
2021-09-26 21:06:26 -05:00
LightFire53
e15dc45cda
Area Schmarea
2021-09-26 10:41:10 -07:00
S34N
cf268f3aa2
fixes 2029 metastation runtimes, oh my! ( #16815 )
2021-09-26 17:02:06 +01:00
LightFire53
4125968432
But I forgot about the Return of the King
...
Re-adds ducky, since I forgot to add that to my original file
2021-09-25 20:47:22 -07:00
LightFire53
2420f5b413
Lover, Not a Fighter
2021-09-25 20:45:28 -07:00
variableundefined
3dd95d7773
Merge pull request #16802 from PseudOtis/deltarevamp
...
Medbay and Science Lobby Revamp (DeltaStation)
2021-09-25 16:23:32 -05:00
meow20
b3405dd7b4
Update delta.dmm
2021-09-25 14:00:47 +02:00
meow20
93cf4e6d03
Update delta.dmm
2021-09-25 13:18:06 +02:00
variableundefined
7d278c0cd0
Merge pull request #16792 from meow20/deltafixes
...
More delta changes
2021-09-24 23:25:55 -05:00
PseudOtis
7f6b2841a3
Update delta.dmm
2021-09-24 20:21:56 -07:00
PseudOtis
f42992cd2c
Update delta.dmm
2021-09-24 19:34:29 -07:00
LightFire53
a72568804c
Update delta.dmm
2021-09-24 18:09:10 -07:00
LightFire53
200501c03e
Update delta.dmm
2021-09-24 18:01:34 -07:00
LightFire53
c510ec78f7
I feel Deconflicted about this
...
Also does the changes that would have been done in PR #16785
2021-09-23 17:19:59 -07:00
variableundefined
687134654f
Merge pull request #16777 from LightFire53/Meta-Fixes
...
MetaStation Fixes
2021-09-23 18:14:02 -05:00
variableundefined
2af7b27ad6
Merge pull request #16779 from meow20/disposal
...
Deltastation: Sending crates to kitchen by disposals works now.
2021-09-23 18:12:58 -05:00
variableundefined
0e41ddc253
Merge pull request #16774 from meow20/doubleapc
...
Deltastation: removes one of two APC's in the same area
2021-09-23 18:12:28 -05:00
variableundefined
9fa9ba9b74
Merge pull request #16765 from Yoekkul/delta_cargo_MapUpdate
...
Added missing objs, storage shutters to cargo
2021-09-23 18:11:34 -05:00
meow20
367572f497
Update delta.dmm
2021-09-23 15:46:07 +02:00
meow20
cf087fcd18
Update delta.dmm
2021-09-23 15:14:33 +02:00
LightFire53
6598751563
It's a Black Magick Atmos
2021-09-22 23:23:29 -07:00
LightFire53
c6203e5463
Atmosian Madness
2021-09-22 22:56:36 -07:00
variableundefined
0837f562ef
Merge pull request #16764 from meow20/candlebox
...
Deltastation: candle boxes are now full
2021-09-22 22:32:19 -05:00
LightFire53
d0036fcfd0
Finally doin the fixes
2021-09-22 20:22:21 -07:00
meow20
350987a326
Update delta.dmm
2021-09-22 21:28:51 +02:00
Yoekkul
313f6eb60b
Added missing objs, storage shutters to cargo
2021-09-22 09:16:59 +02:00
meow20
71151308be
Update delta.dmm
2021-09-22 08:12:09 +02:00
Vi3trice
7976c1232f
Fix the belts and throw in the door setup from box
2021-09-21 11:56:30 -04:00
LightFire53
9f32303a3b
Singu-gone
2021-09-20 16:56:38 -07:00
