34fbcd1dc0
fixes
2020-02-19 07:49:05 -07:00
4a537d770d
let's make this work
2020-02-19 07:20:16 -07:00
950082f537
k
2020-02-18 20:49:42 -07:00
0229db9c61
trait comsigs
2020-02-18 18:23:01 -07:00
0e4692c63d
Merge remote-tracking branch 'citadel/master' into mobility_flags
2020-02-18 18:16:34 -07:00
fef9cc83ac
Automatic changelog generation for PR #11138 [ci skip]
2020-02-18 19:12:44 -06:00
479cdccd17
Merge pull request #11138 from Citadel-Station-13/kevinz000-patch-11
...
The game's BUILT IN AUTOCLICKER no longer triggers the autoclicker detection system
2020-02-19 02:12:42 +01:00
9a51caf834
Automatic changelog generation for PR #10980 [ci skip]
2020-02-18 19:10:28 -06:00
0619521418
Merge pull request #10980 from Trilbyspaceclone/cargo_memes_4
...
Corrects a few cargo crates/exports (and nerfs some)
2020-02-19 02:10:25 +01:00
4f13765f3c
Automatic changelog generation for PR #11103 [ci skip]
2020-02-18 19:09:04 -06:00
4d39bae16b
Merge pull request #11103 from PersianXerxes/cargoTraitorObjectivesRDumb
...
Clarifies comments and locks defusal kits behind an emag
2020-02-19 02:09:02 +01:00
77d5c09858
Merge pull request #11124 from Citadel-Station-13/kevinz000-patch-7
...
Bandaids a projectile runtime, removes an unused variable
2020-02-19 02:05:49 +01:00
19ca51a639
Automatic changelog generation for PR #11083 [ci skip]
2020-02-18 12:02:37 -06:00
2b7f27270f
Merge pull request #11083 from Hatterhat/sword-cleaning
...
purifying longswords - alt title "there's no way this should have worked"
2020-02-18 19:02:34 +01:00
33c0422453
Automatic changelog generation for PR #11091 [ci skip]
2020-02-18 10:11:52 -06:00
08c86ec1ea
Merge pull request #11091 from BlueWildrose/master
...
Podpeople species tail wag fix; also lifebringer name fix
2020-02-18 17:11:50 +01:00
e860a36c3d
Automatic changelog generation for PR #11131 [ci skip]
2020-02-18 10:02:20 -06:00
6ea2843149
Merge pull request #11131 from Seris02/demondabbing
...
nerfs bloodcrawl to a cooldown of 0.6 seconds instead of no cooldown
2020-02-18 17:02:17 +01:00
541ecffa1a
Automatic changelog generation for PR #11134 [ci skip]
2020-02-18 08:52:20 -06:00
218bb44e3f
Merge pull request #11134 from Hatterhat/tg-46579-also-icons
...
icons for mechs taking stock parts
2020-02-18 15:52:17 +01:00
1c156996f4
Automatic changelog generation for PR #11082 [ci skip]
2020-02-18 03:21:39 -06:00
d04126226b
Merge pull request #11082 from Hatterhat/preservahyde
...
preservahyde, alt title "what if i didnt die from having shit rng and a single epipen"
2020-02-18 02:21:37 -07:00
47adcaa5c5
Automatic changelog generation for PR #11087 [ci skip]
2020-02-18 03:21:19 -06:00
9280e25703
Merge pull request #11087 from Ghommie/Ghommie-cit579
...
Fix for solar panels/trackers being wonky.
2020-02-18 02:21:16 -07:00
a221280ab5
Automatic changelog generation for PR #11112 [ci skip]
2020-02-18 03:19:00 -06:00
ed36aae74b
Merge pull request #11112 from necromanceranne/mech-revival
...
Mech Stuff: Ports /tg/ pr #44529 , reverts #9092 (mostly)
2020-02-18 02:18:57 -07:00
97462c6ffb
Automatic changelog generation for PR #11111 [ci skip]
2020-02-18 03:18:06 -06:00
c1df5d5313
Merge pull request #11111 from Ghommie/Ghommie-cit582
...
Virology support for synthetic blood and some blood subtypes removal.
2020-02-18 02:18:03 -07:00
918618831c
Merge pull request #11109 from Citadel-Station-13/Ghommie-patch-3
...
Something about gibs and mob biotypes.
2020-02-18 02:17:32 -07:00
1cf45e4315
Automatic changelog generation for PR #11104 [ci skip]
2020-02-18 03:13:55 -06:00
84633e7fe4
Merge pull request #11104 from Trilbyspaceclone/patch-288
...
Maybe makes Express console log their buying habits
2020-02-18 02:13:53 -07:00
be45f89d8e
Automatic changelog generation for PR #11119 [ci skip]
2020-02-18 03:12:54 -06:00
43b9875bbd
Merge pull request #11119 from Ghommie/Ghommie-cit584
...
Something about consistency and magnetic rifles.
2020-02-18 02:12:51 -07:00
9dbc6ca183
Update client_procs.dm
2020-02-17 22:37:58 -07:00
139508a9a4
Update drag_drop.dm
2020-02-17 22:36:57 -07:00
cfca197fbb
forgot one last change that I made out of frustration because making things bald wasn't working for some reason
2020-02-17 19:55:32 -07:00
930e6f9876
Requested changes, ghost_role_spawner.dm
2020-02-17 19:47:48 -07:00
78fcd706b3
Requested changes, podpeople.dm
2020-02-17 19:41:30 -07:00
8f653b4dd6
Update materials.dm
2020-02-17 15:48:31 -05:00
3b82e34db6
Update code/modules/cargo/packs/emergency.dm
...
Co-Authored-By: Ghom <42542238+Ghommie@users.noreply.github.com >
2020-02-17 15:48:02 -05:00
cc685b813c
ignore the branch name i just needed icons
2020-02-17 14:35:37 -06:00
991f04877a
Automatic changelog generation for PR #11114 [ci skip]
2020-02-17 09:17:30 -06:00
b9b7e27bcb
Merge pull request #11114 from Psody-Mordheim/Plzgibsynthflesh
...
Revenge Of Synthflesh : Electric Boogalo Part 2
2020-02-17 16:17:27 +01:00
217661184d
nerf'd
2020-02-17 21:29:34 +08:00
a2583f5f7f
Update expressconsole.dm
2020-02-17 14:25:50 +01:00
5b7c376893
Automatic changelog generation for PR #11108 [ci skip]
2020-02-17 06:45:25 -06:00
5c60994572
Merge pull request #11108 from Seris02/hslshit
...
makes spraycans rely on HSL lightness instead of an addition of all the RGB values
2020-02-17 13:45:23 +01:00
7a1eec5622
Automatic changelog generation for PR #11053 [ci skip]
2020-02-17 06:29:54 -06:00
ffe1c794eb
Changes cult stunhand when halos are out ( #11053 )
...
* Changes cult stunhand when halos are out
Turns the stunhand into a burn + knockback hand. So it remains more defensive than offensive.
* Changes the desc a little
Changes it to "When the cult ascends, so does the spell, it burns and throws back the victim" Thanks Justin!
* Requested changes
Requested changes
2020-02-17 13:29:51 +01:00
de75d75519
Automatic changelog generation for PR #11090 [ci skip]
2020-02-17 05:47:22 -06:00
kevinz000