Commit Graph

24553 Commits

Author SHA1 Message Date
kevinz000 3e09ee8328 Alright 2020-04-22 10:42:11 -07:00
Lin df4452468a Merge pull request #11932 from Ghommie/Ghommie-cit695
Some mispelled filepaths.
2020-04-22 16:09:33 +00:00
Lin 20f2d5d961 Merge pull request #11964 from Citadel-Station-13/Ghommie-patch-2
Makes the human form ling power work again.
2020-04-22 16:07:49 +00:00
kevinz000 5c17902628 compile 2020-04-22 08:50:51 -07:00
kevinz000 5984fa02b8 more changes 2020-04-22 08:49:21 -07:00
kevinz000 1bcca265ac buff neurotox 2020-04-22 08:35:08 -07:00
kevinz000 d259519bff changes 2020-04-22 08:31:09 -07:00
kevinz000 0eac988f52 okay! 2020-04-22 08:22:52 -07:00
Ghom 0c15c09e48 Update _box_magazine.dm 2020-04-22 16:30:30 +02:00
Trilbyspaceclone 71e91a15b1 toxin healing bad I guess 2020-04-22 02:19:35 -04:00
Putnam 54820f0ecb Made midround/latejoin come faster if no roundstarts 2020-04-21 21:54:28 -07:00
Putnam 1bd3d4ceab Some storyteller tweaks. 2020-04-21 21:50:51 -07:00
Putnam e70eb60d95 Nono, it's the MOB that voluntary ghosts. 2020-04-21 21:33:19 -07:00
Putnam 2ac9c70763 Makes storyteller changing actually work. 2020-04-21 21:33:03 -07:00
Seris02 39199a3a79 there 2020-04-22 12:31:55 +08:00
Putnam 44925da1d8 Various dynamic tweaks 2020-04-21 20:52:33 -07:00
Ghom 6467cc9647 Merge pull request #11958 from Putnam3145/ling-kill-once
Makes ling kill objectives kill-once
2020-04-22 04:05:06 +02:00
Ghommie 122067c5f4 wip 2020-04-22 03:52:45 +02:00
Lin 4c83af2cc2 Merge pull request #11953 from kevinz000/shieldbash2
Fixes shield bashing
2020-04-22 01:51:57 +00:00
Ghom aab62f196d Merge pull request #11954 from Trilbyspaceclone/patch-350
Makes medical hardsuits a smig faster
2020-04-22 03:32:07 +02:00
Ghom 9b27f1f6ec Merge pull request #11922 from Trilbyspaceclone/patch-345
Nerfs most soda and reagents
2020-04-22 03:31:32 +02:00
Ghom 1a9bcddc61 Merge pull request #11938 from Owai-Seek/crab-meat-4-19-2020
Ups Crab Meat from 1 to 4
2020-04-22 03:31:19 +02:00
Ghommie e9bf432a0d Scavenging element. 2020-04-22 03:30:40 +02:00
Lin 3483ab7947 Merge pull request #11957 from Ghommie/Ghommie-cit696
Fixing CE jump suit/skirt and accessory overlays.
2020-04-21 22:17:16 +00:00
kevinz000 2c08b7847e Merge pull request #11967 from Putnam3145/fix-the-damn-tesla-delams
Replaces, a ^  in supermatter calculations with **
2020-04-21 14:00:13 -07:00
Putnam3145 45f032a600 Merge pull request #11854 from Citadel-Station-13/Ghommie-patch-1
Something about configs and integers.
2020-04-21 13:04:31 -07:00
Putnam a9600cffaa Replaces a xor with a power?? 2020-04-21 13:01:50 -07:00
Anonymous e6159b1a82 Actually, this is better. 2020-04-21 22:24:38 +03:00
Anonymous 21c304c5ad Fixes cosmetic tactifool sprite not using digi
Also adds " to the armor values
2020-04-21 22:10:19 +03:00
Ghommie e6d777584f Eh? 2020-04-21 20:49:49 +02:00
Ghommie 01f444b761 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit682 2020-04-21 20:45:58 +02:00
Ghom f37cfd5e98 Update bitfields.dm 2020-04-21 20:00:41 +02:00
Ghommie 824904844c Componentized for sanity. 2020-04-21 19:51:44 +02:00
Ghom a2c796f943 Update legs_and_taurs.dm 2020-04-21 18:53:53 +02:00
Ghom 5a6a205b9d Merge pull request #11868 from Arturlang/tackling_and_lunge
Ports TG Tackling and uses it to rework bloodsucker lunge
2020-04-21 15:50:44 +02:00
Ghom a475355c93 Update humanform.dm 2020-04-21 15:28:12 +02:00
kevinz000 055606b81b Revert "Update SDQL_2_wrappers.dm"
This reverts commit 685546551c.
2020-04-20 20:27:18 -07:00
kevinz000 685546551c Update SDQL_2_wrappers.dm 2020-04-20 20:26:50 -07:00
Lin 560cf8749b Merge pull request #11943 from Citadel-Station-13/Ghommie-patch-2
Ports text formatted round timer from skyrat.
2020-04-21 02:13:31 +00:00
Ghommie 1659e2804e Deletes lots of autoylathe copypasta. 2020-04-21 04:04:10 +02:00
Trilbyspaceclone 6dd89ec1e0 Update pockets.dm 2020-04-20 21:50:25 -04:00
Ghommie c93f028a97 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit685 2020-04-21 01:53:41 +02:00
Ghommie e0d219650f Ready for testing. 2020-04-21 01:26:34 +02:00
Ghom 79eb0f5838 Merge pull request #11956 from Trilbyspaceclone/crafting_menu
Fixes Crafting menu
2020-04-21 01:25:46 +02:00
Trilbyspaceclone e769d28a2d Update weaponry.dm 2020-04-20 18:47:18 -04:00
TrilbySpaceClone c3fc133282 *crys* 2020-04-20 18:28:57 -04:00
TrilbySpaceClone 58cb5e391e *scream* 2020-04-20 18:22:13 -04:00
Ghom 50eae569eb Merge pull request #11940 from Detective-Google/null-roddies
Turns chaplain null rod selection into a radial function(port TG#50512)
2020-04-20 23:53:24 +02:00
Ghom 6679d13509 Merge pull request #11939 from Owai-Seek/weight-class-4-19-20
Reduces weight classes of several items.
2020-04-20 23:53:07 +02:00
Ghom 0dc489e8de Merge pull request #11798 from timothyteakettle/food-quality
adds a new feature to cooking: food quality
2020-04-20 23:48:35 +02:00