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
af222768fe
Revert "Update tacklers.dm"
...
This reverts commit b6a47a06ed
2020-04-22 22:27:17 -07:00
b6a47a06ed
Update tacklers.dm
2020-04-22 22:26:39 -07:00
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
42201343a9
Backward 512 compatibility removal.
2020-04-23 00:59:23 +02:00
7f271157c3
Merge pull request #11929 from Ghommie/Ghommie-cit692
...
Shielded Component
2020-04-22 20:33:12 +00:00
63362f74c9
Merge pull request #11912 from Seris02/betteruipref
...
toggle for tetris bags
2020-04-22 22:26:40 +02:00
df4452468a
Merge pull request #11932 from Ghommie/Ghommie-cit695
...
Some mispelled filepaths.
2020-04-22 16:09:33 +00:00
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
39199a3a79
there
2020-04-22 12:31:55 +08:00
6467cc9647
Merge pull request #11958 from Putnam3145/ling-kill-once
...
Makes ling kill objectives kill-once
2020-04-22 04:05:06 +02:00
aab62f196d
Merge pull request #11954 from Trilbyspaceclone/patch-350
...
Makes medical hardsuits a smig faster
2020-04-22 03:32:07 +02:00
9b27f1f6ec
Merge pull request #11922 from Trilbyspaceclone/patch-345
...
Nerfs most soda and reagents
2020-04-22 03:31:32 +02:00
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
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
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
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
a9600cffaa
Replaces a xor with a power??
2020-04-21 13:01:50 -07:00
824904844c
Componentized for sanity.
2020-04-21 19:51:44 +02:00
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
a475355c93
Update humanform.dm
2020-04-21 15:28:12 +02:00
055606b81b
Revert "Update SDQL_2_wrappers.dm"
...
This reverts commit 685546551c
2020-04-20 20:27:18 -07:00
685546551c
Update SDQL_2_wrappers.dm
2020-04-20 20:26:50 -07:00
79eb0f5838
Merge pull request #11956 from Trilbyspaceclone/crafting_menu
...
Fixes Crafting menu
2020-04-21 01:25:46 +02:00
58cb5e391e
*scream*
2020-04-20 18:22:13 -04:00
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
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
75ef1c3731
Makes ling kill objectives kill-once
2020-04-20 14:39:43 -07:00
03e873478c
Fixing CE jump suit/skirt and accessory overlays.
2020-04-20 23:11:58 +02:00
a40f213325
Merge pull request #11951 from Putnam3145/fix-liver-runtime
...
Fixes a runtime in livers.
2020-04-20 23:11:31 +02:00
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
047bb6c162
Update hardsuit.dm
2020-04-20 16:19:30 -04:00
c5b8c45bf0
Merge branch 'master' into food-quality
2020-04-20 19:53:39 +01:00
a984fc5e3d
Update living.dm
2020-04-20 11:45:22 -07:00
096a182a84
Update living.dm
2020-04-20 11:44:59 -07:00
62418d3fb8
Merge pull request #11909 from Putnam3145/owai-broom-mop
...
Adds more service stuff to lathes.
2020-04-20 11:43:30 -07:00
893f57cb63
Merge pull request #11919 from Ghommie/Ghommie-cit690
...
Nerfing the bonus reagents from higher tier microwaves.
2020-04-20 11:34:53 -07:00
33cfb9a566
Merge pull request #11920 from Ghommie/Ghommie-cit691
...
Removing troublesome and filler uplink items.
2020-04-20 11:34:44 -07:00
5df4287c8d
Fixes a runtime in livers.
2020-04-20 11:10:43 -07:00
af620582b1
Merge pull request #11924 from Trilbyspaceclone/patch-346
...
Moves barkeeps cryo fluid to emag only in the Soda Dispender
2020-04-20 19:35:31 +02:00
4cf80cb277
Update preferences_savefile.dm
2020-04-20 17:56:48 +02:00
e870830a72
Update preferences.dm
2020-04-20 17:52:10 +02:00
2cf8dad8ae
Merge pull request #11928 from Putnam3145/traitor-class-reroll
...
Made traitor classes rerollable, reassignable by admins
2020-04-20 02:30:33 +02:00
850c08cb0e
Merge pull request #11894 from NopemanMcHalt/trek_tmp
...
Adds not-so-great TMP-era trek utility uniform, also fixes loadout restriction descs
2020-04-20 02:21:24 +02:00
ae27bf90e4
Merge pull request #11846 from Putnam3145/vore-optimization
...
Optimizing vore + commenting out simplemob vore (sorry)
2020-04-19 16:45:44 -07:00
8e3f48a761
Reduces (or gives) weight classes to several items.
2020-04-19 17:13:19 -04:00
dc5c8fb657
Ups Crab Meat from 1 to 4
2020-04-19 17:00:48 -04:00
d75e3f79bd
Merge pull request #11917 from Ghommie/Ghommie-cit688
...
Makes warm donk pockets cooling after 7 minutes canon again.
2020-04-19 16:52:33 +00:00
043950a3ee
Merge branch 'master' into trek_tmp
...
# Conflicts Resolved:
# icons/obj/clothing/uniforms.dmi
2020-04-19 09:51:21 +03:00
24370db5eb
Merge pull request #11930 from Ghommie/Ghommie-cit693
...
More ToS Compliance.
2020-04-18 19:33:10 -07:00
DeltaFire