Commit Graph

22442 Commits

Author SHA1 Message Date
kevinz000 f8cede1ca8 Merge pull request #8998 from Ghommie/Ghommie-cit167
Fixes inactive high luminosity eyes turning back on as soon as you move around.
2019-08-05 00:49:14 -07:00
CitadelStationBot 56960b46d2 Automatic changelog generation for PR #8660 [ci skip] 2019-08-05 02:47:35 -05:00
kevinz000 cd6699cfed Merge pull request #8660 from Trilbyspaceclone/Unmodular
Ummodular a few files - Fixes Freelance Crate costs
2019-08-05 00:47:28 -07:00
CitadelStationBot ca09933379 Automatic changelog generation for PR #8774 [ci skip] 2019-08-05 02:47:06 -05:00
kevinz000 a105ba4bb6 Merge pull request #8774 from Sishen1542/monkeycult
Removes the human check from cap/chap mind on cult conversion.
2019-08-05 00:47:04 -07:00
CitadelStationBot c17946d151 Automatic changelog generation for PR #8913 [ci skip] 2019-08-05 02:45:58 -05:00
kevinz000 86a2d917e5 Merge pull request #8913 from Trilbyspaceclone/clockstoles
Makes brass/bronze bar stools and stools - Same as normal ones
2019-08-05 00:45:56 -07:00
CitadelStationBot 67828155e1 Automatic changelog generation for PR #9019 [ci skip] 2019-08-05 02:44:18 -05:00
kevinz000 9852084200 Merge pull request #9019 from Ghommie/Ghommie-cit172
Adds in a stereotypical vegetarian MRE. Tweaks the rest.
2019-08-05 00:44:15 -07:00
CitadelStationBot c7a1ba2806 Automatic changelog generation for PR #8912 [ci skip] 2019-08-05 00:41:52 -05:00
kevinz000 f1c9a07f6d Merge pull request #8912 from Ghommie/Ghommie-cit146
Ports "Headset Channel Descriptions Are No Longer Hardcoded"
2019-08-04 22:41:49 -07:00
CitadelStationBot a579e1f7bd Automatic changelog generation for PR #9042 [ci skip] 2019-08-05 00:27:45 -05:00
kevinz000 c92e8b43bf Merge pull request #9042 from EgoSumStultus/femur-breaker
[ THE FEMUR BREAKER ]
2019-08-04 22:27:42 -07:00
EgoSumStultus 5bfe4492a1 huhhh... huhu.... 2019-08-04 22:15:10 -07:00
Trilbyspaceclone 3bad062c23 Merge branch 'master' into Unmodular 2019-08-05 00:04:44 -04:00
CitadelStationBot 5431ad07b1 Automatic changelog generation for PR #9024 [ci skip] 2019-08-04 21:22:54 -05:00
kevinz000 2654a5388e Merge pull request #9024 from Ghommie/Ghommie-cit176
Ports "Lizardwine drink crafting fix"
2019-08-04 19:22:52 -07:00
CitadelStationBot fef4e26bc9 Automatic changelog generation for PR #8995 [ci skip] 2019-08-04 21:21:40 -05:00
kevinz000 8fa888f408 Merge pull request #8995 from Ghommie/Ghommie-cit165
Fixes jogging on wet tiles actually slipping you if you have less than 20 stamloss
2019-08-04 19:21:38 -07:00
CitadelStationBot 4c01b2e323 Automatic changelog generation for PR #8996 [ci skip] 2019-08-04 21:19:22 -05:00
kevinz000 489b4c78dc Merge pull request #8996 from Ghommie/Ghommie-cit166
Adds in worn overlays for different types of cuffs.
2019-08-04 19:19:19 -07:00
CitadelStationBot c048cb3088 Automatic changelog generation for PR #8999 [ci skip] 2019-08-04 21:18:55 -05:00
kevinz000 5cfb7ef49d Merge pull request #8999 from BurgerLUA/Xeno-Nerf-part-1-out-of-20
Xenomorph larvae no longer gib and inexplicably delete your brain when hatching
2019-08-04 19:18:53 -07:00
CitadelStationBot 0eb7340bb4 Automatic changelog generation for PR #9030 [ci skip] 2019-08-04 21:18:04 -05:00
kevinz000 5f87927b0a Merge pull request #9030 from CameronWoof/iv-drip-fix
Fixes a visual glitch with beakers containing water attached to IV stands
2019-08-04 19:18:00 -07:00
CitadelStationBot c02b5a74e4 Automatic changelog generation for PR #9043 [ci skip] 2019-08-04 21:17:27 -05:00
kevinz000 7252f3b175 Merge pull request #9043 from nik707/monasterystuff
[PR 105 BOIS]Connects the Monastery on Pubby to the main station
2019-08-04 19:17:25 -07:00
CitadelStationBot ef90f92501 Automatic changelog generation for PR #9033 [ci skip] 2019-08-04 21:15:37 -05:00
kevinz000 77e341f36b Merge pull request #9033 from EgoSumStultus/magpistol-mag-sprite-fix
Fixes Magpistol's Magazine Sprites Being Invisible
2019-08-04 19:15:35 -07:00
CitadelStationBot 5c2f96f4e5 Automatic changelog generation for PR #9040 [ci skip] 2019-08-04 21:15:21 -05:00
kevinz000 7a3d895997 Merge pull request #9040 from Trilbyspaceclone/cooking_101_Cakes
Tweaks cakes, adds in more of them as well as a few more tarts - All hidden
2019-08-04 19:15:18 -07:00
CitadelStationBot 4408d41c7a Automatic changelog generation for PR #9009 [ci skip] 2019-08-04 21:14:10 -05:00
kevinz000 afe2dd1e28 Merge pull request #9009 from BurgerLUA/Proper-Calculations
Fixed WarOps Challenge incorrectly counting players
2019-08-04 19:14:08 -07:00
kevinz000 e04547b838 Merge pull request #9015 from Trilbyspaceclone/patch-203
fixes a few snowcones being bad grammared
2019-08-04 19:13:44 -07:00
CitadelStationBot b053f284bb Automatic changelog generation for PR #9014 [ci skip] 2019-08-04 21:13:24 -05:00
kevinz000 8452cf3b8a Merge pull request #9014 from Ghommie/Ghommie-cit170
undergarment fixes.
2019-08-04 19:13:21 -07:00
kevinz000 f8dbe71bf7 Merge pull request #9035 from Poojawa/vore-toggle-fix
Fixes a runtime with a simple mob verb
2019-08-04 19:12:57 -07:00
CitadelStationBot 462815a9b6 Automatic changelog generation for PR #9036 [ci skip] 2019-08-04 21:09:38 -05:00
kevinz000 53a9f3ac51 Merge pull request #9036 from Linzolle/invisiclothes
fixes combat gloves plus having no icon, allows for shoes to have their item_state set to use a differently named icon on mobs
2019-08-04 19:09:36 -07:00
kevinz000 de675a10e7 Merge pull request #9025 from Poojawa/patch-1
Actually fixes Vore sounds for real this time
2019-08-04 19:08:16 -07:00
CitadelStationBot d6416abc4f Automatic changelog generation for PR #9044 [ci skip] 2019-08-04 21:07:38 -05:00
kevinz000 4dcdf7ac4d Merge pull request #9044 from Sishen1542/rock-lock
Adds the ability to construct and deconstruct locker locks
2019-08-04 19:07:35 -07:00
CitadelStationBot afd2ea7db6 Automatic changelog generation for PR #9018 [ci skip] 2019-08-04 21:05:02 -05:00
kevinz000 27b3cb6656 Merge pull request #9018 from Ghommie/Ghommie-cit171
Ports "Bluespace research updates" and "Teleportation standardization, channels, and interception"
2019-08-04 19:04:59 -07:00
nik707 c9c4c5678c missed a few things 2019-08-03 18:31:47 -05:00
nik707 1af6445fa6 Update PubbyStation.dmm 2019-08-03 18:17:28 -05:00
nik707 20ce72ca9e Update PubbyStation.dmm 2019-08-03 18:16:14 -05:00
Sishen 1f100f1f3b crush my lock with a rock i must 2019-08-03 18:48:14 -04:00
nik707 ba78ec7100 yes 2019-08-03 17:41:12 -05:00
EgoSumStultus 464a589c25 *sobbing noises* 2019-08-03 07:34:32 -07:00