shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
34,806 Commits 5 Branches 0 Tags
3264ece1508cb0fa7ac2b2bc8ac2a48fffa091ad
Commit Graph
2040 Commits
Author SHA1 Message Date
kevinz000andGitHub a533906f73 Merge pull request #11992 from Ghommie/Ghommie-cit703 
reagents value nerf and standardization.
 2020-04-25 16:54:14 -07:00
kevinz000andGitHub da61b04ed0 Merge pull request #11997 from Ghommie/Ghommie-cit705 
code for designs' security level requirements.
 2020-04-25 16:53:48 -07:00
kevinz000andGitHub 7d688126c8 Merge pull request #12008 from Ghommie/Ghommie-cit707 
VR Levels are not a subset of Away Missions anymore.
 2020-04-25 16:51:52 -07:00
kevinz000andGitHub 0bf1f1e34f Merge pull request #12010 from Ghommie/Ghommie-cit709 
Porting some VV updates from tg.
 2020-04-25 16:51:27 -07:00
kevinz000andGitHub 4689e2aeb6 Merge pull request #11980 from Ghommie/Ghommie-cit700 
Movespeed modifiers refactor port.
 2020-04-25 16:51:14 -07:00
Ghommie 94f014589d Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit685 2020-04-25 17:09:34 +02:00
Ghommie d2d5fda0e2 Fixing riding layers for human/cyborgs. 2020-04-25 16:54:17 +02:00
kevinz000 ec4a40fa37 ok 2020-04-25 01:05:12 -07:00
kevinz000 6c5d42b5f5 oh boy 2020-04-25 00:48:56 -07:00
kevinz000 07dedea81a Merge remote-tracking branch 'citadel/master' into typing_indicators 2020-04-24 22:49:54 -07:00
Ghommie 0c1c879fb4 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit697 2020-04-25 02:49:59 +02:00
GhomandGitHub 5ccdc55e42 Merge pull request #11979 from kevinz000/magnetic_harness 
Cybernetic arm implant balance pass (namely: shields)
 2020-04-25 02:47:28 +02:00
Ghommie e17c51a85d Porting some VV updates from tg. 2020-04-25 00:49:51 +02:00
Ghommie 58fc679cce WIP 2020-04-24 20:49:15 +02:00
Ghommie e0a51903a1 Not yet implemented design security level requirements. 2020-04-24 00:51:04 +02:00
Ghommie 0beb28d3bb reagents value nerf and standardization. 2020-04-23 19:52:22 +02:00
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
Ghommie 42201343a9 Backward 512 compatibility removal. 2020-04-23 00:59:23 +02:00
Hatterhat c686ed193b a book about mashing Z and LMB 2020-04-22 17:55:11 -05:00
LinandGitHub 7f271157c3 Merge pull request #11929 from Ghommie/Ghommie-cit692 
Shielded Component
 2020-04-22 20:33:12 +00:00
Ghommie 63870cc9d1 Movespeed modifiers refactor port. 2020-04-22 22:01:39 +02:00
kevinz000 c551006295 catch dropped 2020-04-22 10:54:42 -07:00
Ghommie e9bf432a0d Scavenging element. 2020-04-22 03:30:40 +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
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
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
GhomandGitHub 79eb0f5838 Merge pull request #11956 from Trilbyspaceclone/crafting_menu 
Fixes Crafting menu
 2020-04-21 01:25:46 +02:00
TrilbySpaceClone 4d55f169d5 oh god oh fuck 2020-04-20 17:05:03 -04:00
Timothy TeakettleandGitHub c5b8c45bf0 Merge branch 'master' into food-quality 2020-04-20 19:53:39 +01:00
kevinz000andGitHub 85fcdbf673 Merge pull request #11916 from Trilbyspaceclone/crafting_menu 
Cleans up misc tab in the crafting menu
 2020-04-20 11:37:13 -07:00
Ghommie 5a4fecdeb8 tested and it works now, I'm glad. 2020-04-20 19:22:42 +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
kevinz000 dc97b65681 Revert "Revert "Update mobs.dm"" 
This reverts commit d8d6ae8555.
 2020-04-20 04:03:13 -07:00
kevinz000 d8d6ae8555 Revert "Update mobs.dm" 
This reverts commit 1b9bfe9674.
 2020-04-20 04:01:57 -07:00
kevinz000andGitHub 1b9bfe9674 Update mobs.dm 2020-04-20 04:00:47 -07: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
kevinz000andGitHub ae27bf90e4 Merge pull request #11846 from Putnam3145/vore-optimization 
Optimizing vore + commenting out simplemob vore (sorry)
 2020-04-19 16:45:44 -07:00
kevinz000andGitHub ab01d91971 Merge pull request #11903 from Ghommie/Ghommie-cit687 
fix for my relatively minuscule backend refactor for holodeck.
 2020-04-18 19:32:50 -07:00
Ghommie e3fb978465 Shielded element. 2020-04-19 01:48:51 +02:00
TrilbySpaceClone 8ca7bb7535 Right... 2020-04-18 09:46:56 -04:00
Putnam 33039f9962 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into vore-optimization 2020-04-17 18:56:26 -07:00
Ghommie 523672b6a5 fix for my relatively minuscule backend refactor for holodeck. 2020-04-18 02:32:10 +02:00
LinandGitHub 7cc7d6884a Merge pull request #11820 from kevinz000/shield_bashing 
Shield bashing
 2020-04-17 20:45:40 +00:00
Ghommie 87a6bd013c Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit685 2020-04-17 21:57:21 +02:00
Ghommie 3dab97b62f I set amount instead of max_amount to INFINITY, that's why it hanged. 2020-04-17 21:52:08 +02:00
kevinz000andGitHub 1608bd2548 Update shields.dm 2020-04-17 11:57:18 -07:00
Putnam 761b3907e3 Makes vore noises, enlargement opt-in 2020-04-17 09:10:08 -07:00
Timothy TeakettleandGitHub cd25a7c145 Merge branch 'master' into food-quality 2020-04-17 15:03:44 +01:00
kevinz000andGitHub 09f459a369 Merge pull request #11730 from Ghommie/Ghommie-cit667 
Minor snowflakes clothing variations refactor. Removal of copypasted states.
 2020-04-17 05:49:09 -07:00