Commit Graph

16247 Commits

Author SHA1 Message Date
kevinz000 950082f537 k 2020-02-18 20:49:42 -07:00
Winter Flare 00d66c9b91 Renamed CAT_FISH to CAT_EASTERN 2020-02-18 22:19:58 -05:00
Putnam 60f819465c what. what. what. what. what. 2020-02-18 18:30:15 -08:00
kevinz000 0e4692c63d Merge remote-tracking branch 'citadel/master' into mobility_flags 2020-02-18 18:16:34 -07:00
Ghom 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
Ghom 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
Ghom 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
Ghom 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
raspyosu 9803a0835c lunge tweaks
added short (20 frames at 30fps) windup w/ telegraphing via audio only played to target
range increased to 4
added flavor text
2020-02-18 19:04:20 -05:00
Putnam 2834994587 why didn't we do this sooner 2020-02-18 11:34:09 -08:00
Ghom 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
Ghom 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
Ghommie 698f0b8177 Something about pAIs and silicon access priviledges. 2020-02-18 16:20:44 +01:00
kevinz000 3785c94a1b more responsive 2020-02-18 03:57:39 -07:00
kevinz000 ef05410b75 k 2020-02-18 03:32:04 -07:00
kevinz000 1e57463d1b k 2020-02-18 03:16:47 -07:00
kevinz000 53d7192c9c k 2020-02-18 03:12:57 -07:00
kevinz000 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
kevinz000 9280e25703 Merge pull request #11087 from Ghommie/Ghommie-cit579
Fix for solar panels/trackers being wonky.
2020-02-18 02:21:16 -07:00
kevinz000 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
kevinz000 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
kevinz000 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
kevinz000 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
kevinz000 43b9875bbd Merge pull request #11119 from Ghommie/Ghommie-cit584
Something about consistency and magnetic rifles.
2020-02-18 02:12:51 -07:00
kevinz000 d6fe0df7ac Update pai.dm 2020-02-18 02:10:03 -07:00
kevinz000 9264163d93 Update pai.dm 2020-02-18 01:47:20 -07:00
kevinz000 6a97006b12 Update pai_defense.dm 2020-02-18 01:41:28 -07:00
kevinz000 9dbc6ca183 Update client_procs.dm 2020-02-17 22:37:58 -07:00
Winter Flare ed46d3ca1c Typo 2020-02-18 00:37:28 -05:00
Winter Flare 1a994e7f1e Ports Broom, Tweak Janitor Vendor
Ports Brooms from TG https://github.com/tgstation/tgstation/pull/49120

Makes Broom printable.

Reduces Broom sound effect.

Updates Janitor Vendor to have equipment for at least 2 janitors.
2020-02-17 23:36:22 -05:00
BlueWildrose 78fcd706b3 Requested changes, podpeople.dm 2020-02-17 19:41:30 -07:00
Cameron! a9f103fb34 removes unused bottle, kicks travis? 2020-02-17 15:28:10 -08:00
raspyosu 0fa679771b fix indentation
muh spaces
2020-02-17 17:46:47 -05:00
raspyosu 6e32a466af tweak mesmerize
range increased
added a "windup"
hardstun length increased to counteract windup
windup allows target to attempt to avoid via breaking line of sight at the time the windup completes
initial stun reduced to major slowdown, user also recieves slowdown to prevent sprint memes from just letting them follow around a corner if there is one
2020-02-17 17:24:09 -05:00
Trilbyspaceclone 8f653b4dd6 Update materials.dm 2020-02-17 15:48:31 -05:00
Trilbyspaceclone 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
Ghom b9b7e27bcb Merge pull request #11114 from Psody-Mordheim/Plzgibsynthflesh
Revenge Of Synthflesh : Electric Boogalo Part 2
2020-02-17 16:17:27 +01:00
Ghom eddefd4d25 Update large_objects.dm 2020-02-17 15:07:17 +01:00
Seris02 217661184d nerf'd 2020-02-17 21:29:34 +08:00
Ghommie 5dc271124a Something about tesla revolvers and tk. 2020-02-17 14:29:14 +01:00
Ghom a2583f5f7f Update expressconsole.dm 2020-02-17 14:25:50 +01:00
Winter Flare 79705d1716 Moving Burgers Around 2020-02-17 08:24:21 -05:00
Ghom 5e10f822e6 Update energy.dm 2020-02-17 13:40:37 +01:00
Cameron! 28a589d2d1 diethylamine > ammonia 2020-02-17 04:32:39 -08:00
Ghom 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
Seris02 b271096b77 rest key, v, version two (#11090)
* maybe

* skreeeee

* yes

* fucccccccccck

* happy now

* Update interface.dm

Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com>
2020-02-17 12:47:19 +01:00
Winter Flare dc6d1fb359 Sorted Frozen Foods 2020-02-17 05:56:02 -05:00
Winter Flare c97111beda Reorganise Food + Balance Tweaks
-Reorganised -ALL- foods in the crafting menu.
-Made a section for Eastern Dishes, Mexican Dishes, and Sweets
-Made Bowls, Salads, Soups, Eggs Benedict, and Omelettes normal sized.
-Moved Easter Recipies to the food files, fixing it in the process.
-Capitalised a few things.
2020-02-17 05:32:03 -05:00
Cameron! 78fad64d56 this is no longer necessary 2020-02-16 15:54:41 -08:00
Cameron! a4a5efbc11 ghommble's other changes 2020-02-16 15:48:22 -08:00