Commit Graph

34621 Commits

Author SHA1 Message Date
Changelogs
2e8a2fee66 Automatic changelog compile [ci skip] 2020-06-20 00:07:58 +00:00
kevinz000
6516e07bd8 Merge pull request #12566 from Ghommie/Ghommie-cit818
Fixing some runtimes issues and warnings bout rnd.
2020-06-19 14:22:40 -07:00
CitadelStationBot
d805ba3d9b Automatic changelog generation for PR #12414 [ci skip] 2020-06-19 16:09:13 -05:00
Ghom
e31ce2edcf Merge pull request #12414 from LetterN/asset-cache-thing
asset cache + better minimaps
2020-06-19 23:09:09 +02:00
CitadelStationBot
ca7f452a7f Automatic changelog generation for PR #12542 [ci skip] 2020-06-19 16:07:26 -05:00
Ghom
dd009ada48 Merge pull request #12542 from bunny232/scrubber
Removes lewd events from the vent clog event
2020-06-19 23:07:23 +02:00
Ghommie
43acf79dd3 oh wow 2020-06-19 21:55:01 +02:00
Ghommie
162549a3c2 Fixing stuff. 2020-06-19 20:34:51 +02:00
Changelogs
915b147367 Automatic changelog compile [ci skip] 2020-06-19 00:07:42 +00:00
Lin
8303de3c00 Merge pull request #12564 from kevinz000/sigh
fixes sutures and mesh being invisible hey speedmerge this
2020-06-18 17:10:19 -05:00
kevinz000
c7e42c8d88 groan 2020-06-18 14:31:34 -07:00
CitadelStationBot
f60f9555ee Automatic changelog generation for PR #12487 [ci skip] 2020-06-18 13:37:14 -05:00
Lin
3cdc73ff35 Merge pull request #12487 from kevinz000/erp_2
Adds ||italics|| __underline__ ++bold++ support because why the fuck not
2020-06-18 13:37:10 -05:00
Lin
7d30d7c7ff Merge pull request #12545 from Citadel-Station-13/kevinz000-patch-1
maybe fixes conveyors being a crash vector
2020-06-18 13:34:31 -05:00
nik707
1f53cd34d3 Merge pull request #12563 from kevinz000/shuttles
fixes master (shuttles not loading)
2020-06-18 10:41:20 -05:00
nik707
828f6686cf Merge pull request #12553 from Citadel-Station-13/kevinz000-patch-3
fixes dd.log
2020-06-18 10:40:47 -05:00
CitadelStationBot
407ed71d38 Automatic changelog generation for PR #12560 [ci skip] 2020-06-18 10:24:59 -05:00
kevinz000
e381f7060e Merge pull request #12560 from SmArtKar/runtime_fixes
Runtime Fixes
2020-06-18 08:24:57 -07:00
kevinz000
c655a0451c Update shuttle.dm 2020-06-18 08:24:51 -07:00
kevinz000
1b5ea90c8f sigh 2020-06-18 08:16:05 -07:00
SmArtKar
17c38efbb0 Runtime Fixes 2020-06-18 11:24:08 +03:00
CitadelStationBot
da704db97d Automatic changelog generation for PR #12548 [ci skip] 2020-06-17 22:10:07 -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
CitadelStationBot
4035812c0f Automatic changelog generation for PR #12555 [ci skip] 2020-06-17 22:08:13 -05:00
kevinz000
c42889feb6 Merge pull request #12555 from Funce/sqrt-circuit-fix
Square Root Circuit fix
2020-06-17 20:08:11 -07:00
CitadelStationBot
98e0999c63 Automatic changelog generation for PR #12554 [ci skip] 2020-06-17 22:06:54 -05:00
kevinz000
eeee2140bd Merge pull request #12554 from deathride58/bluespaceshenanigans
fixes an oversight that bricks atmos under specific conditions.
2020-06-17 20:06:50 -07:00
CitadelStationBot
a4fafad137 Automatic changelog generation for PR #12482 [ci skip] 2020-06-17 20:03:28 -05:00
Lin
46fdb476b5 Merge pull request #12482 from TheSpaghetti/patch-1
More insectoid insects (I accidentally ruined the first version of this, so I'm trying again.)
2020-06-17 20:03:25 -05:00
Changelogs
bb2028cc76 Automatic changelog compile [ci skip] 2020-06-18 00:07:42 +00:00
Funce
aa798af36e Fix square root circuit to check the only input it has 2020-06-18 08:50:29 +12:00
deathride58
1a40fa73fb fixes an upstream oversight that completely bricks a downstream's atmos 2020-06-17 15:24:17 -04:00
kevinz000
f0f2a7eaf2 Update world.dm 2020-06-17 11:12:34 -07:00
CitadelStationBot
54c5a847b7 Automatic changelog generation for PR #12540 [ci skip] 2020-06-17 11:15:35 -05:00
kevinz000
53dc2da8c7 Merge pull request #12540 from timothyteakettle/embed-changes
ports tg embeds
2020-06-17 09:15:32 -07:00
Timothy Teakettle
2229db2214 Merge branch 'master' into embed-changes 2020-06-17 16:40:34 +01:00
CitadelStationBot
e9b0dc898a Automatic changelog generation for PR #12537 [ci skip] 2020-06-17 10:35:53 -05:00
kevinz000
eb572c9d47 Merge pull request #12537 from timothyteakettle/ports-tipping-medibots
ports tipping medbots from tg
2020-06-17 08:35:50 -07:00
CitadelStationBot
93eef9fb13 Automatic changelog generation for PR #12544 [ci skip] 2020-06-17 10:35:37 -05:00
kevinz000
2e943e03a3 Merge pull request #12544 from SmArtKar/bee_shuttles
Shuttles from beestation
2020-06-17 08:35:34 -07: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
CitadelStationBot
5e2d5c2b09 Automatic changelog generation for PR #12530 [ci skip] 2020-06-17 01:32:52 -05: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
CitadelStationBot
ff4d6e3dee Automatic changelog generation for PR #12538 [ci skip] 2020-06-17 01:32:18 -05:00
kevinz000
bd9ce04471 some cog touchups (#12538) 2020-06-16 23:32:14 -07:00
CitadelStationBot
d1cd0b0601 Automatic changelog generation for PR #12539 [ci skip] 2020-06-17 01:32:08 -05: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
Changelogs
d9d3eb15f1 Automatic changelog compile [ci skip] 2020-06-17 00:07:45 +00:00
CitadelStationBot
176b6bcf14 Automatic changelog generation for PR #12535 [ci skip] 2020-06-16 18:23:20 -05:00
SmArtKar
29ff6fc464 Updating ID Icons (#12535)
* Mid-process

* ID updates
2020-06-16 16:23:17 -07:00