Commit Graph

1989 Commits

Author SHA1 Message Date
EmeraldSundisk
0763436a1c Update CogStation.dmm 2020-08-13 23:06:09 -07:00
Trilbyspaceclone
1b61a5feb2 Merge branch 'master' into spike-loot-differentces 2020-08-12 15:10:37 -04:00
silicons
130c3a9480 Merge pull request #13096 from Michiyamenotehifunana/possum
Ports Opossums from Desert Rose
2020-08-11 16:19:42 -07:00
Detective Google
8976bea9a4 someone doesnt know how to fucking map edit 2020-08-11 10:35:52 -05:00
silicons
c18b26efe9 Merge pull request #13071 from ancientpower/box-medbay-doors
Adds doors to the west of box medbay
2020-08-11 01:45:23 -07:00
Letter N
7008dac8dd what if the maps aren't causing runtims 2020-08-11 11:49:25 +08:00
silicons
16306ad38b e 2020-08-10 18:14:34 -07:00
Detective Google
369af2a83a adds more heatpipes to snaxi sm 2020-08-10 14:50:37 -05:00
Michiyamenotehifunana
0f274d5891 Fixes some code anomalies
Adds newline to possum code, reverts var invalidation in kilostation's pets
2020-08-10 09:40:23 +08:00
Letter N
3a4dca33fa maps, will deal with tgui later 2020-08-09 21:09:55 +08:00
silicons
f20f01cc6b Merge pull request #12853 from LetterN/TGUI-4
TGUI4 port
2020-08-09 05:46:21 -07:00
silicons
1c2e42136c Merge pull request #13047 from Sishen1542/tbat
replaces box whiteship tbaton with truncheon
2020-08-09 05:45:50 -07:00
Letter N
186482ecef map fix 2020-08-09 19:50:45 +08:00
Michiyamenotehifunana
b33fc8e3b3 Adds Opposums to all maps
Except cogstation because it throws an error
2020-08-09 16:47:17 +08:00
Putnam
2b10fc81cf actually, fully, removed the kegs 2020-08-08 13:46:03 -07:00
Putnam
11560a0d69 Removed aphro from maps, too. 2020-08-08 01:38:11 -07:00
Sishen
3a8675048a Update whiteship_box.dmm 2020-08-07 21:16:52 -06:00
silicons
5471817656 Merge pull request #13046 from MrJWhit/hop-line-shutter-boxstation
Adds a second shutter to the hopline on boxstation
2020-08-07 17:30:20 -07:00
ancientpower
5f86cc8879 adds doors to the west of box medbay 2020-08-07 18:46:12 -05:00
Sishen
2d53eceb86 Update whiteship_box.dmm 2020-08-06 12:31:04 -06:00
Lin
c97aa49c12 Merge pull request #13026 from dapnee/active-turfs-DIE
More Active Turf Fixes
2020-08-06 12:35:35 -05:00
MrJWhit
94acbb5fe8 Update BoxStation.dmm 2020-08-06 13:31:16 -04:00
TrilbySpaceClone
3ae10ac826 update? 2020-08-06 13:09:41 -04:00
dapnee
7cd5217871 AI Open
What if Engies didn't have to ask the AI to open the way to tcomms so they could fix it?
2020-08-04 19:00:44 -06:00
dapnee
17d672ede3 changing protolathe to techfab
stepped on hatter's toes, oopsie
2020-08-04 14:49:28 -06:00
dapnee
e805fd9715 last fix
I saw white flooring under a window and I commited hyperfixation on the room
2020-08-04 13:50:46 -06:00
dapnee
c045016a35 removed some windows that were inside rock
why would you do this?
2020-08-04 13:47:58 -06:00
dapnee
7491d49510 fixes pubby gateway
just stumbling over the map slowly.
2020-08-04 13:45:09 -06:00
dapnee
ad5980636d Pubby Fixes
issues found on pubby are fixed here now as well
2020-08-04 13:31:57 -06:00
dapnee
cb17ea4874 More Active Turf Fixes
None of these nerds make their map names logically and it's hard to find which is which wihout going through a hundred of them.
2020-08-04 12:16:29 -06:00
Trilbyspaceclone
e1e6198140 Merge branch 'master' into spike-loot-differentces 2020-08-03 10:53:08 -04:00
Lin
0c85e3f127 Merge pull request #12989 from dapnee/why-is-box-even-fucked-like-this,-smh
You Thought I Was Done Fucking With Box BUT YOU WERE WRONG!
2020-08-02 12:50:34 -05:00
silicons
d2d598dcfe Merge pull request #12980 from dapnee/What-if-I-keep-fixing-maps
Map Edits Three: The Mappening
2020-08-01 03:34:59 -07:00
silicons
320c91f4d3 Merge pull request #12742 from KeRSedChaplain/clockcultrework
Clockwork Cult rework
2020-08-01 00:17:11 -07:00
dapnee
825ac6124b missed a tile
oopsy
2020-07-31 16:29:25 -06:00
dapnee
bcffff1e7d Update BoxStation.dmm
fucking amazing
2020-07-31 16:02:58 -06:00
dapnee
e197cb44b2 You Thought I Was Done Fucking With Box BUT YOU WERE WRONG!
Fixed active turfs from plating that sat in space, removed random catwalk to nowhere, turned the medical console in the sleeper room to not face a window, FIXED MAINTENANCE BAR APC NOT ACTUALLY BEING FOR THE MAINTENANCE BAR. As well as fixed the xeno hive ruin on lavaland from having active turfs.
2020-07-31 15:37:40 -06:00
Lin
0f07c8fca6 Merge pull request #12962 from dapnee/morechangestokilo
Another Pass Over Kilo
2020-07-31 14:25:56 -05:00
dapnee
3fdd1654ad aaaaaaa
I missed a SINGLE SINK
2020-07-30 16:44:24 -06:00
dapnee
dcf3155b7f Map Edits Three: The Mappening
Fixes active turfs in wizard ruin that spawns in lavaland and ones on the space hermit asteroid. Fixes delta missing APC's for botany, the pool, and the little lounge area before toxin's testing site. And a light to the server room so it's not pitch black in there.
2020-07-30 16:29:04 -06:00
dapnee
5a58cd6da0 Another pass over kilo
Added an air alarm to science near the bepis, fixed the active tiles around the arrivals shuttle, and fixed the commissary APC being only renamed and not area stringed correctly
2020-07-29 14:35:17 -06:00
silicons
1bc2404bae revert cc 2020-07-29 01:47:14 -07:00
silicons
e4148fe4ad Merge remote-tracking branch 'citadel/master' into 12742 2020-07-29 01:11:11 -07:00
Keate Senior
5284fbbec0 various fixes to make the PR not conflict with clickdelays probably 2020-07-28 23:52:13 -04:00
dapnee
f53280c9b7 adds another atmos tech spawn
treading on justin's pr by accident, oops
2020-07-28 13:46:10 -06:00
dapnee
170afed3bc oops
forgot the sinks in the locker room
2020-07-28 12:16:31 -06:00
dapnee
1540d66e88 Minor Fixes to Box
backwards sinks and such
2020-07-28 12:00:35 -06:00
silicons
785c2b6e0b Merge pull request #12934 from dapnee/a-fan
Miscellaneous fixes to Kilo Station and a Fan for the Listening Outpost
2020-07-26 23:01:08 -07:00
silicons
e083689b4b Merge pull request #12923 from EmeraldSundisk/snaxattack
Adds more toilets, among other things to Snow Taxi.
2020-07-26 23:00:16 -07:00
silicons
d9f9b2e974 Merge pull request #12916 from MrJWhit/meta-station-atmos-and-toxins-update
Metastation atmos and toxins map update
2020-07-26 22:57:36 -07:00