c4250a41d2
Merge pull request #12017 from kevinz000/skills
...
Implements a basic skill system + adds surgery skill
2020-04-30 17:39:21 +00:00
1e42f3a3b7
Merge pull request #12023 from Ghommie/Ghommie-cit712
...
Fixing riding layers for human/cyborgs.
2020-04-29 12:03:29 -07:00
464fcd02cd
Merge remote-tracking branch 'citadel/master' into skills
2020-04-25 22:18:08 -07:00
af08e0fecf
Merge pull request #11984 from Hatterhat/fastpump
...
The Neo-Russian Rifleman's Primer - a book that makes you pump shotguns and work rifle bolts faster
2020-04-25 17:07:29 -07:00
36512938a0
Merge pull request #11991 from DeltaFire15/nanite-repli-protocols
...
Adds nanite replication protocols to our techweb
2020-04-25 16:54:32 -07:00
a533906f73
Merge pull request #11992 from Ghommie/Ghommie-cit703
...
reagents value nerf and standardization.
2020-04-25 16:54:14 -07:00
da61b04ed0
Merge pull request #11997 from Ghommie/Ghommie-cit705
...
code for designs' security level requirements.
2020-04-25 16:53:48 -07:00
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
0bf1f1e34f
Merge pull request #12010 from Ghommie/Ghommie-cit709
...
Porting some VV updates from tg.
2020-04-25 16:51:27 -07:00
4689e2aeb6
Merge pull request #11980 from Ghommie/Ghommie-cit700
...
Movespeed modifiers refactor port.
2020-04-25 16:51:14 -07:00
d2d5fda0e2
Fixing riding layers for human/cyborgs.
2020-04-25 16:54:17 +02:00
ec4a40fa37
ok
2020-04-25 01:05:12 -07:00
6c5d42b5f5
oh boy
2020-04-25 00:48:56 -07:00
5ccdc55e42
Merge pull request #11979 from kevinz000/magnetic_harness
...
Cybernetic arm implant balance pass (namely: shields)
2020-04-25 02:47:28 +02:00
e17c51a85d
Porting some VV updates from tg.
2020-04-25 00:49:51 +02:00
58fc679cce
WIP
2020-04-24 20:49:15 +02:00
e0a51903a1
Not yet implemented design security level requirements.
2020-04-24 00:51:04 +02:00
0beb28d3bb
reagents value nerf and standardization.
2020-04-23 19:52:22 +02:00
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
42201343a9
Backward 512 compatibility removal.
2020-04-23 00:59:23 +02:00
c686ed193b
a book about mashing Z and LMB
2020-04-22 17:55:11 -05:00
7f271157c3
Merge pull request #11929 from Ghommie/Ghommie-cit692
...
Shielded Component
2020-04-22 20:33:12 +00:00
63870cc9d1
Movespeed modifiers refactor port.
2020-04-22 22:01:39 +02:00
c551006295
catch dropped
2020-04-22 10:54:42 -07: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
79eb0f5838
Merge pull request #11956 from Trilbyspaceclone/crafting_menu
...
Fixes Crafting menu
2020-04-21 01:25:46 +02:00
4d55f169d5
oh god oh fuck
2020-04-20 17:05:03 -04:00
c5b8c45bf0
Merge branch 'master' into food-quality
2020-04-20 19:53:39 +01:00
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
dc97b65681
Revert "Revert "Update mobs.dm""
...
This reverts commit d8d6ae8555
2020-04-20 04:03:13 -07:00
d8d6ae8555
Revert "Update mobs.dm"
...
This reverts commit 1b9bfe9674
2020-04-20 04:01:57 -07:00
1b9bfe9674
Update mobs.dm
2020-04-20 04:00:47 -07: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
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
e3fb978465
Shielded element.
2020-04-19 01:48:51 +02:00
8ca7bb7535
Right...
2020-04-18 09:46:56 -04:00
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
523672b6a5
fix for my relatively minuscule backend refactor for holodeck.
2020-04-18 02:32:10 +02:00
7cc7d6884a
Merge pull request #11820 from kevinz000/shield_bashing
...
Shield bashing
2020-04-17 20:45:40 +00:00
1608bd2548
Update shields.dm
2020-04-17 11:57:18 -07:00
761b3907e3
Makes vore noises, enlargement opt-in
2020-04-17 09:10:08 -07:00
cd25a7c145
Merge branch 'master' into food-quality
2020-04-17 15:03:44 +01:00
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
e84e6bface
Merge pull request #11857 from Trilbyspaceclone/race_drinks
...
Race drinks!
2020-04-17 05:20:53 -07:00
61f833b953
Merge pull request #11852 from Ghommie/Ghommie-cit681
...
Custom skin tone preferences.
2020-04-17 05:16:04 -07:00
a4cc54781f
implements isfood helper
2020-04-17 01:45:15 +01:00
fe43581d31
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit667
2020-04-16 15:09:52 +02:00
e533103ed2
Merge branch 'master' into shield_bashing
2020-04-15 19:34:08 -07:00
2134515d5c
Merge remote-tracking branch 'upstream/master' into tackling_and_lunge
2020-04-15 12:19:37 +03:00
d49210fd48
Merge branch 'master' into race_drinks
2020-04-14 19:21:47 -04:00
Lin