kevinz000
5949e35bda
Merge pull request #11436 from MrJWhit/kilostation-fixes-kevinz-edition
...
Kilostation adjustments
2020-03-14 09:11:12 -07:00
CitadelStationBot
a858316bdb
Automatic changelog generation for PR #11437 [ci skip]
2020-03-14 11:10:57 -05:00
kevinz000
a21458bba6
Merge pull request #11437 from keronshb/BlobBuffPort
...
Ports Blob Buffs
2020-03-14 09:10:54 -07:00
CitadelStationBot
46edd143e7
Automatic changelog generation for PR #11447 [ci skip]
2020-03-14 11:09:53 -05:00
kevinz000
395fa32136
Merge pull request #11447 from Ghommie/Ghommie-cit618
...
Porting datum components system updates.
2020-03-14 09:09:50 -07:00
CitadelStationBot
09afc31673
Automatic changelog generation for PR #11448 [ci skip]
2020-03-14 11:09:14 -05:00
kevinz000
a35049fc94
Merge pull request #11448 from Ghommie/Ghommie-cit619
...
Makes the autotransfer subsystem slightly more modulable.
2020-03-14 09:09:11 -07:00
CitadelStationBot
c8922547de
Automatic changelog generation for PR #11451 [ci skip]
2020-03-13 20:49:28 -05:00
Putnam3145
d9dc91db1a
More dynamic fixes ( #11451 )
...
* Fixed wizard, malf AI
* changed memes typename to story
* Fixed a bunch of really weird execute/ready confusion
* Added dynamic requirement to wands.
2020-03-14 02:49:25 +01:00
Ghommie
da5b293033
underscores.
2020-03-12 21:31:17 +01:00
Ghommie
d1b39b6590
.
2020-03-12 21:22:39 +01:00
Ghommie
0602e728c0
Doesn't delete the old auto transfer behavior.
2020-03-12 21:15:12 +01:00
Ghommie
663a849afe
Makes the autotransfer subsystem a bit more optional.
2020-03-12 21:02:34 +01:00
Ghommie
0876a1eef6
Porting datum components system updates.
2020-03-12 18:22:26 +01:00
CitadelStationBot
245b7ed306
Automatic changelog generation for PR #11431 [ci skip]
2020-03-12 11:49:53 -05:00
kevinz000
bbd69c407c
Merge pull request #11431 from Citadel-Station-13/Ghommie-patch-1
...
Missing contractor tablet icon state fix
2020-03-12 09:49:50 -07:00
CitadelStationBot
579799e72d
Automatic changelog generation for PR #11416 [ci skip]
2020-03-12 11:49:29 -05:00
kevinz000
78aa46d8de
Merge pull request #11416 from Trilbyspaceclone/patch-306
...
Makes Bluespace and Urianium reagents be able to be turned into sheets
2020-03-12 09:49:26 -07:00
Trilbyspaceclone
b4f57a8885
Update others.dm
2020-03-12 10:56:25 -04:00
CitadelStationBot
c6a9423c51
Automatic changelog generation for PR #11422 [ci skip]
2020-03-12 08:25:57 -05:00
Trilbyspaceclone
41ed18a537
Changes up some lava land ruins spawns ( #11422 )
...
* Update lavaland.dm
* Update lavaland.dm
2020-03-12 14:25:54 +01:00
kevinz000
87928d43ea
stamcrit check for fireaxe afterattack() ( #11426 )
...
* Update twohanded.dm
* Update twohanded.dm
2020-03-12 14:21:47 +01:00
CitadelStationBot
661a898dd9
Automatic changelog generation for PR #11425 [ci skip]
2020-03-12 08:20:52 -05:00
Ghom
442eb13e75
Merge pull request #11425 from Citadel-Station-13/kevinz000-patch-3
...
fixes synthflesh/rezadone dehusk threshold check
2020-03-12 14:20:49 +01:00
CitadelStationBot
166abfb1ee
Automatic changelog generation for PR #11429 [ci skip]
2020-03-12 08:20:31 -05:00
Ghom
9e3a3dddfd
Merge pull request #11429 from Putnam3145/dynamic-tweaks
...
Dynamic tweaks/fixes
2020-03-12 14:20:28 +01:00
CitadelStationBot
89a87f4b53
Automatic changelog generation for PR #11430 [ci skip]
2020-03-12 08:20:13 -05:00
Ghom
9e970b4a3e
Merge pull request #11430 from Putnam3145/fix-transfer
...
Tweaks for the transfer vote
2020-03-12 14:20:10 +01:00
CitadelStationBot
3b8f9887a3
Automatic changelog generation for PR #11406 [ci skip]
2020-03-12 08:18:42 -05:00
Ghom
c771471895
Merge pull request #11406 from kevinz000/minimaps
...
Ports station minimaps from Yogstation thank you monster860 you are an epic gamer
2020-03-12 14:18:39 +01:00
Putnam3145
ff264a06a9
Merge pull request #11442 from Citadel-Station-13/kevinz000-patch-5
...
[s] wack
2020-03-11 18:20:15 -07:00
kevinz000
0b6c5b7960
Update twohanded.dm
2020-03-11 18:19:09 -07:00
kevinz000
cdfab524ce
travis
2020-03-11 17:55:51 -07:00
Ghom
88bdc6d068
Merge pull request #11440 from kevinz000/master_fix
...
fixes master
2020-03-12 01:54:15 +01:00
Ghom
dbc54ab699
Update actions.dm
2020-03-12 01:47:51 +01:00
kevinz000
fa160d4c3a
Merge pull request #11434 from Citadel-Station-13/Ghommie-patch-3
...
Fixes flavor text preview on the chatbox.
2020-03-11 17:44:35 -07:00
CitadelStationBot
9533747d36
Automatic changelog generation for PR #11307 [ci skip]
2020-03-11 19:43:25 -05:00
kevinz000
db188f8681
Merge pull request #11307 from kappa-sama/patch-17
...
gets rid of fly species requirement from hulk
2020-03-11 17:43:23 -07:00
kevinz000
6127f6a453
k
2020-03-11 17:41:12 -07:00
kevinz000
14b22f0b67
Merge remote-tracking branch 'citadel/master' into minimaps
2020-03-11 17:32:15 -07:00
CitadelStationBot
165f9faf2c
Automatic changelog generation for PR #11373 [ci skip]
2020-03-11 19:27:25 -05:00
kevinz000
3ae8016ec8
Merge pull request #11373 from kappa-sama/supershotty
...
miner powercreep starring 150 damage pointblank shotgun
2020-03-11 17:27:22 -07:00
CitadelStationBot
77c8b789a5
Automatic changelog generation for PR #11408 [ci skip]
2020-03-11 19:26:36 -05:00
kevinz000
54713dc1e4
Merge pull request #11408 from necromanceranne/sleeping_carp_port
...
Refactors Martial Arts code, human_defense, and ports New Sleeping Carp
2020-03-11 17:26:33 -07:00
kappa-sama
80b17cff1f
Merge branch 'master' into patch-17
2020-03-11 20:26:13 -04:00
CitadelStationBot
0e1490791c
Automatic changelog generation for PR #11424 [ci skip]
2020-03-11 19:24:05 -05:00
kevinz000
b8642c5622
Merge pull request #11424 from necromanceranne/death_coma_stuff
...
Some fakedeath fixes requested by kev also ports a fix from tg to regen coma
2020-03-11 17:24:03 -07:00
CitadelStationBot
fa1aea4ab5
Automatic changelog generation for PR #10327 [ci skip]
2020-03-11 19:01:40 -05:00
kevinz000
69c21f4b76
Merge pull request #10327 from Seris02/tggenetics
...
ports tg genetics
2020-03-11 17:01:37 -07:00
Putnam3145
480eb32c68
Merge pull request #11418 from Ghommie/Ghommie-cit615
...
Fix runtimes some more.
2020-03-11 17:01:13 -07:00
