 Artur
|
f230e2bb06
|
fIXES KILO
|
2020-07-07 20:29:21 +03:00 |
|
|
Artur
|
2158278a6f
|
Fixes cog
|
2020-07-07 18:44:54 +03:00 |
|
|
Artur
|
280d3de6c3
|
Merge remote-tracking branch 'origin/master' into TGUI-3.0
|
2020-07-07 18:37:45 +03:00 |
|
|
EmeraldSundiskandGitHub
|
672f86a318
|
Add files via upload
|
2020-07-05 09:39:53 -07:00 |
|
|
EmeraldSundisk
|
75b2a7dad5
|
Update CogStation.dmm
|
2020-07-05 09:18:26 -07:00 |
|
|
EmeraldSundisk
|
d9f269280b
|
Update CogStation.dmm
|
2020-07-04 23:45:08 -07:00 |
|
|
EmeraldSundisk
|
45a14f16d4
|
Revert "?"
This reverts commit c6b5bac0d8.
|
2020-07-04 21:39:23 -07:00 |
|
|
EmeraldSundisk
|
c6b5bac0d8
|
?
|
2020-07-04 21:33:29 -07:00 |
|
|
Artur
|
b1a45b2b0d
|
what the fuck ma-[ps
|
2020-07-04 16:34:29 +03:00 |
|
|
Artur
|
6ee1eba56c
|
Merge remote-tracking branch 'origin/master' into TGUI-3.0
|
2020-07-02 23:23:47 +03:00 |
|
|
GhomandGitHub
|
8666f83848
|
Merge pull request #12620 from EmeraldSundisk/omegasec2
Gives Omega Station genpop.
|
2020-07-01 19:52:44 +02:00 |
|
|
Artur
|
20245f7319
|
Merge remote-tracking branch 'origin/master' into TGUI-3.0
|
2020-06-30 02:30:29 +03:00 |
|
|
Ghommie
|
9dc4b99620
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit765
|
2020-06-30 00:49:06 +02:00 |
|
|
siliconsandGitHub
|
e51bee9649
|
Merge pull request #12607 from Detective-Google/cog-2
cog fixes round 2
|
2020-06-27 14:54:31 -07:00 |
|
|
EmeraldSundiskandGitHub
|
2926f8dab1
|
Add files via upload
|
2020-06-26 16:40:01 -07:00 |
|
|
EmeraldSundisk
|
37f2242eec
|
Update OmegaStation.dmm
|
2020-06-26 15:08:21 -07:00 |
|
|
Detective Google
|
42ae6233db
|
aeugh
|
2020-06-25 15:18:11 -05:00 |
|
|
Detective Google
|
5d99f68d8c
|
stinky panda goes in the box
|
2020-06-25 14:57:41 -05:00 |
|
|
Detective Google
|
f33586a4b5
|
coggers
|
2020-06-25 14:41:03 -05:00 |
|
|
EmeraldSundisk
|
71576d79ee
|
Update OmegaStation.dmm
|
2020-06-24 15:01:58 -07:00 |
|
|
MrJWhit
|
922abf5994
|
Just doing it myself
|
2020-06-24 01:30:30 -04:00 |
|
|
MrJWhit
|
5b91340e47
|
Update Snaxi.dmm
|
2020-06-24 01:18:12 -04:00 |
|
|
MrJWhit
|
ca93891014
|
AAAAAAAAAAAAAAAAAAAAAAAAAH
|
2020-06-23 23:39:15 -04:00 |
|
|
Ghommie
|
265acb6876
|
travis check.
|
2020-06-23 15:38:04 +02: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 |
|
|
Artur
|
c41d2e78be
|
Conflicts!!!
|
2020-06-22 17:39:24 +03:00 |
|
|
EmeraldSundisk
|
7f6e8f8670
|
Update OmegaStation.dmm
|
2020-06-21 00:30:30 -07:00 |
|
|
kevinz000andGitHub
|
fbf09e84c4
|
Merge pull request #12531 from Detective-Google/o7-icebox
Takes icebox out back and old yellers it.
|
2020-06-16 23:36:41 -07:00 |
|
|
kevinz000andGitHub
|
ba162eb90a
|
Merge pull request #12530 from Detective-Google/no-more-100%-chance-combat-upgrade
Ashwalker den no longer spawns with a Malf upgrade and illegal tech
|
2020-06-16 23:32:48 -07:00 |
|
|
kevinz000andGitHub
|
bd9ce04471
|
some cog touchups (#12538)
|
2020-06-16 23:32:14 -07:00 |
|
|
Detective-GoogleandGitHub
|
9d956e7c1c
|
a couple little snaxi fixes (#12539)
* a couple little snaxi fixes
* way too much blasma
* asd
* adadadada
* a
* bepis
* patrol beacons
* aaaaa
|
2020-06-16 23:32:04 -07:00 |
|
|
SmArtKarandGitHub
|
170a38a3a7
|
Porting sutures and meshes from /TG/ (#12532)
* Porting sutures and meshes from /TG/
* Recipes fix
|
2020-06-16 16:22:56 -07:00 |
|
|
Artur
|
882c11e0e5
|
This is every single onstation gateway r-r-ight?
|
2020-06-16 20:53:56 +03:00 |
|
|
Artur
|
bc30fb7710
|
Hard resets _maps to master
|
2020-06-16 16:09:05 +03:00 |
|
|
Artur
|
5df0cbfc40
|
Manual mapedit
|
2020-06-16 02:29:05 +03:00 |
|
|
Artur
|
ae7aea43b2
|
Annoying map shjit
|
2020-06-16 01:37:25 +03:00 |
|
|
Artur
|
ceba739231
|
Cooonflicts
|
2020-06-16 01:23:42 +03:00 |
|
|
Detective Google
|
6ec28cd914
|
some cog touchups
|
2020-06-14 16:26:19 -05:00 |
|
|
Detective Google
|
6b6c5c6ecd
|
don't go gently into the night, sweet prince.
|
2020-06-13 22:25:18 -05:00 |
|
|
Detective Google
|
fa5bae14f1
|
no 100% chance doomsday :^)
|
2020-06-13 22:14:23 -05:00 |
|
|
EmeraldSundiskandGitHub
|
6512866c06
|
Initial OmegaStation Security overhaul. (#12499)
* Update OmegaStation.dmm
* Update OmegaStation.dmm
* Update OmegaStation.dmm
* Add files via upload
|
2020-06-11 05:44:01 -07:00 |
|
|
TrilbyspacecloneandGitHub
|
f42994c79b
|
Toxin tweaks! Just storage (#12363)
* Toxin tweaks
* bepis readd
* paintings
* Update DeltaStation2.dmm
* Fixed
|
2020-06-09 05:34:22 -07:00 |
|
|
Artur
|
b6dc41b852
|
Merge remote-tracking branch 'origin/master' into TGUI-3.0
|
2020-06-09 11:07:39 +03:00 |
|
|
Artur
|
094a1b6f62
|
More vr sleeper work and map fix
|
2020-06-09 11:06:16 +03:00 |
|
|
EmeraldSundiskandGitHub
|
1d990d317e
|
Minimally invasive update to Omega Station. (#12434)
* Update OmegaStation.dmm
* Update OmegaStation.dmm
* Add files via upload
|
2020-06-04 15:44:12 -07:00 |
|
|
GhomandGitHub
|
1c3bfa623f
|
Merge pull request #12175 from Detective-Google/snaxi2
Adds a New map, Snow Taxi (A vgstation13 map port)
|
2020-06-02 23:48:50 +02:00 |
|
|
EmeraldSundiskandGitHub
|
2ac1ada029
|
Add files via upload
|
2020-05-31 19:52:00 -07:00 |
|
|
Artur
|
19f215477e
|
Merge remote-tracking branch 'upstream/master' into TGUI-3.0
|
2020-05-30 18:52:02 +03: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 |
|