1a40fa73fb
fixes an upstream oversight that completely bricks a downstream's atmos
2020-06-17 15:24:17 -04:00
54c5a847b7
Automatic changelog generation for PR #12540 [ci skip]
2020-06-17 11:15:35 -05:00
53dc2da8c7
Merge pull request #12540 from timothyteakettle/embed-changes
...
ports tg embeds
2020-06-17 09:15:32 -07:00
2229db2214
Merge branch 'master' into embed-changes
2020-06-17 16:40:34 +01:00
e9b0dc898a
Automatic changelog generation for PR #12537 [ci skip]
2020-06-17 10:35:53 -05:00
eb572c9d47
Merge pull request #12537 from timothyteakettle/ports-tipping-medibots
...
ports tipping medbots from tg
2020-06-17 08:35:50 -07:00
93eef9fb13
Automatic changelog generation for PR #12544 [ci skip]
2020-06-17 10:35:37 -05:00
2e943e03a3
Merge pull request #12544 from SmArtKar/bee_shuttles
...
Shuttles from beestation
2020-06-17 08:35:34 -07:00
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
5e2d5c2b09
Automatic changelog generation for PR #12530 [ci skip]
2020-06-17 01:32:52 -05:00
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
ff4d6e3dee
Automatic changelog generation for PR #12538 [ci skip]
2020-06-17 01:32:18 -05:00
bd9ce04471
some cog touchups ( #12538 )
2020-06-16 23:32:14 -07:00
d1cd0b0601
Automatic changelog generation for PR #12539 [ci skip]
2020-06-17 01:32:08 -05:00
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
d9d3eb15f1
Automatic changelog compile [ci skip]
2020-06-17 00:07:45 +00:00
176b6bcf14
Automatic changelog generation for PR #12535 [ci skip]
2020-06-16 18:23:20 -05:00
29ff6fc464
Updating ID Icons ( #12535 )
...
* Mid-process
* ID updates
2020-06-16 16:23:17 -07:00
17ac614ba5
Automatic changelog generation for PR #12532 [ci skip]
2020-06-16 18:22:59 -05:00
170a38a3a7
Porting sutures and meshes from /TG/ ( #12532 )
...
* Porting sutures and meshes from /TG/
* Recipes fix
2020-06-16 16:22:56 -07:00
f054ae6288
appease our great linter overlord
2020-06-16 21:40:50 +01:00
f4913af4ee
woops did i forget that
2020-06-16 20:08:30 +01:00
f6a4e26e91
Automatic changelog generation for PR #12543 [ci skip]
2020-06-16 10:25:25 -05:00
8f35795971
Update autobotter_designs.dm ( #12543 )
2020-06-16 08:25:21 -07:00
46c3e9e54d
Shuttles
2020-06-16 18:16:14 +03:00
a61b63c1aa
fix ricochets properly
2020-06-16 01:18:45 +01:00
e8de29a8ce
Automatic changelog compile [ci skip]
2020-06-16 00:08:12 +00:00
002fa1da1d
how did i fuck that up
2020-06-16 00:34:28 +01:00
35aa1c4520
merge conflict fixes
2020-06-15 23:56:46 +01:00
61c338ca8c
Merge branch 'embed-changes' of https://github.com/timothyteakettle/Citadel-Station-13 into embed-changes
2020-06-15 23:50:35 +01:00
e010212180
please work
2020-06-15 23:49:38 +01:00
eba1e8f301
fixes the merge conflicts
2020-06-15 23:29:49 +01:00
7fbfb4ad0e
Merge remote-tracking branch 'upstream/master' into embed-changes
2020-06-15 22:48:26 +01:00
c1d966ca44
Merge branch 'master' into embed-changes
2020-06-15 22:45:09 +01:00
1d3cad02ef
Automatic changelog generation for PR #12521 [ci skip]
2020-06-15 14:07:17 -05:00
106a79d50b
Merge pull request #12521 from Citadel-Station-13/kevinz000-patch-21
...
Tackle "crit fail" now only gives a lobotomy class leg paralysis instead of magic/unremovable
2020-06-15 14:07:13 -05:00
cb9bb35823
Automatic changelog generation for PR #12520 [ci skip]
2020-06-15 14:06:35 -05:00
898b0b6337
Merge pull request #12520 from Citadel-Station-13/kevinz000-patch-20
...
Lobotomy can no longer give magic resilience traumas
2020-06-15 14:06:32 -05:00
9e4081ddca
Merge pull request #12522 from Citadel-Station-13/kevinz000-patch-22
...
Gets rid of a useless file
2020-06-15 14:04:50 -05:00
b215c5ed1f
Automatic changelog generation for PR #12518 [ci skip]
2020-06-15 13:59:44 -05:00
fd662047f3
Merge pull request #12518 from kevinz000/pp_fix
...
refactors projectile ricochet and fixes a runtime with projectile motion
2020-06-15 13:59:41 -05:00
1683829a21
Automatic changelog generation for PR #12393 [ci skip]
2020-06-15 01:06:47 -05:00
c054b55d98
Automatic changelog generation for PR #12375 [ci skip]
2020-06-15 01:06:09 -05:00
d7fd26c2a9
Moves decal painting from BEPIS into venders ( #12393 )
...
* Update bepis.dm
* Update assist.dm
* Update engivend.dm
* Update youtool.dm
2020-06-14 23:04:51 -07:00
7513e032e3
petrification improvements ( #12375 )
...
* petrification improvements
* Standards.
2020-06-14 23:04:12 -07:00
8ee2f46ca2
Automatic changelog generation for PR #12509 [ci skip]
2020-06-15 01:02:26 -05:00
6798699b18
slimes can change their body color using alter form ( #12509 )
...
* let slimes change their color!
* fix
* let them change hair colour
* Revert "let them change hair colour"
This reverts commit 561bc3d06733fcfee2bae5be819c5a3e57bfc89d.
2020-06-14 23:02:23 -07:00
a436692b4e
Automatic changelog generation for PR #12523 [ci skip]
2020-06-15 00:51:36 -05:00
5df4931266
fix food cart ( #12523 )
2020-06-14 22:50:16 -07:00
4863c8f467
Automatic changelog compile [ci skip]
2020-06-15 00:07:49 +00:00
deathride58