f089b9ca2d
Removes mass-spectrometers
2017-11-28 06:27:55 -06:00
fb4787fbd1
Oldstation edits/fixes ( #33080 )
2017-11-26 00:01:21 -06:00
7ea123449b
Fix misplaced corners in the Hotel ( #33016 )
2017-11-24 13:00:18 -06:00
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
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
2147c60b7f
Replaces "console screen" stock part with glass sheets
2017-11-23 18:53:47 -06:00
0ca050563f
fixes merge conflicts
2017-11-22 23:43:03 -05:00
1b094a4374
Fixes deleted turfs
2017-11-22 22:01:05 -06:00
c81ebbfc24
fixes boxstation issues, readds removed boxstation areas
2017-11-22 22:18:40 -05:00
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
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
8a83b50113
Stacked turf cleanup ( #32933 )
2017-11-21 22:28:48 -06:00
cf06a8142e
Cleans up template shuttles ( #32932 )
...
* Cleans up template shuttles
* More turf
2017-11-21 22:28:39 -06:00
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
5d5d4451a9
fixes merge conflicts
2017-11-21 14:35:43 -05:00
05800235b5
fixes mapping errors introduced in #4049
2017-11-21 13:54:20 -05:00
2c65f5c6b5
Fixes dynamic lighting / nearstation area issues.
2017-11-21 08:41:54 -06:00
065a816183
QUICK HOTFIX
2017-11-21 01:54:25 -05:00
fcac2a9fa7
compile
2017-11-21 00:40:59 -05:00
e72399de7c
pain
2017-11-21 00:29:15 -05:00
019b57316d
i want to die
2017-11-20 23:53:14 -05:00
fc5badc8e3
Merge remote-tracking branch 'refs/remotes/origin/master' into upstream-merge-32860
2017-11-20 23:50:52 -05:00
0d11dfc6ef
COMPILE, FOUL CREATURE
2017-11-20 23:39:23 -05:00
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
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
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
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
d52e405912
hOPEFULLY FIXES THE GOD DAMN MERGE CONFLICTS
2017-11-20 23:12:58 -05:00
8429bf5448
fixes merge conflicts
2017-11-20 22:53:39 -05:00
ac2324fde8
fixes merge conflicts
2017-11-20 22:50:19 -05:00
48adeffc57
Fixes merge conflict
2017-11-20 22:47:08 -05:00
e8ddae5d98
Cleans up floors.dmi a bit and adds new turf decals.
2017-11-20 20:48:06 -06:00
2de33c073d
Corrects Pubby roundstart AT issues
2017-11-20 16:57:32 -06:00
ff3b8ec67a
Merge pull request #32915 from francinum/master
...
Replaces the strangely sized buildshuttle plate
2017-11-20 16:44:48 -06:00
32d9ea87f6
Various Meta area fixes
2017-11-20 02:43:09 -06:00
dc2ecefe90
Fixes unpowered air injectors on pubby
2017-11-20 02:38:51 -06:00
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
d843e75c3b
Merge pull request #32888 from ShizCalev/animal-ruin-tanks
...
Corrects animal ruin tank rotation
2017-11-19 22:24:06 -06:00
d0e7fde37b
merges #4007
2017-11-19 02:46:18 -05:00
fb62491701
manual map syncs + manual missed pr mirrors
2017-11-17 21:34:49 -05:00
9849b9a13b
Merge pull request #3912 from Citadel-Station-13/upstream-merge-32482
...
[MIRROR] Improves the deep fryer
2017-11-15 11:13:56 -06:00
43113cd9b5
Merge pull request #31947 from AnturK/yarr
...
How does this work:
Station receives a communication extorting current cargo point, if they answer yes the points are just gone and nothing of interest happens.
If station refuses to pay or is silent for 3 minutes, pirate shuttle spawns somewhere in space.
There's an internal GPS onboard so crew will always be able to follow the shuttle.
Crew of 3, moderately armed. (Balance pending)
Shuttle engines have 3 minute cooldown between jumps.
Special shuttle equipment will block cargo and emergency shuttles from leaving and slowly steal the points.
2017-11-13 03:19:38 -06:00
9dff28b50d
Improves the deep fryer
2017-11-13 03:16:11 -06:00
5f8d368d9f
Fix bluespace shelters smoothing with non-shelter walls ( #32526 )
2017-11-09 11:07:15 -06:00
2f21f16b53
initial commit - syncs and fiXES EVERYTHING WRONG ABOUT BOX HOLY FUCK HOW DID NOBODY REPORT ALL THIS SHIT
2017-11-08 17:04:20 -05:00
3bae5fcef1
Merge pull request #3832 from Citadel-Station-13/upstream-merge-32427
...
[MIRROR] Cleans up wire varedits
2017-11-07 04:45:12 -06:00
b89cedcb08
Cleans up wire varedits ( #32427 )
2017-11-05 17:36:31 -06:00
cc438ea9b4
Refactors and improvements to xenobio slime processor ( #32406 )
...
* Do not let your memes be dreams
* static lists for great justice
* Local man forgets to capitalize a word
* Slime processor no longer runtimes when processing food
2017-11-05 04:32:07 -06:00
5113a71cff
Merge pull request #3807 from Citadel-Station-13/upstream-merge-32403
...
[MIRROR] Removes Freon preset gas filters from all maps
2017-11-04 22:54:06 -05:00
f81f3b7262
Merge pull request #3805 from Citadel-Station-13/upstream-merge-32390
...
[MIRROR] Fixes wrong locker IDs in pubby security cells
2017-11-04 22:53:09 -05:00
ACCount