e3fb2d5491
Merge remote-tracking branch 'origin/master' into perlin-genny
2021-03-24 21:55:47 +08:00
5910950a49
Merge pull request #14473 from ItzGabby/bark-box
...
Bark Box Remastered Edition
2021-03-22 21:15:14 -06:00
292f67e098
Merge remote-tracking branch 'origin/master' into perlin-genny
2021-03-20 20:36:56 +08:00
7121295935
finalfix???
2021-03-19 03:08:10 -04:00
2fe6125955
fixes this map
2021-03-15 22:16:49 +08:00
a478555dbd
mapfix
2021-03-15 21:02:50 +08:00
935e46b492
The Mapping Update
...
Cleans up the map (again)
Makes mining code more better
2021-03-12 12:11:35 +08:00
69a054826b
add art areas on meta, and adds lapvend on box,delta,meta.
...
Other map changes are cosmetic.
2021-03-10 16:34:37 +08:00
754c24748e
Merge remote-tracking branch 'origin/master' into hardsync-1.5
2021-03-03 17:09:01 +08:00
7d39949a2f
Merge remote-tracking branch 'origin/master' into rustsql
2021-02-19 12:38:32 +08:00
037378eb7d
Merge remote-tracking branch 'origin/master' into hardsync-1.5
2021-02-19 10:34:47 +08:00
b3bfeb9858
it does not exist
2021-02-16 20:42:42 +08:00
348f57968f
Adds unique ruin cards and Exodia cards)
2021-02-04 16:42:55 +03:00
125cd17cee
Merge remote-tracking branch 'origin/master' into rustsql
2021-01-20 15:40:41 +08:00
ddad368d6a
Merge remote-tracking branch 'citadel/master' into tgsync
2021-01-08 00:33:57 -08:00
abffac67b2
Port'n
2021-01-06 03:16:08 -05:00
64f9605b51
map conflict any%
2021-01-02 19:56:04 +08:00
d82def21b8
linter shoo
2020-12-29 12:32:10 +08:00
0307884eab
Merge pull request #13627 from Ghommie/Ghommie-cit841
...
Here I fix a few issues.
2020-10-28 07:53:22 -07:00
90c4cb2022
Here I fix a few issues.
2020-10-25 14:50:42 +01:00
65fa7e72bf
Removing fire locker and adding a maint spawner instead
2020-10-22 18:52:16 -04:00
504447f3ae
Space Hermit buff
2020-10-22 15:23:33 -04:00
ec45402192
Add files via upload
2020-10-03 13:32:02 -07:00
1bf6ca9181
Update skelter.dmm
2020-10-02 14:46:37 -07:00
f310e940d1
Add files via upload
2020-09-30 14:52:58 -07:00
d7e9f39667
pixel fix
2020-09-30 12:43:18 -07:00
d2ae67aeea
Add files via upload
2020-09-29 14:25:00 -07:00
ff1094b33b
Create skelter.dmm
2020-09-29 14:10:20 -07:00
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
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
8fbdc6257c
Update listeningstation.dmm
...
it's a fan
2020-07-26 18:26:52 -06:00
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
9de8483bcf
Merge remote-tracking branch 'Upstream/master' into TGUI-3.0
2020-07-09 22:14:20 +03:00
562b57095d
mowing down the experimental cloner copypasta.
2020-07-05 03:04:53 +02:00
020da9fa07
i hope this works
2020-07-04 15:47:38 -03:00
6ee1eba56c
Merge remote-tracking branch 'origin/master' into TGUI-3.0
2020-07-02 23:23:47 +03:00
de77b7139c
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit765
2020-06-23 00:13:14 +02:00
aff4e5f93f
Linter fixes
2020-06-22 17:58:52 +03:00
170a38a3a7
Porting sutures and meshes from /TG/ ( #12532 )
...
* Porting sutures and meshes from /TG/
* Recipes fix
2020-06-16 16:22:56 -07:00
1bca74465f
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit765
2020-05-30 03:29:02 +02:00
da772b9cb7
Adds the "Space Diner" space ruin. ( #12337 )
...
* Create spacediner.dmm
* Update spacediner.dmm
* Update spacediner.dmm
* Conversion.
* Adds the beacon and APC.
2020-05-24 13:11:49 -07:00
30ab79e09e
Porting the twohanded component.
2020-05-17 18:16:53 +02:00
e0a51903a1
Not yet implemented design security level requirements.
2020-04-24 00:51:04 +02:00
2134515d5c
Merge remote-tracking branch 'upstream/master' into tackling_and_lunge
2020-04-15 12:19:37 +03:00
39e6541ccd
remove bad words
2020-04-14 17:54:07 -05:00
ab3ed7f9c2
Space Hermit Ruin fixes.
2020-04-11 23:27:19 +02:00
fe755a1424
Tackling Working so far, working on the lunge now
2020-04-09 21:42:00 +03:00
8b2132317b
Ports a rewritten version of BAYSTRUMENTS ( #11680 )
...
* bay instruments
* k
* AAA
* remove that
* changes
* Update _instrument_key.dm
* safety nets
* @ghommie fixed
* volume
* Update item.dm
* Update item.dm
Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com >
2020-04-07 15:21:50 +02:00
86898cc451
Force pushed updates
2020-03-22 01:43:19 +01:00
ab7fc2dc72
me and the boys stealing prs ( #11517 )
...
Co-authored-by: Hatterhat <Hatterhat@users.noreply.github.com >
2020-03-19 13:38:31 +01:00
LetterN