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
|
72cbb77ecc
|
fixes
|
2020-04-30 00:48:37 -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
|
d176125c46
|
Merge pull request #11972 from Trilbyspaceclone/medical-witchcraft
More Useful Gauze MK II
|
2020-04-29 12:02:51 -07:00 |
|
kevinz000
|
830e1b46c8
|
Merge pull request #12028 from Putnam3145/fix-story-storyteller
Some more admeme potential for dynamic
|
2020-04-29 12:02:21 -07:00 |
|
kevinz000
|
f9f573576e
|
Merge pull request #12038 from Trilbyspaceclone/patch-359
Corrects vending tackler gloves
|
2020-04-29 12:02:00 -07:00 |
|
kevinz000
|
3d116f5e7e
|
Merge pull request #12000 from zeroisthebiggay/comprehensivefucksecuritypr
Fuck Ranged Security Knockdowns: The Taser Nerf PR That Will Get Me Killed By A Witchhunt
|
2020-04-29 12:01:33 -07:00 |
|
kevinz000
|
57ab38185f
|
Merge pull request #12014 from Trilbyspaceclone/patch-358
Buffs shoulder holsters
|
2020-04-29 12:00:03 -07:00 |
|
Putnam
|
2c6ef2f5d1
|
fix appendices instakilling everyone
|
2020-04-28 22:14:32 -07:00 |
|
Lin
|
19f89ed1ba
|
Merge pull request #12022 from Ghommie/Ghommie-cit711
organ/on_life tweaks.
|
2020-04-29 01:15:02 +00:00 |
|
Lin
|
64a5831a28
|
Merge pull request #12044 from Citadel-Station-13/kevinz000-patch-2
Fixes cybernetics not updating slowdowns when dropping shield
|
2020-04-29 01:07:55 +00:00 |
|
Lin
|
50a6128a83
|
Merge pull request #12032 from Citadel-Station-13/kevinz000-patch-4
Silicons are now immune to default combat knockdown behavior
|
2020-04-27 16:24:49 +00:00 |
|
Lin
|
68bad2ee3f
|
Merge pull request #12033 from Citadel-Station-13/kevinz000-patch-6
fixes shield bashing working while downed
|
2020-04-27 16:24:29 +00:00 |
|
TrilbySpaceClone
|
1191268430
|
kevs request
|
2020-04-27 07:34:23 -04:00 |
|
TrilbySpaceClone
|
5d6da47db7
|
Merge branch 'master' into medical-witchcraft
|
2020-04-27 07:25:18 -04:00 |
|
kevinz000
|
4e8a8dbebd
|
Update items.dm
|
2020-04-27 02:55:11 -07:00 |
|
Trilbyspaceclone
|
e33087cbf2
|
corrects vending tackler gloves
|
2020-04-26 22:06:35 -04:00 |
|
Putnam
|
51c6387224
|
now
|
2020-04-26 13:44:04 -07:00 |
|
Ghom
|
858c697acc
|
Merge pull request #11977 from kevinz000/xenomorph_balancing_pass
Xenomorph balancing pass
|
2020-04-26 14:03:15 +02:00 |
|
Ghom
|
b1befc2ba4
|
Merge pull request #11989 from Citadel-Station-13/kevinz000-patch-2
Nerfs confusion
|
2020-04-26 13:50:46 +02:00 |
|
Ghom
|
0cb32c901e
|
Merge pull request #12013 from kappa-sama/patch-23
lowers plasmafist to standard spell costs
|
2020-04-26 13:45:28 +02:00 |
|
Putnam
|
00c2ddce8f
|
Actually this is better
|
2020-04-25 23:18:37 -07:00 |
|
Putnam
|
3da4701dff
|
Switch roundstart thing to initial.
|
2020-04-25 23:06:15 -07:00 |
|
kevinz000
|
5c20bde9f0
|
Update shields.dm
|
2020-04-25 20:58:22 -07:00 |
|
kevinz000
|
e54ba579d0
|
Update silicon_defense.dm
|
2020-04-25 20:52:27 -07:00 |
|
Putnam
|
257de9d4c9
|
Adds uplinks back to nukies.
|
2020-04-25 19:22:55 -07:00 |
|
kevinz000
|
8fc661ba14
|
Update pins.dm
|
2020-04-25 17:34:00 -07:00 |
|
Putnam
|
d7c0834794
|
A couple important comments.
|
2020-04-25 17:22:12 -07:00 |
|
kevinz000
|
5e750bd43d
|
Update pins.dm
|
2020-04-25 17:21:33 -07:00 |
|
Putnam
|
77a378b131
|
wow that's the wrong thing to do
|
2020-04-25 17:16:31 -07:00 |
|
Putnam
|
b9e88f85bb
|
Allowed better admeme stuff for dynamic
|
2020-04-25 17:15:17 -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
|
24bac60a95
|
Merge pull request #12012 from Ghommie/Ghommie-cit710
Fixing non-skirt dresses being invisible on digitigrades.
|
2020-04-25 17:05:49 -07:00 |
|
kevinz000
|
d7f38faab9
|
Merge pull request #11971 from Putnam3145/fix-story-storyteller
More dynamic tweaks
|
2020-04-25 17:05:38 -07:00 |
|
kevinz000
|
f6a5f92ff3
|
Merge pull request #11918 from Ghommie/Ghommie-cit689
nerf to biogenerator upgrades, removal of flour and glass bottles designs.
|
2020-04-25 16:59:38 -07:00 |
|
kevinz000
|
d9b6ea5181
|
Merge pull request #11847 from Ghommie/Ghommie-cit679
A peeve with random bodies.
|
2020-04-25 16:59:07 -07:00 |
|
kevinz000
|
0dc259a985
|
Merge pull request #11990 from Trilbyspaceclone/patch-357
Test merge maybe - Buffs space vines
|
2020-04-25 16:54:47 -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
|
d041df458c
|
Merge pull request #11998 from Ghommie/Ghommie-cit706
Still unimplemented security level firing pins.
|
2020-04-25 16:53:39 -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
|
fb1c4c215f
|
Merge pull request #12009 from Ghommie/Ghommie-cit708
Fixing empty new lines on IC assemblies examine.
|
2020-04-25 16:51:36 -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 |
|
Putnam
|
82fe5f0455
|
Allow rigged dynamic roundstarts (whoops)
|
2020-04-25 16:28:58 -07:00 |
|
Lin
|
4d596ddff6
|
Merge pull request #12007 from Citadel-Station-13/Ghommie-patch-1
Fixing robo limb burn damage being unfixable.
|
2020-04-25 18:37:35 +00:00 |
|
Lin
|
499e71c528
|
Merge pull request #11993 from Ghommie/Ghommie-cit704
porting CEV-Eris pickweight procs.
|
2020-04-25 18:30:26 +00:00 |
|