Commit Graph

30619 Commits

Author SHA1 Message Date
Ghom 4649183a47 Merge pull request #11154 from Kraseo/fuck-nightmares
Fixes nightmares deleting guns with flashlights
2020-02-20 20:52:29 +01:00
CitadelStationBot 0892837e5a Automatic changelog generation for PR #10572 [ci skip] 2020-02-20 08:33:30 -06:00
Ghom 7763475b83 Merge pull request #10572 from Tupinambis/SiliconDefault
Removes harm prevention clause indicators from relevant sources.
2020-02-20 15:33:27 +01:00
CitadelStationBot ee07f1312e Automatic changelog generation for PR #11142 [ci skip] 2020-02-20 08:31:42 -06:00
Ghom 6347dab0a3 Merge pull request #11142 from kevinz000/vampire_haste
makes vampire haste more reliable and slightly less of an example of how not to code
2020-02-20 15:31:39 +01:00
CitadelStationBot 549e3d7fbd Automatic changelog generation for PR #10649 [ci skip] 2020-02-20 07:40:11 -06:00
Ghom 608bb0a04c Merge pull request #10649 from kevinz000/hijack
Completely reworks the hijack objective, and shuttle hijacking in general
2020-02-20 14:40:08 +01:00
CitadelStationBot 6ffde67b78 Automatic changelog generation for PR #11153 [ci skip] 2020-02-20 07:17:36 -06:00
kevinz000 ca777c6c8b Merge pull request #11153 from Ghommie/Ghommie-cit587
Fixing addiction moodlets not going away and secret sauce recipe paper.
2020-02-20 06:17:33 -07:00
CitadelStationBot c5c29faf4b Automatic changelog generation for PR #11136 [ci skip] 2020-02-20 04:48:08 -06:00
Ghom 26bbc64f16 Merge pull request #11136 from Owai-Seek/broomport-2-17-19
Ports Broom, Tweak Janitor Vendor
2020-02-20 11:48:06 +01:00
CitadelStationBot 385cf77c6e Automatic changelog generation for PR #11025 [ci skip] 2020-02-20 04:27:51 -06:00
Ghom d680ab9fd5 Merge pull request #11025 from Arturlang/TGUI_Next_Nanites
Ports TGUI Next and a lot of misc updates for nanites.
2020-02-20 11:27:48 +01:00
CitadelStationBot 6cb07e2c90 Automatic changelog generation for PR #11140 [ci skip] 2020-02-20 04:26:19 -06:00
Ghom 32c001f264 Merge pull request #11140 from Citadel-Station-13/kevinz000-patch-15
buffs pai radio short 5 -> 3 minutes
2020-02-20 11:26:17 +01:00
CitadelStationBot c39d51465e Automatic changelog generation for PR #11033 [ci skip] 2020-02-20 04:24:53 -06:00
Ghom 89f256866d Merge pull request #11033 from kevinz000/cmo_drapes
gives CMO special surgery drapes that can initiate techweb surgeries without operating console
2020-02-20 11:24:50 +01:00
CitadelStationBot e36c5a10b3 Automatic changelog generation for PR #11166 [ci skip] 2020-02-20 04:14:17 -06:00
Ghom 8c7e760f18 Merge pull request #11166 from Putnam3145/why-what
Fixing IRV
2020-02-20 11:14:15 +01:00
CitadelStationBot ca7e4de5d4 Automatic changelog generation for PR #11080 [ci skip] 2020-02-20 04:09:49 -06:00
Ghom f94f997cc2 Merge pull request #11080 from kevinz000/surubatons
hey someone gave me this idea for stunbatons (and I sort of expanded it) and it's worth a test
2020-02-20 11:09:46 +01:00
CitadelStationBot 1b518b69c4 Automatic changelog generation for PR #11139 [ci skip] 2020-02-20 04:09:06 -06:00
Ghom 7d8ae07fa0 Merge pull request #11139 from Citadel-Station-13/kevinz000-patch-12
projectiles now pierce through pAIs no matter what
2020-02-20 11:09:03 +01:00
CitadelStationBot 5f44230442 Automatic changelog generation for PR #11141 [ci skip] 2020-02-20 04:08:30 -06:00
Ghom c1f8deb4a5 Merge pull request #11141 from Citadel-Station-13/kevinz000-patch-17
removes pai fulltile opacity
2020-02-20 11:08:27 +01:00
CitadelStationBot 1cff36babd Automatic changelog generation for PR #11146 [ci skip] 2020-02-20 04:08:17 -06:00
Ghom e9d0f536de Merge pull request #11146 from Putnam3145/supermatter-hardcap
Hardcaps supermatter damage from ballistics and similar
2020-02-20 11:08:14 +01:00
CitadelStationBot ad337901e2 Automatic changelog generation for PR #11149 [ci skip] 2020-02-20 04:07:54 -06:00
Ghom 1f42e9f451 Merge pull request #11149 from Putnam3145/fix-vendor-badcode
fixes mining vendors failing and eating your points iff you have exactly enough points
2020-02-20 11:07:51 +01:00
CitadelStationBot 296e845183 Automatic changelog generation for PR #11160 [ci skip] 2020-02-20 04:00:04 -06:00
Ghom 22a041f72b Merge pull request #11160 from Hatterhat/chem-combat-sucked-anyway
a mouth cover check for pies
2020-02-20 11:00:00 +01:00
CitadelStationBot ca7e4842ee Automatic changelog generation for PR #11168 [ci skip] 2020-02-19 23:57:01 -06:00
kevinz000 e11cfcd305 Merge pull request #11168 from Putnam3145/fix-dynamic-storytellers
Fixes storytellers sometimes dividing by zero
2020-02-19 22:56:58 -07:00
Putnam 71c71766e6 one of those runtimes that will never show up in play but boy howdy 2020-02-19 21:53:22 -08:00
kevinz000 d7403b3436 john doe 2020-02-19 22:26:10 -07:00
kevinz000 2dd5a0cfb8 Merge branch 'master' into hijack 2020-02-19 22:25:31 -07:00
Putnam 00618dbc9b whoops option is a number 2020-02-19 20:58:06 -08:00
kevinz000 a06fcea985 Merge remote-tracking branch 'citadel/master' into vampire_haste 2020-02-19 19:16:58 -07:00
CitadelStationBot 7151f3d2ea Automatic changelog generation for PR #11098 [ci skip] 2020-02-19 20:05:52 -06:00
kevinz000 6f31e1270e Merge pull request #11098 from Trilbyspaceclone/bows!
Silk into clothing, bows, arrows, quivers and more!
2020-02-19 19:05:49 -07:00
CitadelStationBot e47d7c0ddf Automatic changelog generation for PR #11113 [ci skip] 2020-02-19 20:03:37 -06:00
kevinz000 49279086b7 Merge pull request #11113 from CameronWoof/biogeneratin'
Adds diethylamine and saltpetre to the biogenerator
2020-02-19 19:03:35 -07:00
kevinz000 9589c3116b Merge pull request #11115 from Ghommie/Ghommie-cit583
Something more about runtime errors.
2020-02-19 19:03:01 -07:00
kevinz000 a10c71320d Merge pull request #11117 from Citadel-Station-13/Ghommie-patch-1
Makes the mob holder examine less dumb, also indentation.
2020-02-19 19:02:34 -07:00
Hatterhat 9929cecec5 wack 2020-02-19 20:01:40 -06:00
CitadelStationBot 36f9edbfef Automatic changelog generation for PR #10953 [ci skip] 2020-02-19 20:00:55 -06:00
kevinz000 8567346501 Merge pull request #10953 from Ghommie/Ghommie-cit564
The awesome adventures of the missing spurdo line replacement file.
2020-02-19 19:00:53 -07:00
CitadelStationBot 7c3308d593 Automatic changelog generation for PR #10910 [ci skip] 2020-02-19 20:00:35 -06:00
kevinz000 3e073f160c Merge pull request #10910 from Citadel-Station-13/Ghommie-patch-6
Fixing a little issue with sleeper UI and blood types.
2020-02-19 19:00:32 -07:00
CitadelStationBot 3657922990 Automatic changelog generation for PR #10904 [ci skip] 2020-02-19 20:00:26 -06:00