Commit Graph

16247 Commits

Author SHA1 Message Date
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
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
Ghommie 1659e2804e Deletes lots of autoylathe copypasta. 2020-04-21 04:04:10 +02: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 58cb5e391e *scream* 2020-04-20 18:22:13 -04: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
Putnam 75ef1c3731 Makes ling kill objectives kill-once 2020-04-20 14:39:43 -07:00
Ghommie 03e873478c Fixing CE jump suit/skirt and accessory overlays. 2020-04-20 23:11:58 +02:00
Ghom a40f213325 Merge pull request #11951 from Putnam3145/fix-liver-runtime
Fixes a runtime in livers.
2020-04-20 23:11:31 +02:00
Ghom 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
Trilbyspaceclone 047bb6c162 Update hardsuit.dm 2020-04-20 16:19:30 -04:00
Timothy Teakettle c5b8c45bf0 Merge branch 'master' into food-quality 2020-04-20 19:53:39 +01:00
kevinz000 a984fc5e3d Update living.dm 2020-04-20 11:45:22 -07:00
kevinz000 096a182a84 Update living.dm 2020-04-20 11:44:59 -07:00
kevinz000 62418d3fb8 Merge pull request #11909 from Putnam3145/owai-broom-mop
Adds more service stuff to lathes.
2020-04-20 11:43:30 -07:00
kevinz000 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
kevinz000 33cfb9a566 Merge pull request #11920 from Ghommie/Ghommie-cit691
Removing troublesome and filler uplink items.
2020-04-20 11:34:44 -07:00
Putnam 5df4287c8d Fixes a runtime in livers. 2020-04-20 11:10:43 -07:00
Ghom 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
Ghommie 5a4fecdeb8 tested and it works now, I'm glad. 2020-04-20 19:22:42 +02:00
Ghom 4cf80cb277 Update preferences_savefile.dm 2020-04-20 17:56:48 +02:00
Ghom e870830a72 Update preferences.dm 2020-04-20 17:52:10 +02:00
Ghommie e703e12c88 WIP 2020-04-20 16:25:08 +02:00
Ghommie 0bef955806 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit682 2020-04-20 15:14:30 +02:00
Trilbyspaceclone e311aafbc0 Update snacks_meat.dm 2020-04-19 22:21:07 -04:00
Ghom 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
Ghommie 3bef4b88ba Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit682 2020-04-20 02:29:34 +02:00
Ghom 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
kiwedespars 42fac43807 Merge branch 'master' into punch-bundle 2020-04-19 16:50:01 -07:00
kevinz000 ae27bf90e4 Merge pull request #11846 from Putnam3145/vore-optimization
Optimizing vore + commenting out simplemob vore (sorry)
2020-04-19 16:45:44 -07:00
TrilbySpaceClone d98f536003 map fix + cube fix 2020-04-19 19:38:23 -04:00
TrilbySpaceClone 3a78da9332 commit clearifcation 2020-04-19 19:18:19 -04:00
TrilbySpaceClone 25b1b889dc amazing truely amazing 2020-04-19 19:09:20 -04:00
kiwedespars 2c362dd84f Update uplink_bundles.dm 2020-04-19 15:58:31 -07:00
Winter Flare 8e3f48a761 Reduces (or gives) weight classes to several items. 2020-04-19 17:13:19 -04:00
Winter Flare dc5c8fb657 Ups Crab Meat from 1 to 4 2020-04-19 17:00:48 -04:00
TrilbySpaceClone 37a0fb558c with fixes and new gauze 2020-04-19 15:29:48 -04:00
Lin 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