Commit Graph

1961 Commits

Author SHA1 Message Date
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
dapnee
940d4c4d72 kilostation fixes
haha, why did this get through?
2020-07-26 19:30:55 -06:00
dapnee
8fbdc6257c Update listeningstation.dmm
it's a fan
2020-07-26 18:26:52 -06:00
EmeraldSundisk
29a3050209 Add files via upload 2020-07-26 11:30:24 -07:00
MrJWhit
d14256e8a9 Minor map adjustments to meta 2020-07-26 01:10:56 -04:00
MrJWhit
503d39e8bc Update MetaStation.dmm 2020-07-26 00:51:58 -04:00
EmeraldSundisk
40b956c1ba Update Snaxi.dmm 2020-07-25 19:31:21 -07:00
Keate Senior
e2eb08fcba probably gets travis to stop yelling about the new reebe 2020-07-25 17:43:49 -04:00
dapnee
6f0860d1d3 What if Meta Arrivals Weren't An Eye Sore?
Whack of you to assume this is kosher to make arrivals look like shit like that.
2020-07-23 16:36:54 -06:00
silicons
3c5aa67eef Merge pull request #12867 from EmeraldSundisk/omega717
Expands OmegaStation's medical wing.
2020-07-23 10:29:29 -07:00
silicons
9392eb3bb1 Merge pull request #12866 from Sneakyrat6/snaxiTypo
Fixes Snaxi DMM Typos
2020-07-23 10:29:19 -07:00
EmeraldSundisk
29023f9522 Add files via upload 2020-07-22 16:49:40 -07:00
EmeraldSundisk
f422ffb998 Update OmegaStation.dmm 2020-07-22 15:24:20 -07:00
Sneakyrat6
1a641231a9 Fixes Snaxi DMM Typos 2020-07-22 16:20:32 -05:00
silicons
f3efa19436 Merge remote-tracking branch 'citadel/master' into 12742 2020-07-21 11:25:26 -07:00
silicons
3c4b11f3f2 please 2020-07-21 11:20:45 -07:00
EmeraldSundisk
bcec131eff Update OmegaStation.dmm 2020-07-20 22:06:00 -07:00
silicons
267186a5d3 Merge pull request #12646 from Chiirno/emi
[READY] Alt-click cigarette pack functionality added to pill bottles.
2020-07-20 16:15:38 -07:00
EmeraldSundisk
166ad02d6b Update OmegaStation.dmm 2020-07-19 22:26:35 -07:00
Keate Senior
214db57e95 minor Reebe edits
Basically just makes sure all the component decorations in Reebe can't be used for a varying amount of starter power
2020-07-19 02:09:43 -04:00
EmeraldSundisk
f9222485bf Update OmegaStation.dmm 2020-07-18 22:56:27 -07:00
silicons
f8ad4d3186 Merge pull request #12761 from EmeraldSundisk/deltadive
A pool and lighting fixes for Delta Station.
2020-07-17 17:11:22 -07:00
silicons
b22848b3f7 Merge pull request #12758 from MrJWhit/pubby-extra-light
Adds another light to pubby next to the kitchen
2020-07-17 17:09:25 -07:00
Keate Senior
3521a54c2b Reebe as its own z is just easier to manage, so its back to being one
Sorry maxcappers and BoH bombers, your cheap tactics will no longer work if you manage to sneak into the void
2020-07-15 00:44:30 -04:00
EmeraldSundisk
4febb24dcf Add files via upload 2020-07-13 08:38:22 -07:00
Artur
732a1ca438 Fixes linter and conflict shit 2020-07-13 16:35:12 +03:00
Artur
5f9364c5f8 Merge remote-tracking branch 'Upstream/master' into TGUI-3.0 2020-07-13 16:20:54 +03:00
MrJWhit
d13eb1868c Adds another light to pubby 2020-07-13 02:05:29 -04:00
EmeraldSundisk
4cd7670eaf Update DeltaStation2.dmm 2020-07-12 21:03:09 -07:00