Commit Graph
26065 Commits
Author SHA1 Message Date
GrayRachnid 77913406ed Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into disablesnolegs 2019-11-22 18:50:24 -05:00
CitadelStationBot 0c76e9a6d0 Automatic changelog generation for PR #9886 [ci skip] 2019-11-22 17:48:30 -06:00
Putnam3145andGitHub 6145cd0d96 Merge pull request #9886 from Ghommie/Ghommie-cit384
chem dispenser beakers and bikehorn fixes.
2019-11-22 15:48:28 -08:00
CitadelStationBot 404d202f2b Automatic changelog generation for PR #9908 [ci skip] 2019-11-22 17:42:56 -06:00
Putnam3145andGitHub 4fbd42995c Merge pull request #9908 from Ghommie/Ghommie-cit389
Little APC overlays tweak. Removing rogue pixels from the energy gun.
2019-11-22 15:42:54 -08:00
Putnam3145andGitHub b7f7342e43 Merge pull request #9900 from Ghommie/Ghommie-cit388
fixing a get_idcard runtime. or The betrayal of the ?. operator
2019-11-22 15:41:52 -08:00
GrayRachnid a7918717ff fixes compile errors. 2019-11-22 18:22:53 -05:00
GrayRachnid 61299fee42 ready for review/testing 2019-11-22 15:32:09 -05:00
GrayRachnid 3544885b73 reverts fermis changes, woops. 2019-11-22 15:26:20 -05:00
GrayRachnid c8e52fb8e1 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into disablesnolegs 2019-11-22 15:24:15 -05:00
Ghommie 3310a2c435 Little APC overlays tweak. Removing rogue pixels from the energy gun. 2019-11-22 04:26:00 +01:00
CitadelStationBot 0f9ec5ebb3 Automatic changelog generation for PR #9887 [ci skip] 2019-11-21 20:39:32 -06:00
LinandGitHub 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
LinandGitHub 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
LinandGitHub 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
LinandGitHub 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
LinandGitHub 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
LinandGitHub 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
Ghommie bfeece4c6e fixing a get_idcard runtime. The betrayal of the ?. 2019-11-21 09:23:05 +01: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
kevinz000andGitHub 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
kevinz000andGitHub 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
kevinz000andGitHub 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
kevinz000andGitHub 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
nik707andGitHub 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
kevinz000andGitHub 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
nik707andGitHub 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
nik707andGitHub 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
kevinz000andGitHub 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
nik707andGitHub 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
nik707andGitHub 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
nik707andGitHub 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