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 |
|
Ghom
|
8666f83848
|
Merge pull request #12620 from EmeraldSundisk/omegasec2
Gives Omega Station genpop.
|
2020-07-01 19:52:44 +02: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 |
|
silicons
|
e51bee9649
|
Merge pull request #12607 from Detective-Google/cog-2
cog fixes round 2
|
2020-06-27 14:54:31 -07:00 |
|
silicons
|
7115df73f7
|
Merge pull request #12591 from MrJWhit/snow-snaxi-update
Snow Snaxi update
|
2020-06-27 14:53:52 -07:00 |
|
EmeraldSundisk
|
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
|
57fca41e20
|
aeugh2
|
2020-06-25 15:22:11 -05: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 |
|
Detective Google
|
5b0886a150
|
and that's all folks (for now)
|
2020-06-22 20:32:12 -05:00 |
|
Detective Google
|
a406927c95
|
euthanizes spacebattle, helps wildwest a little (it's still shit)
|
2020-06-22 20:31:14 -05:00 |
|
Detective Google
|
98756b3bc7
|
snowdin is wack
|
2020-06-22 20:24:19 -05:00 |
|
Detective Google
|
46805bc872
|
more progress
|
2020-06-22 20:11:18 -05:00 |
|
Detective Google
|
a8b6bb7957
|
step 2; de-looting the caves
|
2020-06-22 19:46:48 -05:00 |
|
Detective Google
|
dc81519380
|
whoops me forget to hit save first
|
2020-06-22 19:29:01 -05:00 |
|
Detective Google
|
d4dd1a162a
|
loot-yeet #1; wizard academy
|
2020-06-22 19:28:47 -05: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 |
|
EmeraldSundisk
|
7f6e8f8670
|
Update OmegaStation.dmm
|
2020-06-21 00:30:30 -07:00 |
|
Detective Google
|
4e26916502
|
Merge remote-tracking branch 'upstream/master' into bald-bald-bald-bald-bald-bald-bald
|
2020-06-20 14:00:14 -05:00 |
|
kevinz000
|
118ac1a775
|
Merge pull request #12548 from timothyteakettle/more-events
ports several tg events including fugitives
|
2020-06-17 20:10:04 -07:00 |
|
Detective Google
|
898480af84
|
fixes some missing icon statesa on moonoutpost and UO45
|
2020-06-17 19:48:28 -05:00 |
|
Detective Google
|
0e1db216c8
|
Ports the reworked snowcabin and beach away missions by Jerry Derpinson (the baldy)
|
2020-06-17 19:33:14 -05:00 |
|
kevinz000
|
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 |
|
kevinz000
|
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 |
|
kevinz000
|
bd9ce04471
|
some cog touchups (#12538)
|
2020-06-16 23:32:14 -07:00 |
|
Detective-Google
|
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 |
|
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 |
|
Timothy Teakettle
|
2d1d2eeda6
|
final fixes
|
2020-06-16 23:47:22 +01:00 |
|
Timothy Teakettle
|
779e15f3b5
|
map fixes
|
2020-06-16 17:16:31 +01:00 |
|
Timothy Teakettle
|
d10dfbec5e
|
fix maps but it works
|
2020-06-16 16:23:53 +01:00 |
|
timothyteakettle
|
b59c8c1af6
|
fix maps
|
2020-06-16 02:44:11 +01:00 |
|
Timothy Teakettle
|
d7bce8aec0
|
ports some events
|
2020-06-15 20:22:40 +01:00 |
|
Detective Google
|
6ec28cd914
|
some cog touchups
|
2020-06-14 16:26:19 -05:00 |
|
TrilbySpaceClone
|
6a008d2944
|
Kevs requests
|
2020-06-14 06:03:13 -04: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 |
|
EmeraldSundisk
|
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 |
|
Trilbyspaceclone
|
f42994c79b
|
Toxin tweaks! Just storage (#12363)
* Toxin tweaks
* bepis readd
* paintings
* Update DeltaStation2.dmm
* Fixed
|
2020-06-09 05:34:22 -07:00 |
|
EmeraldSundisk
|
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 |
|
Ghom
|
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 |
|
TrilbySpaceClone
|
dee7fc67eb
|
Update lavaland_surface_sloth.dmm
|
2020-06-01 19:50:44 -04:00 |
|
EmeraldSundisk
|
2ac1ada029
|
Add files via upload
|
2020-05-31 19:52:00 -07:00 |
|
TrilbySpaceClone
|
fa71523cdf
|
even better founten!
|
2020-05-30 22:09:06 -04:00 |
|