Letter N
754c24748e
Merge remote-tracking branch 'origin/master' into hardsync-1.5
2021-03-03 17:09:01 +08:00
Letter N
7d39949a2f
Merge remote-tracking branch 'origin/master' into rustsql
2021-02-19 12:38:32 +08:00
Letter N
037378eb7d
Merge remote-tracking branch 'origin/master' into hardsync-1.5
2021-02-19 10:34:47 +08:00
Letter N
b3bfeb9858
it does not exist
2021-02-16 20:42:42 +08:00
SmArtKar
348f57968f
Adds unique ruin cards and Exodia cards)
2021-02-04 16:42:55 +03:00
Letter N
125cd17cee
Merge remote-tracking branch 'origin/master' into rustsql
2021-01-20 15:40:41 +08:00
silicons
ddad368d6a
Merge remote-tracking branch 'citadel/master' into tgsync
2021-01-08 00:33:57 -08:00
MrJWhit
abffac67b2
Port'n
2021-01-06 03:16:08 -05:00
Letter N
64f9605b51
map conflict any%
2021-01-02 19:56:04 +08:00
Letter N
d82def21b8
linter shoo
2020-12-29 12:32:10 +08: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
Ghommie
90c4cb2022
Here I fix a few issues.
2020-10-25 14:50:42 +01: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
EmeraldSundisk
ec45402192
Add files via upload
2020-10-03 13:32:02 -07:00
EmeraldSundisk
1bf6ca9181
Update skelter.dmm
2020-10-02 14:46:37 -07: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
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
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
8fbdc6257c
Update listeningstation.dmm
...
it's a fan
2020-07-26 18:26:52 -06: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
Artur
9de8483bcf
Merge remote-tracking branch 'Upstream/master' into TGUI-3.0
2020-07-09 22:14:20 +03:00
Ghommie
562b57095d
mowing down the experimental cloner copypasta.
2020-07-05 03:04:53 +02:00
Cirno
020da9fa07
i hope this works
2020-07-04 15:47:38 -03:00
Artur
6ee1eba56c
Merge remote-tracking branch 'origin/master' into TGUI-3.0
2020-07-02 23:23:47 +03:00
Ghommie
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
Artur
aff4e5f93f
Linter fixes
2020-06-22 17:58:52 +03:00
SmArtKar
170a38a3a7
Porting sutures and meshes from /TG/ ( #12532 )
...
* Porting sutures and meshes from /TG/
* Recipes fix
2020-06-16 16:22:56 -07:00
Ghommie
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
EmeraldSundisk
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
Ghommie
30ab79e09e
Porting the twohanded component.
2020-05-17 18:16:53 +02:00
Ghommie
e0a51903a1
Not yet implemented design security level requirements.
2020-04-24 00:51:04 +02:00
Artur
2134515d5c
Merge remote-tracking branch 'upstream/master' into tackling_and_lunge
2020-04-15 12:19:37 +03:00
Linzolle
39e6541ccd
remove bad words
2020-04-14 17:54:07 -05:00
Ghommie
ab3ed7f9c2
Space Hermit Ruin fixes.
2020-04-11 23:27:19 +02:00
Artur
fe755a1424
Tackling Working so far, working on the lunge now
2020-04-09 21:42:00 +03:00
kevinz000
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
Ghommie
86898cc451
Force pushed updates
2020-03-22 01:43:19 +01:00
Hatterhat
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
BlackMajor
ca6341aac4
Merge branch 'master' into SpaceRuins
2020-02-24 19:47:52 +13:00
BlackMajor
984b57560b
Fixes cults being able to summon at ruins. As well as stops the ash storm sound.
2020-02-21 01:39:16 +13:00
BlackMajor
aff71e7f14
Initial Commit. Adds space ruins to station z.
2020-02-17 23:44:06 +13:00
Ghommie
55fa48737e
Forgot about not versioned files.
2020-02-02 01:28:16 +01:00
Ghommie
7837688426
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit490
2019-12-28 23:41:10 +01:00
Ghommie
e0caf6007b
Fixes space hermit asteroid rocks unintendedly spawning airless asteroid turf when mined, save for the perimeter...
2019-12-07 04:02:33 +01:00
Ghommie
9f00423bbd
Fixing the deep space gorilla.
2019-10-29 21:51:00 +01:00
kevinz000
9096f03ad3
Merge pull request #8654 from Ghommie/Ghommie-cit54
...
ports in the Hilbert's Hotel.
2019-10-24 19:07:33 -07:00
