Putnam3145
9d300ade35
Merge pull request #13677 from silicons/newlines
...
Adds missing EOF newlines
2020-11-18 17:50:38 -08:00
The0bserver
6d1ace27f7
Initial Commit: Mapping is painful
2020-11-18 00:38:35 -05:00
EmeraldSundisk
330da48518
Add files via upload
2020-11-14 15:38:33 -08:00
EmeraldSundisk
00398cb45a
Add files via upload
2020-11-14 15:14:53 -08:00
EmeraldSundisk
993ac9b52d
Add files via upload
2020-11-14 13:32:34 -08:00
EmeraldSundisk
81c9bfecdc
Update CogStation.dmm
2020-11-14 10:37:05 -08:00
silicons
803bff4e5f
funny
2020-11-12 23:34:42 -07:00
silicons
446feeb8f8
Merge pull request #13653 from MrJWhit/kilo-fixes
...
A few fixes to kilo
2020-11-07 00:32:23 -07:00
silicons
2b273addf1
Merge pull request #13618 from Vynzill/mappinghell
...
new jungle gateway map
2020-11-07 00:19:11 -07:00
MrJWhit
be9e5acc19
A few fixes to kilo
2020-11-01 21:02:18 -05:00
zeroisthebiggay
44eb62b388
a ( #13647 )
2020-11-01 22:00:20 +01:00
silicons
453d5081a7
Merge pull request #13628 from MrJWhit/messing-with-boxstations-maint
...
Adjusting Boxstation's Southeast Maint (three new rooms)
2020-10-28 07:54:04 -07:00
silicons
0307884eab
Merge pull request #13627 from Ghommie/Ghommie-cit841
...
Here I fix a few issues.
2020-10-28 07:53:22 -07:00
silicons
2827893950
Merge pull request #13612 from MrJWhit/hermit-expansion
...
Space Hermit map buff
2020-10-28 07:47:24 -07:00
MrJWhit
5806ea8f50
Even cooler.jpg
2020-10-26 20:39:20 -04:00
MrJWhit
5da37ddeb2
Minor fix
2020-10-26 18:57:06 -04:00
MrJWhit
65f82daa44
Update BoxStation.dmm
2020-10-25 17:59:53 -04:00
MrJWhit
1e65afda9d
Update BoxStation.dmm
2020-10-25 17:58:00 -04:00
MrJWhit
c540bcd0f2
Secret botany
2020-10-25 17:54:02 -04:00
MrJWhit
33cfcc72be
Making box maint cooler, bot party room and maint rage cage part 1
2020-10-25 14:31:43 -04:00
Ghommie
f49f72338f
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit841
2020-10-25 15:01:57 +01:00
Ghommie
90c4cb2022
Here I fix a few issues.
2020-10-25 14:50:42 +01:00
MrJWhit
c860cc78df
Giving science a space loop on every map ( #13611 )
...
* Boxstation Fix
* DeltaStation and Boxstation Update
* Kilo fix and minor omegastation fix
* Lambda fixing
* Metastation update
* Second to last update
* Pubby and final touches
2020-10-25 14:15:01 +01:00
Vynzill
ff6850b9b0
jungle gateway map
2020-10-23 15:11:27 -05:00
MrJWhit
65fa7e72bf
Removing fire locker and adding a maint spawner instead
2020-10-22 18:52:16 -04:00
MrJWhit
504447f3ae
Space Hermit buff
2020-10-22 15:23:33 -04:00
Vynzill
5f75151c51
junglemap
2020-10-21 17:00:28 -05:00
Detective Google
8167f047f9
Update snow_taxi.dmm
2020-10-17 19:29:13 -05:00
silicons
0c3020d4b8
Merge pull request #13349 from LetterN/git-updates
...
Updates git, travis, and build tests
2020-10-11 01:24:09 -07:00
BlackMajor
bf7d68884b
Merge pull request #13510 from silicons/google
...
a more sane json-based map override system for jobs (todo port to rp so rp can have map rotation)
2020-10-11 18:39:10 +13:00
silicons
1bd715ffc6
Merge pull request #13525 from Detective-Google/hilberts-juke
...
fixes the hilbert's jukebox(?)
2020-10-10 22:01:09 -07:00
silicons
19f1e99a8c
mass ports like 15 tg prs + counting ( #13386 )
...
* changes
* ok
* changes
* sigh
* fixes
* changes
* fix
* fix
* alright
* fixes
git pus
* fix
* fix
* fix
* test
* ok
* Update code/modules/paperwork/ticketmachine.dm
Co-authored-by: Letter N <24603524+LetterN@users.noreply.github.com >
* ok
* compile and other stuff
* ok
* fix
* fix
* Fix
* Update menu.dm
* Update view.dm
* Update preferences.dm
Co-authored-by: Letter N <24603524+LetterN@users.noreply.github.com >
Co-authored-by: Putnam3145 <putnam3145@gmail.com >
2020-10-10 12:20:33 +02:00
silicons
6d5cee7775
Merge pull request #13500 from LetterN/map-updates
...
Updates Lambda station
2020-10-06 17:04:22 -07:00
silicons
eae67e38f4
Merge pull request #13509 from EmeraldSundisk/helter
...
Slight adjustment to the "Skelter" ruin.
2020-10-06 17:02:24 -07:00
Detective Google
ddc9b9d184
yeet
2020-10-06 01:23:29 -05:00
silicons
2bd7280fb1
Merge remote-tracking branch 'citadel/master' into lettern-git-updates
2020-10-03 20:52:49 -07:00
silicons
21d3d8fcd9
sigh
2020-10-03 14:17:13 -07:00
EmeraldSundisk
ec45402192
Add files via upload
2020-10-03 13:32:02 -07:00
Letter N
dee73e234b
updatestuff
2020-10-03 11:01:23 +08:00
EmeraldSundisk
1bf6ca9181
Update skelter.dmm
2020-10-02 14:46:37 -07:00
Detective Google
86871a92fc
fixes the door bolts on the snow cabin
2020-10-02 11:41:43 -05:00
Detective Google
57132d0b32
Merge remote-tracking branch 'upstream/master' into clothing
2020-10-01 14:06:21 -05:00
silicons
4dd9f20d22
Merge pull request #13470 from EmeraldSundisk/skelter
...
Helter-Skelter.
2020-10-01 03:09:51 -07:00
silicons
75d4cc5f66
Merge pull request #13391 from dapnee/let's-change-lambda
...
Lambda Mk.II
2020-10-01 02:33:43 -07:00
Detective Google
c4480afc09
Adds a bunch of RP clothes and ports the detvendor
2020-09-30 20:50:00 -05:00
EmeraldSundisk
f310e940d1
Add files via upload
2020-09-30 14:52:58 -07:00
EmeraldSundisk
d7e9f39667
pixel fix
2020-09-30 12:43:18 -07:00
EmeraldSundisk
d2ae67aeea
Add files via upload
2020-09-29 14:25:00 -07:00
EmeraldSundisk
ff1094b33b
Create skelter.dmm
2020-09-29 14:10:20 -07:00
dapnee
28e2e1c652
more fixes
...
adresses issues that were brought up, will update changelog later
2020-09-26 19:31:27 -06:00
