Commit Graph

129 Commits

Author SHA1 Message Date
EmeraldSundisk 0df0910543 Add files via upload 2020-03-17 11:59:45 -07:00
EmeraldSundisk 4391afa295 Add files via upload 2020-03-17 11:50:50 -07:00
EmeraldSundisk 01d90f5cc8 shut 2020-03-17 08:37:24 -07:00
EmeraldSundisk e3cbf88989 Revert "5"
This reverts commit 17877d0d75.
2020-03-17 08:33:32 -07:00
EmeraldSundisk 17877d0d75 5 2020-03-17 08:22:17 -07:00
ZeroMan 96bd80ac54 map merge also exists 2020-03-06 15:52:33 -05:00
ZeroMan e4c871a8d3 eva is maybe dangerous 2020-03-06 15:52:12 -05:00
ZeroMan ef42a8c2f7 map merge also exists 2020-03-06 15:14:18 -05:00
ZeroMan bee1f7cfe5 its time to vibe 2020-03-06 15:13:23 -05:00
Persi c4b4a90bd8 Oh hey it's KiloStation
Trying to make Kilo open...

Finally, the work begins!

Kilo added!

Kilo Station!
2020-02-20 00:58:54 -05:00
keronshb 60a3b134a3 Should fix the rest of the requested changes
Title
2020-02-09 17:30:22 -05:00
keronshb 9609eb64e0 Fixes some files and pathings for this
Adds proper subtypes, put the health down a lil bit for the turret, fixed the welder type, added some tiny fans to the ship and also added some plastitanium windows where r-windows were
2020-02-09 15:18:15 -05:00
keronshb 5d1d652ea4 Buffs the Pirate Ship to be bomb proof
Title, also makes a few computers/machines indestructible and buffs turret health.  It also allows turrets to be repairable now.
2020-02-05 18:28:00 -05:00
Ghom 37c4565160 Whops. Two beacons, not one. 2020-02-01 02:06:56 +01:00
Ghommie ab4aa29576 clown ops infiltrator consistency. 2020-02-01 00:02:31 +01:00
r4d6 a360a89f86 Map Changes 2020-01-16 15:10:57 -05:00
Ghommie 911685ff0a Fixes raven's shuttle computer not being of the emergency shuttle type. 2019-12-12 23:28:50 +01:00
Ghommie 42d9e3cf51 Porting Robustin's Syndicate Infiltrator PR 2019-11-11 18:49:18 +01:00
Ghommie f6feeb93ea Mapping in arcade dirs. 2019-10-30 16:47:44 +01:00
BlackMajor 3ab0e8950e Bet 2019-10-28 18:07:13 +13:00
BlackMajor bc54b619d2 Update some things for consistency 2019-10-23 18:16:52 +13:00
BlackMajor 208d3fadd6 Update emergency_bar.dmm 2019-10-21 22:11:27 +13:00
BlackMajor 959c4b35ce Update all them shuttles 2019-10-21 22:00:18 +13:00
Ghommie 9f0278c34f map merging. 2019-06-24 06:13:42 +02:00
Ghommie fd68236594 ports "More variety for dorms bedsheets" + 3 new bed sheets. 2019-06-24 05:54:14 +02:00
Poojawa 29f4dfca83 Maps batch fixed 2019-04-13 23:30:22 -05:00
Ghommie 0e8f356610 Milk. 2019-03-11 11:54:40 +01:00
Trilbyspaceclone 9618fecfb7 Correct fans 2019-01-02 02:40:10 -05:00
Trilbyspaceclone 0b556a46af correct fans 2019-01-02 02:39:19 -05:00
Trilbyspaceclone fc5b9117f2 Correct fans 2019-01-02 02:35:23 -05:00
Trilbyspaceclone 02761a38c9 Correct fans 2019-01-02 02:29:53 -05:00
Trilbyspaceclone de551bc0c6 Revert "Adds fans to each white ship hopefully at all doors leading to space! - Requested by Seras/Others (#7862)"
This reverts commit addea6f21c.
2019-01-02 02:21:23 -05:00
Trilbyspaceclone addea6f21c Adds fans to each white ship hopefully at all doors leading to space! - Requested by Seras/Others (#7862)
* Fixing updater

* Adds fans

* Adds fan

* Update whiteship_meta.dmm

* Update whiteship_delta.dmm
2018-12-31 03:05:39 -08:00
Tupinambis a3678b0713 Adds an emag exclusive syndicate emergency shuttle. 2018-11-10 15:33:01 -06:00
Poojawa c836a7e5ea Cleans up map errors
Knowing my fucking luck it ain't all of 'em
2018-09-20 04:28:02 -05:00
Poojawa 42db44b39e Alien Ruin fix, various cherrypicked upstream fixes
Also adds new buildmode
2018-09-13 22:55:11 -05:00
Poojawa df7e625adb One day, while Bhjin was being lazy... 2018-09-11 13:03:53 -05:00
Poojawa ec76f36099 plz fuck off with these map changes kthx 2018-09-11 12:51:45 -05:00
Poojawa fa70720cc1 Map Conversions 2018-09-11 08:58:34 -05:00
deathride58 db2a15d42d maps, tools, goon folder, icons, sounds, and strings. everything except code 2018-07-01 23:54:31 -04:00
Jordan Brown 2cd16aa1ad Fix some shuttle chair stuff (#38557)
* Fix shuttle chair stuff

* Remove redundancy
2018-06-19 01:29:17 -05:00
LetterJay 7ab66531bf Merge pull request #7162 from Citadel-Station-13/upstream-merge-38539
[MIRROR] Adds New Shuttle Chairs
2018-06-18 21:58:42 -05:00
LetterJay 50da00b26c Merge pull request #7161 from Citadel-Station-13/upstream-merge-38540
[MIRROR] Cleans up supermatter related varedits
2018-06-18 21:58:15 -05:00
LetterJay 90df70a8f1 Merge pull request #7134 from Citadel-Station-13/upstream-merge-38509
[MIRROR] Makes the caravan ambush ruin harder to cheese
2018-06-18 09:53:05 -05:00
fludd12 96b620d540 Adds New Shuttle Chairs (#38539)
* I'm crashing this shuttle with no survivors.

* comma comma comma comma comma chameleon
2018-06-18 09:38:25 -05:00
81Denton 9b1f891a29 Cleans up supermatter related varedits (#38540)
* Cleans up supermatter related varedits

* reee

* fakecrystal
2018-06-18 09:38:16 -05:00
81Denton e92060a3a9 Makes the caravan ambush ruin harder to cheese (#38509)
* makes caravan ambush more challenging

* SMASH
2018-06-16 15:38:34 -05:00
Dax Dupont e5b95cfcdd Some minor pubby shuttle tweaks (#38489)
* Some minor pubby shuttle tweaks

* no step

* Good idea denton

* thanks guys
2018-06-16 06:17:57 -05:00
deathride58 255ffb96bb Merge branch 'master' into upstream-merge-38179 2018-06-05 21:32:22 +00:00
LetterJay b94207ed11 Merge pull request #6994 from Citadel-Station-13/upstream-merge-38223
[MIRROR] Slight changes to camera network code
2018-06-05 12:11:19 -05:00