Commit Graph

24553 Commits

Author SHA1 Message Date
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
ZeroMan 18eb42315e i missed a src 2020-04-28 02:55:25 -04:00
ZeroMan 8dc130175d i actually despise coding 2020-04-28 02:46:46 -04: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
Artur 5d53ead547 Fucky wucky gateway and ccslab 2020-04-27 10:43:08 +03:00
Trilbyspaceclone e33087cbf2 corrects vending tackler gloves 2020-04-26 22:06:35 -04:00
kevinz000 28da033111 fine 2020-04-26 17:37:27 -07: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
kevinz000 f70490c61d fixes 2020-04-26 04:40:18 -07:00
kevinz000 2e35a42f43 wow lotsa effort huh 2020-04-26 04:10:38 -07:00
kevinz000 ff9f18bdbd wow lotsa effort huh 2020-04-26 03:38:41 -07:00
kevinz000 bf7962d8f9 wow lotsa effort huh 2020-04-26 03:36:09 -07:00
kevinz000 1b5e4b32cb wow lotsa effort huh 2020-04-26 03:33:26 -07:00
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
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 464fcd02cd Merge remote-tracking branch 'citadel/master' into skills 2020-04-25 22:18:08 -07:00
kevinz000 0e8c2ca109 Update projectile.dm 2020-04-25 21:04:22 -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
TrilbySpaceClone 1740531432 it just complies 2020-04-25 23:23:42 -04: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