Commit Graph

33119 Commits

Author SHA1 Message Date
Ghom
64647318df Merge pull request #11883 from Putnam3145/fix-dynamic-on-by-default
Makes dynamic voting not the default
2020-04-18 05:47:21 +02:00
Ghom
50ee5b9de5 Merge pull request #11885 from kappa-sama/patch-21
ports "Makes visible(based on sight) messages always appear to mobs in range of 1 despite in darkness"
2020-04-18 05:44:53 +02:00
Ghom
775948eed3 Merge pull request #11866 from Citadel-Station-13/kevinz000-patch-6
Shuffles around and buffs resisting embedded objects
2020-04-18 05:34:58 +02:00
CitadelStationBot
0e55de55a7 Automatic changelog generation for PR #11871 [ci skip] 2020-04-17 19:07:31 -05:00
Ghom
6da088f4ea Merge pull request #11871 from kappa-sama/patch-20
minor nerf to aranesp's stamina regen
2020-04-18 02:07:28 +02:00
CitadelStationBot
662f98cab7 Automatic changelog generation for PR #11900 [ci skip] 2020-04-17 18:36:53 -05:00
Ghom
3ecbf2dc46 Merge pull request #11900 from kappa-sama/patch-22
reverts #11880
2020-04-18 01:36:50 +02:00
CitadelStationBot
77af88da8c Automatic changelog generation for PR #11882 [ci skip] 2020-04-17 18:20:06 -05:00
Ghom
86d531890f Merge pull request #11882 from Putnam3145/fix-deleting-objectives
Makes objectives clean theirselves up properly
2020-04-18 01:20:02 +02:00
kappa-sama
e19f9c5c3e revert 2020-04-17 19:19:00 -04:00
CitadelStationBot
9d139bf584 Automatic changelog generation for PR #11820 [ci skip] 2020-04-17 15:45:44 -05:00
Lin
7cc7d6884a Merge pull request #11820 from kevinz000/shield_bashing
Shield bashing
2020-04-17 20:45:40 +00:00
kevinz000
1608bd2548 Update shields.dm 2020-04-17 11:57:18 -07:00
Putnam3145
6e8f58d945 Merge pull request #11893 from Citadel-Station-13/Ghommie-patch-3
Once upon a time, a based guardian anchored its name to others' minds.
2020-04-17 09:36:53 -07:00
CitadelStationBot
181f147f20 Automatic changelog generation for PR #11863 [ci skip] 2020-04-17 07:51:50 -05:00
kevinz000
5b86c334f9 Merge pull request #11863 from Trilbyspaceclone/patch-342
Honey Palm can be distill into mead
2020-04-17 05:51:47 -07:00
CitadelStationBot
d073717113 Automatic changelog generation for PR #11774 [ci skip] 2020-04-17 07:51:29 -05:00
kevinz000
7756682362 Merge pull request #11774 from Trilbyspaceclone/tools_andstuff
More mapping Loot tables and code improvements + Maints/Locker loot changes
2020-04-17 05:51:26 -07:00
kevinz000
09f459a369 Merge pull request #11730 from Ghommie/Ghommie-cit667
Minor snowflakes clothing variations refactor. Removal of copypasted states.
2020-04-17 05:49:09 -07:00
CitadelStationBot
00f549bb0d Automatic changelog generation for PR #11869 [ci skip] 2020-04-17 07:43:52 -05:00
kevinz000
3c4c67b6c5 Merge pull request #11869 from necromanceranne/pawnch_updaties
Pawnch Update 2.5: I swear this will be the last one for a while. + some slight fixes
2020-04-17 05:43:49 -07:00
CitadelStationBot
0be6467267 Automatic changelog generation for PR #11870 [ci skip] 2020-04-17 07:42:20 -05:00
kevinz000
6a92c47d31 Merge pull request #11870 from Trilbyspaceclone/patch-343
Catnip is no longer a mime plant
2020-04-17 05:42:17 -07:00
kevinz000
4f02c6f3c5 Merge pull request #11875 from Ghommie/Ghommie-cit683
Fixing some dog tier issue.
2020-04-17 05:40:50 -07:00
kevinz000
359790f5af Merge pull request #11876 from Citadel-Station-13/Ghommie-patch-2
Made light bulb/tubes actually use vis_overlays instead of overlays.
2020-04-17 05:40:32 -07:00
CitadelStationBot
92c8ccaa8a Automatic changelog generation for PR #11880 [ci skip] 2020-04-17 07:39:57 -05:00
kevinz000
d1d3c1f773 Merge pull request #11880 from NopemanMcHalt/benohybrid-screem
Allows xenohybrids to scream like xeno would
2020-04-17 05:39:54 -07:00
CitadelStationBot
68f14b3a57 Automatic changelog generation for PR #11857 [ci skip] 2020-04-17 07:20:56 -05:00
kevinz000
e84e6bface Merge pull request #11857 from Trilbyspaceclone/race_drinks
Race drinks!
2020-04-17 05:20:53 -07:00
CitadelStationBot
57fb1c1a17 Automatic changelog generation for PR #11852 [ci skip] 2020-04-17 07:16:08 -05:00
kevinz000
61f833b953 Merge pull request #11852 from Ghommie/Ghommie-cit681
Custom skin tone preferences.
2020-04-17 05:16:04 -07:00
CitadelStationBot
6abece11cd Automatic changelog generation for PR #11849 [ci skip] 2020-04-17 07:09:40 -05:00
kevinz000
038cb5c911 Merge pull request #11849 from Ghommie/Ghommie-cit680
Removes pixel offsets from box dorms lockers/dressers etcetera.
2020-04-17 05:09:37 -07:00
CitadelStationBot
18388fee12 Automatic changelog generation for PR #11877 [ci skip] 2020-04-17 01:55:17 -05:00
Ghom
044d360d20 Merge pull request #11877 from Detective-Google/lambda-fixes
Fixes a bunch of gripes people had with lambda.
2020-04-17 08:55:14 +02:00
CitadelStationBot
5ff909db1f Automatic changelog generation for PR #11886 [ci skip] 2020-04-17 01:53:23 -05:00
Ghom
d2a811a8d8 Merge pull request #11886 from jjpark-kb/youtoolfix
[Fix] YouTool Vending
2020-04-17 08:53:20 +02:00
Ghom
0fb1286042 Update guardian.dm 2020-04-17 08:47:05 +02:00
jjpark-kb
4a38b2870a fix youtool 2020-04-17 01:02:52 -04:00
kappa-sama
21f7a6032d this 2020-04-17 00:50:42 -04:00
Putnam
874e57a516 Makes dynamic voting not the default 2020-04-16 16:14:22 -07:00
Detective Google
78527739e3 moves a tiny fan away from the very angry ball of lightning 2020-04-16 17:21:25 -05:00
Trilbyspaceclone
6f4a3fc179 wine to jello 2020-04-16 17:51:03 -04:00
Detective Google
16b02495ae fixes the exe- valid room not being wired to the grid 2020-04-16 16:21:43 -05:00
CitadelStationBot
19328b8710 Automatic changelog generation for PR #11844 [ci skip] 2020-04-16 12:08:13 -05:00
Ghom
e511deabcf Merge pull request #11844 from Arturlang/crafting_fixes
Its no longer possible to craft multiple things at a time
2020-04-16 19:08:09 +02:00
CitadelStationBot
6c55480787 Automatic changelog generation for PR #11734 [ci skip] 2020-04-16 12:06:52 -05:00
Ghom
10bc1229f9 Merge pull request #11734 from Trilbyspaceclone/patch-329
Six new Sci based bounties!
2020-04-16 19:06:48 +02:00
Ghom
19f79f8843 Merge pull request #11611 from monster860/patch-2
Makes so turning in place updates riders when riding someone's back
2020-04-16 19:06:10 +02:00
Ghom
eb48e00bcb Merge pull request #11805 from kevinz000/damage_procs_lite
/carbon adjustStaminaLoss is now armor-piercing *as intended* before our modularized bandaid
2020-04-16 19:05:34 +02:00