Commit Graph

21280 Commits

Author SHA1 Message Date
kevinz000 1e57463d1b k 2020-02-18 03:16:47 -07:00
kevinz000 53d7192c9c k 2020-02-18 03:12:57 -07:00
kevinz000 49cef552a0 cleaner 2020-02-18 02:27:38 -07:00
kevinz000 43db506161 stopa ccidently recycling this 2020-02-18 02:26:05 -07:00
kevinz000 8666a36b1e fixes most things 2020-02-18 02:24:31 -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 d7949e810e Merge remote-tracking branch 'citadel/master' into staves 2020-02-18 02:20:58 -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
kevinz000 139508a9a4 Update drag_drop.dm 2020-02-17 22:36:57 -07: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 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
BlueWildrose 930e6f9876 Requested changes, ghost_role_spawner.dm 2020-02-17 19:47:48 -07:00
BlueWildrose 78fcd706b3 Requested changes, podpeople.dm 2020-02-17 19:41:30 -07:00
BlackMajor 9a54b451eb Added two more ruins, Owai's suggestions. 2020-02-18 12:57:48 +13: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 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
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
Ghom b028b296f5 Update mob_holder.dm 2020-02-17 12:17:33 +01:00
Winter Flare dc6d1fb359 Sorted Frozen Foods 2020-02-17 05:56:02 -05:00
BlackMajor aff71e7f14 Initial Commit. Adds space ruins to station z. 2020-02-17 23:44:06 +13: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
Ghom 66d5e0e346 Update station.dm 2020-02-17 01:03:29 +01: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
kevinz000 262b4d95fb Update projectile.dm 2020-02-16 16:44:29 -07:00
Cameron! 3ecd1b75d4 ghommald's changes 2020-02-16 15:32:05 -08:00
Trilbyspaceclone c5eaac62bd Update materials.dm 2020-02-16 18:26:22 -05:00