Detective Google
231fd0edea
fixes the stupid fucking tile placing list
2020-04-30 23:04:35 -05:00
Detective-Google
c146c898c0
Merge branch 'master' into 91-files-changed-fml
2020-04-30 18:42:38 -05:00
Detective Google
f6736e862d
it compiles, now to fix the maps
2020-04-30 15:49:06 -05:00
Lin
c4250a41d2
Merge pull request #12017 from kevinz000/skills
...
Implements a basic skill system + adds surgery skill
2020-04-30 17:39:21 +00:00
kevinz000
8dae739d8f
fixes
2020-04-30 01:39:38 -07:00
kevinz000
615dc71069
fixes
2020-04-30 01:26:46 -07:00
kevinz000
bd7b1b1193
fixes
2020-04-30 01:23:21 -07:00
kevinz000
f028672e3c
Merge remote-tracking branch 'citadel/master' into 91-files-changed-fml
2020-04-30 01:00:08 -07:00
kevinz000
432724a388
fixes
2020-04-30 00:58:59 -07:00
kevinz000
1e42f3a3b7
Merge pull request #12023 from Ghommie/Ghommie-cit712
...
Fixing riding layers for human/cyborgs.
2020-04-29 12:03:29 -07:00
kevinz000
464fcd02cd
Merge remote-tracking branch 'citadel/master' into skills
2020-04-25 22:18:08 -07:00
kevinz000
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
kevinz000
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
kevinz000
a533906f73
Merge pull request #11992 from Ghommie/Ghommie-cit703
...
reagents value nerf and standardization.
2020-04-25 16:54:14 -07:00
kevinz000
da61b04ed0
Merge pull request #11997 from Ghommie/Ghommie-cit705
...
code for designs' security level requirements.
2020-04-25 16:53:48 -07:00
kevinz000
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
kevinz000
0bf1f1e34f
Merge pull request #12010 from Ghommie/Ghommie-cit709
...
Porting some VV updates from tg.
2020-04-25 16:51:27 -07:00
kevinz000
4689e2aeb6
Merge pull request #11980 from Ghommie/Ghommie-cit700
...
Movespeed modifiers refactor port.
2020-04-25 16:51:14 -07: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
Ghom
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
Detective Google
71be8ed2fc
ports all the tg junk for icemoon, not yet changed to make it all compile
2020-04-24 00:02:03 -05: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
Lin
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
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
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 Teakettle
c5b8c45bf0
Merge branch 'master' into food-quality
2020-04-20 19:53:39 +01:00
kevinz000
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
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
kevinz000
1b9bfe9674
Update mobs.dm
2020-04-20 04:00:47 -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
kevinz000
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
Lin
7cc7d6884a
Merge pull request #11820 from kevinz000/shield_bashing
...
Shield bashing
2020-04-17 20:45:40 +00:00
kevinz000
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
