Commit Graph
21759 Commits
Author SHA1 Message Date
DeltaFire 1a6f5eb131 If it compiles it works
Kidding, tested on local and it runs fine.
Adds nanite protocols to the techweb, without BEPIS, aswell as adding one more protocol onto the ones ported from /tg
2020-04-23 15:15:26 +02:00
kevinz000 af222768fe Revert "Update tacklers.dm"
This reverts commit b6a47a06ed.
2020-04-22 22:27:17 -07:00
kevinz000andGitHub b6a47a06ed Update tacklers.dm 2020-04-22 22:26:39 -07:00
kevinz000andGitHub 529a8e52c7 Merge pull request #11960 from Trilbyspaceclone/patch-352
Theirs a snake in my boot...
2020-04-22 18:42:46 -07:00
kevinz000andGitHub 1236e11eca Merge pull request #11950 from Citadel-Station-13/Ghommie-patch-3
Fixing a little mistake with a config.
2020-04-22 18:41:21 -07:00
kevinz000andGitHub 411622430f Merge pull request #11985 from Ghommie/Ghommie-cit701
Removal of backward 512 compatibility.
2020-04-22 18:40:41 -07:00
Ghommie 42201343a9 Backward 512 compatibility removal. 2020-04-23 00:59:23 +02:00
TrilbyspacecloneandGitHub 511465ed7b Update shields.dm 2020-04-22 18:13:09 -04:00
LinandGitHub 7f271157c3 Merge pull request #11929 from Ghommie/Ghommie-cit692
Shielded Component
2020-04-22 20:33:12 +00:00
GhomandGitHub 63362f74c9 Merge pull request #11912 from Seris02/betteruipref
toggle for tetris bags
2020-04-22 22:26:40 +02:00
LinandGitHub df4452468a Merge pull request #11932 from Ghommie/Ghommie-cit695
Some mispelled filepaths.
2020-04-22 16:09:33 +00:00
LinandGitHub 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
Seris02 39199a3a79 there 2020-04-22 12:31:55 +08:00
GhomandGitHub 6467cc9647 Merge pull request #11958 from Putnam3145/ling-kill-once
Makes ling kill objectives kill-once
2020-04-22 04:05:06 +02:00
LinandGitHub 4c83af2cc2 Merge pull request #11953 from kevinz000/shieldbash2
Fixes shield bashing
2020-04-22 01:51:57 +00:00
GhomandGitHub aab62f196d Merge pull request #11954 from Trilbyspaceclone/patch-350
Makes medical hardsuits a smig faster
2020-04-22 03:32:07 +02:00
GhomandGitHub 9b27f1f6ec Merge pull request #11922 from Trilbyspaceclone/patch-345
Nerfs most soda and reagents
2020-04-22 03:31:32 +02:00
GhomandGitHub 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
LinandGitHub 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
kevinz000andGitHub 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
Putnam3145andGitHub 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
Ghommie 824904844c Componentized for sanity. 2020-04-21 19:51:44 +02:00
GhomandGitHub 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
GhomandGitHub 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
kevinz000andGitHub 685546551c Update SDQL_2_wrappers.dm 2020-04-20 20:26:50 -07:00
LinandGitHub 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
TrilbyspacecloneandGitHub 6dd89ec1e0 Update pockets.dm 2020-04-20 21:50:25 -04:00
GhomandGitHub 79eb0f5838 Merge pull request #11956 from Trilbyspaceclone/crafting_menu
Fixes Crafting menu
2020-04-21 01:25:46 +02:00
TrilbySpaceClone c3fc133282 *crys* 2020-04-20 18:28:57 -04:00
TrilbySpaceClone 58cb5e391e *scream* 2020-04-20 18:22:13 -04:00
GhomandGitHub 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
GhomandGitHub 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
GhomandGitHub 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
Putnam 75ef1c3731 Makes ling kill objectives kill-once 2020-04-20 14:39:43 -07:00
TrilbySpaceClone 747e27007f ***ahhhh*** 2020-04-20 17:26:22 -04:00
Ghommie 03e873478c Fixing CE jump suit/skirt and accessory overlays. 2020-04-20 23:11:58 +02:00
GhomandGitHub a40f213325 Merge pull request #11951 from Putnam3145/fix-liver-runtime
Fixes a runtime in livers.
2020-04-20 23:11:31 +02:00
TrilbySpaceClone 4d55f169d5 oh god oh fuck 2020-04-20 17:05:03 -04:00
kevinz000andGitHub 3e9b1a6875 Update shields.dm 2020-04-20 14:02:39 -07:00
GhomandGitHub c7780bde9e Merge pull request #11865 from Citadel-Station-13/kevinz000-patch-5
Shuffles resist embed higher up on the resist chain
2020-04-20 22:34:03 +02:00
TrilbyspacecloneandGitHub 047bb6c162 Update hardsuit.dm 2020-04-20 16:19:30 -04:00
kevinz000 7e2a54d5d6 fix 2020-04-20 12:30:20 -07:00
kevinz000 6428f4a0c2 ok 2020-04-20 12:18:09 -07:00
kevinz000 90f6904f44 fix 2020-04-20 12:16:42 -07:00
Timothy TeakettleandGitHub c5b8c45bf0 Merge branch 'master' into food-quality 2020-04-20 19:53:39 +01:00
kevinz000andGitHub a984fc5e3d Update living.dm 2020-04-20 11:45:22 -07:00
kevinz000andGitHub 096a182a84 Update living.dm 2020-04-20 11:44:59 -07:00
kevinz000andGitHub 791c3029a8 Merge pull request #11897 from DeltaFire15/gang-decon-message
Snitches now get stitches
2020-04-20 11:43:37 -07:00