 Ghommie
|
8ccd0d2cbc
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit595
|
2020-03-12 20:31:14 +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 |
|
|
kevinz000
|
0d80c8c169
|
Merge pull request #11412 from Citadel-Station-13/Ghommie-patch-2
RCL inhands wires fix.
|
2020-03-11 17:01:01 -07:00 |
|
|
CitadelStationBot
|
e76704bfa3
|
Automatic changelog generation for PR #11414 [ci skip]
|
2020-03-11 19:00:49 -05:00 |
|
|
kevinz000
|
3df171cf99
|
Merge pull request #11414 from Citadel-Station-13/Ghommie-patch-3-1
Fixes mob spawners errors with posibrains.
|
2020-03-11 17:00:46 -07:00 |
|
|
CitadelStationBot
|
b311b62919
|
Automatic changelog generation for PR #11409 [ci skip]
|
2020-03-11 18:30:55 -05:00 |
|
|
Ghom
|
9f681e9a76
|
Merge pull request #11409 from necromanceranne/taser_nerf
Particle Defender no longer just the HoS taser but a shotgun/Stimulants protect against the tased effect.
|
2020-03-12 00:30:52 +01:00 |
|
|
CitadelStationBot
|
d30ba9721c
|
Automatic changelog generation for PR #11410 [ci skip]
|
2020-03-11 18:28:06 -05:00 |
|
|
Ghom
|
199272ca9d
|
Merge pull request #11410 from necromanceranne/harvesters_and_mechs
Ports tg#44633: Fixes blood beam oneshotting mech pilots.
|
2020-03-12 00:28:03 +01:00 |
|
|
Ghom
|
e41e3a5fbb
|
Update banana.dm
|
2020-03-12 00:22:53 +01:00 |
|
|
CitadelStationBot
|
5c4663d364
|
Automatic changelog generation for PR #11432 [ci skip]
|
2020-03-11 11:21:03 -05:00 |
|
|
Ghom
|
3b102c4ef7
|
Merge pull request #11432 from Citadel-Station-13/kevinz000-patch-2
legion swarming now only applies to legions, not all of everything else that is a supertype and subtype of /hivelordbrood
|
2020-03-11 17:21:00 +01:00 |
|
|
Ghom
|
77bdb9afe8
|
Update flavor_text.dm
|
2020-03-11 17:15:04 +01:00 |
|
|
Ghom
|
ed92d21a0e
|
Merge pull request #11427 from Citadel-Station-13/kevinz000-patch-5
Fixes posibrain/MMI mechs not getting any mobility flags
|
2020-03-11 16:48:02 +01:00 |
|
|
kevinz000
|
2bf892c482
|
Update bubblegum.dm
|
2020-03-11 08:07:37 -07:00 |
|