Mark9013100
e8b23a8c75
Omegastation Fixes ( #33249 )
2017-12-05 17:19:08 -06:00
deathride58
a6aa181161
Merge pull request #4225 from Citadel-Station-13/upstream-merge-33124
...
[MIRROR] Moves some machine sprites into /machines/ folder
2017-12-05 20:37:30 +00:00
deathride58
44d54c66f1
Merge pull request #4215 from Citadel-Station-13/upstream-merge-33230
...
[MIRROR] Adds disco inferno shuttle.
2017-12-05 20:18:21 +00:00
ACCount
435e46e407
Moves some machine sprites into /machines/ folder
2017-12-05 03:24:03 -06:00
coiax
e7fd239238
[Metastation] Easel in Quiet Room moved to art storage ( #33240 )
...
That easel awkwardly blocks access to the table in the corner, so I've
moved it to art storage, removing a photocopier from art storage to
allow it to fit.
2017-12-05 03:22:56 -06:00
Dax Dupont
91cc5b1024
Adds disco inferno shuttle. ( #33230 )
...
* Adds disco inferno shuttle
* step be gone
* Minor wall replacement
* Add no diagonal walls
* Made the dance machine all access
* Makes the statues work as I originally intended in this shuttle
* Fixes a chair
* Changed door and made it to keep fire inside.
2017-12-05 03:22:40 -06:00
deathride58
f6a2966fca
fixes merge conflicts
2017-12-04 18:24:04 -05:00
deathride58
379f73d1e1
Merge branch 'master' into upstream-merge-32249
2017-12-04 23:15:38 +00:00
kevinz000
66c66f0bd7
[READY]VEHICLE REFACTOR - Riding datums --> Components, Vehicles --> /obj/vehicle, staging for mech overhaul later on
2017-12-03 15:33:29 -06:00
Leo
f016daa833
Merge pull request #33179 from nicbn/removesmices
...
Removes the mob mouse from maintenance from maps
2017-12-02 09:44:39 -06:00
ACCount
f089b9ca2d
Removes mass-spectrometers
2017-11-28 06:27:55 -06:00
Mark9013100
fb4787fbd1
Oldstation edits/fixes ( #33080 )
2017-11-26 00:01:21 -06:00
Tad Hardesty
7ea123449b
Fix misplaced corners in the Hotel ( #33016 )
2017-11-24 13:00:18 -06:00
deathride58
470f4169df
Merge pull request #4095 from Citadel-Station-13/upstream-merge-33018
...
[MIRROR] Replaces "console screen" stock part with glass sheets
2017-11-24 06:42:51 +00:00
LetterJay
aade2d210a
Merge pull request #4084 from deathride58/mapfixes11222017
...
Fixes a couple of issues introduced in boxstation after recent sync, readds boxstation's secure cell in security
2017-11-23 22:41:54 -06:00
ACCount
2147c60b7f
Replaces "console screen" stock part with glass sheets
2017-11-23 18:53:47 -06:00
deathride58
0ca050563f
fixes merge conflicts
2017-11-22 23:43:03 -05:00
ShizCalev
1b094a4374
Fixes deleted turfs
2017-11-22 22:01:05 -06:00
deathride58
c81ebbfc24
fixes boxstation issues, readds removed boxstation areas
2017-11-22 22:18:40 -05:00
Tad Hardesty
38c45fb479
Refactor chasm paths to be more sane ( #32701 )
...
In addition, makes chasm handling a component, so it could be reused for
chasm-likes which are not quite chasms.
Also fixes a couple of bugs relating to building on top of chasms
occasionally erasing the chasm.
2017-11-22 03:30:49 -06:00
deathride58
fc5133bef5
Merge pull request #4062 from Citadel-Station-13/upstream-merge-32932
...
[MIRROR] Cleans up template shuttles
2017-11-22 05:57:35 +00:00
ShizCalev
8a83b50113
Stacked turf cleanup ( #32933 )
2017-11-21 22:28:48 -06:00
ShizCalev
cf06a8142e
Cleans up template shuttles ( #32932 )
...
* Cleans up template shuttles
* More turf
2017-11-21 22:28:39 -06:00
deathride58
5a331eedad
Merge pull request #4055 from Citadel-Station-13/upstream-merge-32931
...
[MIRROR] Fixes dynamic lighting / nearstation area issues.
2017-11-21 21:23:46 +00:00
deathride58
5d5d4451a9
fixes merge conflicts
2017-11-21 14:35:43 -05:00
deathride58
05800235b5
fixes mapping errors introduced in #4049
2017-11-21 13:54:20 -05:00
ShizCalev
2c65f5c6b5
Fixes dynamic lighting / nearstation area issues.
2017-11-21 08:41:54 -06:00
deathride58
065a816183
QUICK HOTFIX
2017-11-21 01:54:25 -05:00
deathride58
fcac2a9fa7
compile
2017-11-21 00:40:59 -05:00
deathride58
e72399de7c
pain
2017-11-21 00:29:15 -05:00
deathride58
019b57316d
i want to die
2017-11-20 23:53:14 -05:00
deathride58
fc5badc8e3
Merge remote-tracking branch 'refs/remotes/origin/master' into upstream-merge-32860
2017-11-20 23:50:52 -05:00
deathride58
0d11dfc6ef
COMPILE, FOUL CREATURE
2017-11-20 23:39:23 -05:00
deathride58
4e727ee576
Merge remote-tracking branch 'refs/remotes/origin/master' into upstream-merge-32860
...
# Conflicts:
# _maps/map_files/MetaStation/MetaStation.dmm
2017-11-20 23:34:46 -05:00
deathride58
f13a340eb4
Merge remote-tracking branch 'refs/remotes/origin/master' into upstream-merge-32919
...
# Conflicts:
# _maps/map_files/PubbyStation/PubbyStation.dmm
2017-11-20 23:27:31 -05:00
deathride58
11cf2365f7
Merge pull request #4033 from Citadel-Station-13/upstream-merge-32856
...
[MIRROR] Various Meta area fixes
2017-11-21 04:16:27 +00:00
deathride58
441806c4e8
Merge pull request #4032 from Citadel-Station-13/upstream-merge-32846
...
[MIRROR] Fixes unpowered air injectors on pubby
2017-11-21 04:14:58 +00:00
deathride58
d52e405912
hOPEFULLY FIXES THE GOD DAMN MERGE CONFLICTS
2017-11-20 23:12:58 -05:00
deathride58
8429bf5448
fixes merge conflicts
2017-11-20 22:53:39 -05:00
deathride58
ac2324fde8
fixes merge conflicts
2017-11-20 22:50:19 -05:00
deathride58
48adeffc57
Fixes merge conflict
2017-11-20 22:47:08 -05:00
WJohn
e8ddae5d98
Cleans up floors.dmi a bit and adds new turf decals.
2017-11-20 20:48:06 -06:00
Jordan Brown
2de33c073d
Corrects Pubby roundstart AT issues
2017-11-20 16:57:32 -06:00
Jordan Brown
ff3b8ec67a
Merge pull request #32915 from francinum/master
...
Replaces the strangely sized buildshuttle plate
2017-11-20 16:44:48 -06:00
ShizCalev
32d9ea87f6
Various Meta area fixes
2017-11-20 02:43:09 -06:00
ShizCalev
dc2ecefe90
Fixes unpowered air injectors on pubby
2017-11-20 02:38:51 -06:00
deathride58
d8e1562fcf
Merge pull request #3995 from deathride58/manualsyncsreeEEEE
...
Manual map syncs + manual mirrors of missed upstream map PRs
2017-11-20 05:12:06 +00:00
Jordie
d843e75c3b
Merge pull request #32888 from ShizCalev/animal-ruin-tanks
...
Corrects animal ruin tank rotation
2017-11-19 22:24:06 -06:00
deathride58
d0e7fde37b
merges #4007
2017-11-19 02:46:18 -05:00
deathride58
fb62491701
manual map syncs + manual missed pr mirrors
2017-11-17 21:34:49 -05:00
