silicons
66874fe252
Merge pull request #14083 from shellspeed1/alternative-xeno-hive
...
Removes the queen, and increases xeno variety in lavaland xenomorph ruin.
2021-01-20 15:22:06 -07:00
Putnam3145
f7f9185073
Merge pull request #13826 from LetterN/semi-sync
...
/tg/ ""hardsync"" part one of many*
2021-01-19 17:22:05 -08:00
shellspeed1
450937a8f3
Update lavaland_surface_alien_nest.dmm
2021-01-18 15:27:40 -08:00
MrJWhit
4f49dab040
Update Mining_Station_Public_01.dmm
2021-01-18 01:57:05 -05:00
shellspeed1
bbd3fd54ba
fixed map alteration I think
2021-01-17 19:44:18 -08:00
shellspeed1
eabecb1618
Revert "Reworks lavaland xeno ruin a bit"
...
This reverts commit e8e92cb805
2021-01-17 18:07:48 -08:00
shellspeed1
e8e92cb805
Reworks lavaland xeno ruin a bit
2021-01-17 18:01:38 -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
d82def21b8
linter shoo
2020-12-29 12:32:10 +08:00
The0bserver
4559a153c3
Map Tweak
2020-11-27 16:51:55 -05:00
The0bserver
5e9e984fd0
a few more crumbs we missed. Travis might be happy now.
2020-11-20 18:45:32 -05:00
The0bserver
902cb94ee7
Whoo, we almost forgot this one.
2020-11-20 05:19:54 -05:00
The0bserver
6d1ace27f7
Initial Commit: Mapping is painful
2020-11-18 00:38:35 -05: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
MrJWhit
dc61b0fbd7
Captain Plasma -> Mumkey Jones
2020-08-19 23:25:27 -04:00
MrJWhit
92a664bb68
Update engine_teg.dmm
2020-08-18 04:32:47 -04:00
MrJWhit
5adb1c75d5
Update engine_teg.dmm
2020-08-18 03:45:37 -04:00
Detective Google
016fd2ac3c
woo yeah yeah woo
2020-08-15 23:55:52 -05:00
Letter N
186482ecef
map fix
2020-08-09 19:50:45 +08: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
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
dapnee
825ac6124b
missed a tile
...
oopsy
2020-07-31 16:29:25 -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
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
silicons
27f7224d4d
Merge pull request #12407 from Trilbyspaceclone/lavaland-ruin-tweaks
...
Much better looking lava land ruins!
2020-07-01 16:11:06 -07: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
TrilbySpaceClone
6a008d2944
Kevs requests
2020-06-14 06:03:13 -04:00
TrilbySpaceClone
dee7fc67eb
Update lavaland_surface_sloth.dmm
2020-06-01 19:50:44 -04:00
TrilbySpaceClone
fa71523cdf
even better founten!
2020-05-30 22:09:06 -04:00
TrilbySpaceClone
48e9e54466
much better looking!
2020-05-30 21:07:14 -04: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
Ghom
85186a9714
Porting updates related to material datums. ( #12317 )
...
* Porting updates related to material datums.
* art_type
* oh oh
2020-05-25 14:21:00 -07:00
