shizcalev
|
e1086bb616
|
merge conflict fix
|
2017-06-25 12:35:36 -04:00 |
|
Jordan Brown
|
94effbd25f
|
Replaces all instances of the tgstation2 map with Box Station (#28463)
* Replaces all instances of the tgstation2 map with BoxStation
* Fix basemap
|
2017-06-25 18:15:56 +02:00 |
|
Steelpoint
|
f8ee37afc0
|
Ancient Space Station [Space Spawn Ruin] (#28584)
* FirstCommit
* HardsuitAncientSounds
* FurtherWorkSave
* HivebotSpriteMinorMapChange
* FinalFixesPrePR
* MinorFixes
* FixesPart1
* TGMMap
* Wording
* VoidSuitPlusSpelling
* TGMConv
* MoreSpelling
* RadioStorm
* SomehowGotThisToWork
|
2017-06-25 12:02:31 -04:00 |
|
Steelpoint
|
0f109d4938
|
[Boxstation] Slight Upper Engineering Remap (#28739)
* InitialCommit
* RWindowToWindow
* MergeConflictFix
|
2017-06-25 11:19:16 -04:00 |
|
ShizCalev
|
ca29c6c510
|
Varedit cleanup: Mk 4½ (#28715)
|
2017-06-24 16:43:01 -03:00 |
|
Leo
|
ea445d9ebe
|
Merge pull request #28662 from ShizCalev/tgm-convert
Converts shelter_2.dmm to TGM
|
2017-06-22 12:57:33 -03:00 |
|
shizcalev
|
da6f97f136
|
convert shelter_2.dmm
|
2017-06-20 23:31:44 -04:00 |
|
shizcalev
|
dac92b5498
|
fixes
fixes #28410
|
2017-06-20 19:41:25 -04:00 |
|
ShizCalev
|
bfe6b89d9e
|
Var-edit Cleanup and Fixes: Mk3 - The Revenge (#28617)
|
2017-06-20 20:02:34 -03:00 |
|
Jordan Brown
|
59a3865f60
|
Merge pull request #28600 from ChangelingRain/hiddenripley
Adds a heavily-damaged ripley as a lavaland ruin
|
2017-06-20 13:08:48 -04:00 |
|
AnturK
|
868d374fab
|
Moves transit space to separate z level. (#28598)
* Transt Z-level
* Just in case
* Map edit
* I guess i forgot to push the few lines i changed at work.
* This one too
* Bluh
|
2017-06-20 11:31:32 -04:00 |
|
Jordan Brown
|
693850c534
|
Merge pull request #28544 from ShizCalev/engine-tweaks
Adjusts engine filter output to account for faster processing
|
2017-06-19 14:15:13 -04:00 |
|
Joan Lung
|
0fd7b8b842
|
Adds a heavily-damaged ripley as a ruin
|
2017-06-19 12:28:29 -04:00 |
|
Lan
|
5114dc094c
|
what could POSSIBLY go wrong (#28535)
|
2017-06-18 10:48:27 -04:00 |
|
shizcalev
|
01bb0c8eed
|
increase
|
2017-06-17 22:39:44 -04:00 |
|
Jordan Brown
|
b79dd740d5
|
Merge pull request #28380 from ShizCalev/engine-standardization
Standardized SM engine filter line
|
2017-06-17 16:45:06 -04:00 |
|
Lan
|
98ed543423
|
Adds Penguins, and Penguins to Winter Wonderland (#28454)
|
2017-06-17 09:32:28 -03:00 |
|
Leo
|
f81cd66bc3
|
Merge pull request #28482 from Bedrydant/master
Fixed PubbyStation piping
|
2017-06-16 14:52:03 -03:00 |
|
ShizCalev
|
854d0bc006
|
[meta] Corrects missing blastdoor in toxins (#28455)
fixes #28440
|
2017-06-15 20:12:19 -04:00 |
|
Bedrydant
|
887b82056f
|
Fixed PubbyStation
Clean log, no more errors from atmos pipes.
|
2017-06-15 08:38:50 +02:00 |
|
Joan Lung
|
218448dc66
|
Merge pull request #28437 from ShizCalev/delta-fixes
[Delta] fixed doubled up pen blast door
|
2017-06-14 21:55:38 -04:00 |
|
shizcalev
|
569ab8dcc4
|
done
|
2017-06-13 21:12:15 -04:00 |
|
WJohn
|
f344e1ed21
|
Merge pull request #28379 from ShizCalev/omega-fixes
[Omega] Cleaned up unconnected atmos pipes
|
2017-06-13 17:25:14 -04:00 |
|
shizcalev
|
57e1453785
|
fix
|
2017-06-13 16:18:13 -04:00 |
|
ShizCalev
|
1b67599b81
|
Roundstart AT Cleanup mk2 (#28383)
|
2017-06-13 09:12:52 -03:00 |
|
ShizCalev
|
d4e8c844d7
|
fixes pipe (#28378)
|
2017-06-13 10:03:13 +02:00 |
|
WJohn
|
3c7ed1c817
|
Fixes power issues in survival bunker. (#28377)
* Fixes power issues in survival bunker and widespread use of high pressure windows.
* Fixes more shit.
* Fixes airless floors.
|
2017-06-13 10:02:51 +02:00 |
|
ShizCalev
|
af7de3bb32
|
fixes (#28343)
fixes #28309
|
2017-06-13 09:28:37 +02:00 |
|
shizcalev
|
526ed32ad4
|
cleaned up pipes
|
2017-06-12 02:52:16 -04:00 |
|
Leo
|
c0562488e3
|
Merge pull request #28301 from WJohn/tcomms_wiring
Fixes box's telecomms wiring.
|
2017-06-11 10:39:52 -03:00 |
|
WJohn
|
5ee2f670f7
|
Tweaks telecomms wiring.
|
2017-06-10 06:01:54 -04:00 |
|
Lzimann
|
574ba46374
|
Cleans up basemap.dm
|
2017-06-09 21:54:36 -03:00 |
|
TrustyGun
|
1db56a3d58
|
Clown Toy Box + Wooden Crates (#28227)
|
2017-06-09 13:01:51 -03:00 |
|
Leo
|
303e283d82
|
Merge pull request #28192 from ShizCalev/meta-dirty
[Delta] Ridin' Dirty
|
2017-06-08 19:18:53 -03:00 |
|
ShizCalev
|
f2d829261a
|
[Typo] Duffel Bag (#28200)
|
2017-06-08 19:16:20 -03:00 |
|
ShizCalev
|
d671f032ef
|
[Meta] atmosia pump layer fix (#28190)
|
2017-06-08 19:15:51 -03:00 |
|
Joan Lung
|
93bf75b576
|
Merge pull request #28178 from Expletive/detectivehair
Adds 91 new sprites for the Detective's Fedora and gives it some better booze.
|
2017-06-08 11:50:55 -04:00 |
|
Joan Lung
|
90051b3f32
|
Merge pull request #28161 from Mark9013100/delta_fixes_6/6/2017
[Delta] More misc map fixes
|
2017-06-07 20:25:47 -04:00 |
|
ShizCalev
|
fab4e63898
|
Cere Dirty Var cleanup (#28141)
|
2017-06-07 16:18:23 -03:00 |
|
shizcalev
|
afb20dbcfe
|
dirty cameras
|
2017-06-07 13:53:35 -04:00 |
|
Expletive
|
a776f4d5e3
|
Fix travis
|
2017-06-07 09:30:45 -07:00 |
|
Expletive
|
250725732d
|
Curator has a proper wardrobe now.
|
2017-06-07 09:22:11 -07:00 |
|
Expletive
|
8413960d8e
|
A large and unasked for repath and improvement of accessories (formerly ties, but actually armbands and medals) (#28115)
|
2017-06-06 22:26:56 -03:00 |
|
Mark9013100
|
25f1bfbf57
|
[Delta] More misc map fixes
|
2017-06-06 19:58:51 -04:00 |
|
Mark9013100
|
3fb4ea123e
|
[Delta] Misc map fixes
|
2017-06-06 12:49:06 -04:00 |
|
InsaneHyena
|
5713a44048
|
Removes donut steelpoint (#28041)
|
2017-06-05 00:12:26 -03:00 |
|
WJohn
|
1a1ca97ce3
|
Merge pull request #28039 from MMMiracles/space_bowie
Deepstorage Ruin Revamp
|
2017-06-04 22:13:48 -04:00 |
|
MMMiracles
|
cf8f96430f
|
removes rouge dresser
|
2017-06-03 12:22:14 -04:00 |
|
MMMiracles
|
1bd6b03bcb
|
deepstorage ruin revamp
|
2017-06-03 12:04:28 -04:00 |
|
Leo
|
55c188d71e
|
Merge pull request #27967 from WJohn/map_fixes
Fixes thunderdome, moves delta nuke op shuttle locations a bit.
|
2017-06-03 12:57:08 -03:00 |
|