 TrilbyspacecloneandGitHub
|
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 |
|
|
kevinz000andGitHub
|
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 |
|
|
kevinz000andGitHub
|
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 |
|
|
kevinz000andGitHub
|
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 |
|
|
kevinz000andGitHub
|
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 |
|
|
kevinz000andGitHub
|
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 |
|
|
kevinz000andGitHub
|
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 |
|
|
kevinz000andGitHub
|
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 |
|
|
kevinz000andGitHub
|
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 |
|
|
kevinz000andGitHub
|
afe2dd1e28
|
Merge pull request #9009 from BurgerLUA/Proper-Calculations
Fixed WarOps Challenge incorrectly counting players
|
2019-08-04 19:14:08 -07:00 |
|
|
kevinz000andGitHub
|
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 |
|
|
kevinz000andGitHub
|
8452cf3b8a
|
Merge pull request #9014 from Ghommie/Ghommie-cit170
undergarment fixes.
|
2019-08-04 19:13:21 -07:00 |
|
|
kevinz000andGitHub
|
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 |
|
|
kevinz000andGitHub
|
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 |
|
|
kevinz000andGitHub
|
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 |
|
|
kevinz000andGitHub
|
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 |
|
|
kevinz000andGitHub
|
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 |
|
|
CitadelStationBot
|
08c74d772a
|
Automatic changelog generation for PR #8942 [ci skip]
|
2019-08-03 02:49:01 -05:00 |
|
|
kevinz000andGitHub
|
f59abbf073
|
Merge pull request #8942 from jakeramsay007/WardenShotgun
Changes the Warden's shotgun to instead be foldable, with greatly increased penalties for being folded.
|
2019-08-03 00:48:59 -07:00 |
|
|
TrilbySpaceClone
|
3a85f9473c
|
amazing
|
2019-08-02 14:37:52 -04:00 |
|
|
CitadelStationBot
|
753548946d
|
Automatic changelog generation for PR #8994 [ci skip]
|
2019-08-02 03:43:48 -05:00 |
|
|
kevinz000andGitHub
|
eca34a6552
|
Merge pull request #8994 from Ghommie/Ghommie-cit164
Makes staminaloss also apply the oxyloss fullscreen overlay.
|
2019-08-02 01:43:46 -07:00 |
|
|
kevinz000andGitHub
|
a82f9c011b
|
Merge pull request #9004 from Trilbyspaceclone/Crafting
Ports "Adds helpers for finding martial arts types #42045" as well as "Adds simple framework for learnable crafting recipes #43296"
|
2019-08-02 00:57:05 -07:00 |
|
|
CitadelStationBot
|
0b97f3f99d
|
Automatic changelog generation for PR #9005 [ci skip]
|
2019-08-02 02:56:01 -05:00 |
|
|
kevinz000andGitHub
|
e1187036e2
|
Merge pull request #9005 from Trilbyspaceclone/ID_Swipers
Adds Key Aunths to each QM room on each map
|
2019-08-02 00:55:59 -07:00 |
|
|
CitadelStationBot
|
17342614eb
|
Automatic changelog generation for PR #9008 [ci skip]
|
2019-08-02 02:55:36 -05:00 |
|
|
kevinz000andGitHub
|
5fdd0b82dd
|
Merge pull request #9008 from Linzolle/kravmaga
fix krav maga leg sweep
|
2019-08-02 00:55:34 -07:00 |
|
|
CitadelStationBot
|
30b5104e63
|
Automatic changelog generation for PR #9026 [ci skip]
|
2019-08-02 02:55:20 -05:00 |
|
|
kevinz000andGitHub
|
eef733da3d
|
Merge pull request #9026 from BurgerLUA/Alert-Level-Indicator
Alert Level is now displayed at the job selection screen.
|
2019-08-02 00:55:18 -07:00 |
|
|
kevinz000andGitHub
|
dba6a25b15
|
Merge pull request #9011 from Trilbyspaceclone/patch-201
Ports "Gauze can now be applied to corpses #44199"
|
2019-08-02 00:54:57 -07:00 |
|
|
kevinz000andGitHub
|
caa0579fca
|
Merge pull request #9016 from Trilbyspaceclone/patch-204
Fixes Pound and hardware cake
|
2019-08-01 23:29:27 -07:00 |
|
|
CitadelStationBot
|
f8d7185ec1
|
Automatic changelog generation for PR #8958 [ci skip]
|
2019-08-02 01:29:12 -05:00 |
|