Commit Graph

26055 Commits

Author SHA1 Message Date
Winter Flare e7523862eb Added Newspaperr to Loadout 2019-11-25 06:02:50 -05:00
Winter Flare fb4a47d310 Added more items to vendors.
-Added stuff to the following:
clothing vendor
chef utensil vendor
snack vendors
kinkmate
2019-11-23 15:58:04 -05:00
Winter Flare eee8c8c108 Shields Bounty is now 2 for 3000 2019-11-23 03:11:00 -05:00
Winter Flare 03dae580a9 Minor QoL and Wardrobe Updates 2019-11-22 14:08:12 -05:00
CitadelStationBot 0f9ec5ebb3 Automatic changelog generation for PR #9887 [ci skip] 2019-11-21 20:39:32 -06:00
Lin 522a664f55 Merge pull request #9887 from Ghommie/Ghommie-cit385
Martial arts pacifism fixes and boxing buff, more ported pacifist fixes.
2019-11-22 02:39:29 +00:00
CitadelStationBot 05e3fc1a01 Automatic changelog generation for PR #9530 [ci skip] 2019-11-21 20:37:52 -06:00
Lin 1ddb9935ff Merge pull request #9530 from Ghommie/Ghommie-cit245
Touching up job outfits equip procs, little PDA fix.
2019-11-22 02:37:49 +00:00
CitadelStationBot 0cbfd22c95 Automatic changelog generation for PR #9518 [ci skip] 2019-11-21 19:36:50 -06:00
Lin 3979079fde Merge pull request #9518 from Ghommie/Ghommie-cit243
Ports "You can now click on objects and mobs below flaps and signs"
2019-11-22 01:36:47 +00:00
CitadelStationBot 318709b5c0 Automatic changelog generation for PR #9823 [ci skip] 2019-11-21 19:16:38 -06:00
Lin c2d182d50d Merge pull request #9823 from Seris02/wintergalorefix
Adds HoS, HoP, CE, CMO, QM, RD, chemistry, genetics, virology, robotics, janitor and cosmic winter coats - Try 2
2019-11-22 01:16:35 +00:00
CitadelStationBot 584455aca0 Automatic changelog generation for PR #9871 [ci skip] 2019-11-21 19:15:07 -06:00
Lin 6323d9d7c8 Merge pull request #9871 from dzahlus/buff-sounds
Sound rework: Gunsounds edition
2019-11-22 01:15:05 +00:00
CitadelStationBot cf1e9021d0 Automatic changelog generation for PR #9889 [ci skip] 2019-11-21 19:14:41 -06:00
Lin 2412bad483 Merge pull request #9889 from GrayRachnid/fixgoldbox
Fixes gold toolbox inhand sprite having the wrong name
2019-11-22 01:14:39 +00:00
Seris02 253464e508 fixes icons fully 2019-11-21 14:10:55 +08:00
Seris02 4650cf9f12 gets rid of the bad icon, switching to see other icon and fix again, just one more commit to go, yeet 2019-11-21 14:07:57 +08:00
Seris02 2dd20c63f9 fixes the icons added 2019-11-21 14:03:37 +08:00
CitadelStationBot 976ac6ad0c Automatic changelog generation for PR #9880 [ci skip] 2019-11-20 23:12:44 -06:00
kevinz000 c22ae596fc Merge pull request #9880 from Putnam3145/meteor-random-fix
Makes sure every dynamic-triggered event isn't random on dynamic
2019-11-20 22:12:42 -07:00
CitadelStationBot 33be109eac Automatic changelog generation for PR #9866 [ci skip] 2019-11-20 23:09:56 -06:00
kevinz000 1efd3ae395 Merge pull request #9866 from Useroth/tatorstrangeseeds
Adds strange seeds as a buyable traitor botanist item.
2019-11-20 22:09:53 -07:00
CitadelStationBot 75f83944ca Automatic changelog generation for PR #9865 [ci skip] 2019-11-20 23:09:24 -06:00
kevinz000 61c759f7a2 Merge pull request #9865 from Useroth/bagsort
Glitchfix. Prevents storage bags from changing the order of their numbered contents when items are removed.
2019-11-20 22:09:22 -07:00
CitadelStationBot b1b30b8150 Automatic changelog generation for PR #9868 [ci skip] 2019-11-20 23:08:57 -06:00
kevinz000 30aefd050a Merge pull request #9868 from Ghommie/Ghommie-cit376
Fixes superlube waterflower.
2019-11-20 22:08:54 -07:00
Seris02 60def2a9fc Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into wintergalorefix 2019-11-21 13:08:23 +08:00
CitadelStationBot fda0905b9f Automatic changelog generation for PR #9323 [ci skip] 2019-11-20 23:03:42 -06:00
nik707 8d363b8e9d Merge pull request #9323 from Citadel-Station-13/kevinz000-patch-85
adds poll ignore for magical antagonists
2019-11-20 23:03:39 -06:00
CitadelStationBot 345d1af88e Automatic changelog generation for PR #9831 [ci skip] 2019-11-20 23:01:52 -06:00
kevinz000 42de0d5ebe Merge pull request #9831 from Putnam3145/dynamic-nukeops-pop-fix
Makes dynamic nukeops population scaling more like secret
2019-11-20 22:01:49 -07:00
nik707 0300927974 Merge pull request #9487 from Citadel-Station-13/spooky
adds an easy way for admins to force enable halloween races without the rest of halloween's code
2019-11-20 23:00:09 -06:00
CitadelStationBot e941a10d4d Automatic changelog generation for PR #9681 [ci skip] 2019-11-20 22:55:24 -06:00
nik707 56d2c0edad Merge pull request #9681 from Citadel-Station-13/kevinz000-patch-107
buffs bluespace apprentice (targeted teleport --> blink)
2019-11-20 22:55:21 -06:00
CitadelStationBot 1071147214 Automatic changelog generation for PR #9828 [ci skip] 2019-11-20 22:53:07 -06:00
kevinz000 540a57b518 Merge pull request #9828 from Putnam3145/dynamic-meteor-nonrepeat
Makes meteor not repeatable in dynamic.
2019-11-20 21:53:05 -07:00
CitadelStationBot c0b22a80be Automatic changelog generation for PR #9703 [ci skip] 2019-11-20 22:52:13 -06:00
nik707 28190bc168 Merge pull request #9703 from Citadel-Station-13/kevinz000-patch-109
emagged medibots now murder the everloving fuck out of slimepeople
2019-11-20 22:52:11 -06:00
nik707 df11e75414 Merge pull request #9718 from Citadel-Station-13/kevinz000-patch-110
fixes a bug with rnd multiprinting
2019-11-20 22:51:32 -06:00
CitadelStationBot 9ce45a6f10 Automatic changelog generation for PR #9720 [ci skip] 2019-11-20 22:51:13 -06:00
nik707 6d889e66c4 Merge pull request #9720 from Citadel-Station-13/kevinz000-patch-111
Is it the time of year to buff disablers again?
2019-11-20 22:51:11 -06:00
CitadelStationBot 1d173901cf Automatic changelog generation for PR #9812 [ci skip] 2019-11-20 22:50:21 -06:00
kevinz000 82a2bab4b9 Merge pull request #9812 from Ghommie/Ghommie-cit354
Fixing missing delivery packages sprites
2019-11-20 21:50:18 -07:00
kevinz000 8df8acb1b7 Merge pull request #9811 from Ghommie/Ghommie-cit353
Dreamchecker compatibility changes, part 2.
2019-11-20 21:49:58 -07:00
CitadelStationBot dc101aca34 Automatic changelog generation for PR #9873 [ci skip] 2019-11-20 22:48:43 -06:00
kevinz000 c503e564db Merge pull request #9873 from Ghommie/Ghommie-cit378
Fixing aux-base construction RCD door access settings menu and reverting another non-functional bit
2019-11-20 21:48:41 -07:00
CitadelStationBot 641fa400db Automatic changelog generation for PR #9875 [ci skip] 2019-11-20 22:47:51 -06:00
kevinz000 4b41a70e13 Merge pull request #9875 from Putnam3145/required-candidates-works-now
Makes from-ghosts rulesets cancel if fewer than required candidates
2019-11-20 21:47:48 -07:00
CitadelStationBot 3274ca9454 Automatic changelog generation for PR #9876 [ci skip] 2019-11-20 22:47:36 -06:00