Commit Graph

4681 Commits

Author SHA1 Message Date
kevinz000
aeaf6ea102 wow lotsa effort huh 2020-04-26 03:33:08 -07:00
kevinz000
e3b987879e wow lotsa effort huh 2020-04-26 03:30:18 -07:00
kevinz000
a9d0ce45b9 wow lotsa effort huh 2020-04-26 03:29:43 -07:00
kevinz000
af3651172c wow lotsa effort huh 2020-04-26 03:29:31 -07:00
kevinz000
565bfdb7b0 Merge pull request #11959 from Trilbyspaceclone/patch-351
Nerfs spiders defence stat against flyswatters - Alt  Australian crew buff.
2020-04-25 17:10:33 -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
da61b04ed0 Merge pull request #11997 from Ghommie/Ghommie-cit705
code for designs' security level requirements.
2020-04-25 16:53:48 -07:00
kevinz000
4689e2aeb6 Merge pull request #11980 from Ghommie/Ghommie-cit700
Movespeed modifiers refactor port.
2020-04-25 16:51:14 -07:00
Lin
499e71c528 Merge pull request #11993 from Ghommie/Ghommie-cit704
porting CEV-Eris pickweight procs.
2020-04-25 18:30:26 +00:00
Ghom
21619b1ee3 Merge pull request #11925 from Trilbyspaceclone/patch-347
The Pr that nerfs crayon eating
2020-04-25 02:54:40 +02: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
e0a51903a1 Not yet implemented design security level requirements. 2020-04-24 00:51:04 +02:00
Ghommie
de531bd047 porting CEV-Eris pickweight procs. 2020-04-23 21:47:54 +02:00
kevinz000
cf61795101 Merge pull request #11941 from kiwedespars/punch-bundle
re-adds north star gloves to traitors for 20 tc
2020-04-23 11:45:04 -07:00
Trilbyspaceclone
8bcdbf5fc6 Update weaponry.dm 2020-04-23 03:29:26 -04:00
TrilbySpaceClone
c8b3032087 Merge branch 'master' into cube-world 2020-04-23 02:04:56 -04:00
kevinz000
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
kevinz000
411622430f Merge pull request #11985 from Ghommie/Ghommie-cit701
Removal of backward 512 compatibility.
2020-04-22 18:40:41 -07:00
Hatterhat
371e54e2e4 funny meme text 2020-04-22 18:06:30 -05: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
Trilbyspaceclone
511465ed7b Update shields.dm 2020-04-22 18:13:09 -04:00
Trilbyspaceclone
6a99c3b2c0 oops all the ) 2020-04-22 18:07:13 -04:00
Trilbyspaceclone
3418fe1541 Update weaponry.dm 2020-04-22 17:32:35 -04:00
Ghommie
63870cc9d1 Movespeed modifiers refactor port. 2020-04-22 22:01:39 +02:00
kevinz000
fe63eca817 kay 2020-04-22 11:04:01 -07:00
kevinz000
c551006295 catch dropped 2020-04-22 10:54:42 -07:00
kevinz000
3626cc5d28 okay 2020-04-22 10:50:03 -07:00
kevinz000
467497af54 woops 2020-04-22 10:45:13 -07:00
kevinz000
3e09ee8328 Alright 2020-04-22 10:42:11 -07:00
Lin
4c83af2cc2 Merge pull request #11953 from kevinz000/shieldbash2
Fixes shield bashing
2020-04-22 01:51:57 +00: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
Trilbyspaceclone
e769d28a2d Update weaponry.dm 2020-04-20 18:47:18 -04:00
Ghom
50eae569eb Merge pull request #11940 from Detective-Google/null-roddies
Turns chaplain null rod selection into a radial function(port TG#50512)
2020-04-20 23:53:24 +02:00
kevinz000
3e9b1a6875 Update shields.dm 2020-04-20 14:02:39 -07:00
Trilbyspaceclone
ec9b0573aa even reagents 2020-04-20 15:45:37 -04:00
kevinz000
7e2a54d5d6 fix 2020-04-20 12:30:20 -07:00
kevinz000
6428f4a0c2 ok 2020-04-20 12:18:09 -07:00
kevinz000
90f6904f44 fix 2020-04-20 12:16:42 -07: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
ff651ac881 Merge pull request #11931 from Ghommie/Ghommie-cit694
Removes that one in a thousands chance of being spawned in the syndicate infiltrator roundstart.
2020-04-20 11:31:31 -07:00
Ghom
9df0982da3 Update mirror.dm 2020-04-20 17:57:08 +02:00
Trilbyspaceclone
6fcec77e9b Update shields.dm 2020-04-19 23:18:17 -04:00
kiwedespars
842483190a Update code/game/objects/items/storage/uplink_kits.dm
my brain is small when working git.

Co-Authored-By: Trilbyspaceclone <30435998+Trilbyspaceclone@users.noreply.github.com>
2020-04-19 17:18:14 -07:00
kiwedespars
b21ee932cf maybe this is travis's issue? 2020-04-19 17:06:21 -07:00
kiwedespars
42fac43807 Merge branch 'master' into punch-bundle 2020-04-19 16:50:01 -07:00
kiwedespars
25e0c47225 oops 2020-04-19 16:48:37 -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
25b1b889dc amazing truely amazing 2020-04-19 19:09:20 -04:00
kiwedespars
c3905c8c2b Update uplink_kits.dm 2020-04-19 15:56:31 -07:00