Commit Graph
26426 Commits
Author SHA1 Message Date
Linzolle efbc85cb40 couple fxies 2019-12-01 15:39:55 -06:00
Linzolle a20b975d68 copy paste errors lol 2019-12-01 14:40:25 -06:00
Linzolle 19b004edab update butchering 2019-12-01 14:35:11 -06:00
CitadelStationBot 7089208162 Automatic changelog generation for PR #9980 [ci skip] 2019-12-01 00:53:09 -06:00
Putnam3145andGitHub 219529d375 Merge pull request #9980 from Ghommie/Ghommie-cit406
Ports "Removes phantom gas effects on space tiles"
2019-11-30 22:53:07 -08:00
CitadelStationBot facc65baf3 Automatic changelog generation for PR #10016 [ci skip] 2019-12-01 00:51:45 -06:00
Putnam3145andGitHub 1d91e1acf4 Merge pull request #10016 from deathride58/mousedropfixes
Mousedrop fixes - Adds return value to item mousedrop and fixes bugs with the few things that override it
2019-11-30 22:51:42 -08:00
CitadelStationBot 953ef607e2 Automatic changelog generation for PR #10017 [ci skip] 2019-12-01 00:47:19 -06:00
LinandGitHub 0f721cbfca Merge pull request #10017 from Putnam3145/volume-filter
Makes filters volume-based
2019-12-01 06:47:16 +00:00
CitadelStationBot 28f2ffb48e Automatic changelog generation for PR #9972 [ci skip] 2019-12-01 00:46:32 -06:00
Putnam3145andGitHub e1a9c8e6d3 Merge pull request #9972 from Ghommie/Ghommie-cit403
Fixed double whitespace gap in human, ai and carbon examine.
2019-11-30 22:46:29 -08:00
CitadelStationBot 224e75a919 Automatic changelog generation for PR #9981 [ci skip] 2019-12-01 00:44:09 -06:00
Putnam3145andGitHub aaf9f12e11 Merge pull request #9981 from Ghommie/Ghommie-cit407
Rags are no longer transparent reagent containers. Also allows squeezing their reagents into another container.
2019-11-30 22:44:06 -08:00
CitadelStationBot ea4c414cde Automatic changelog generation for PR #10005 [ci skip] 2019-12-01 00:36:29 -06:00
Putnam3145andGitHub fde3f52212 Merge pull request #10005 from Commandersand/loadoutcit
Adds plaid skirt, pens, stripper outfits,athletic shorts to loadout. also keyhole sweater
2019-11-30 22:36:27 -08:00
CitadelStationBot 1d1a2796d5 Automatic changelog generation for PR #9977 [ci skip] 2019-12-01 00:23:44 -06:00
Putnam3145andGitHub a196e3f45b Merge pull request #9977 from Useroth/new-tg-plants
[FIX] Another patch for the recently added tg plants.
2019-11-30 22:23:41 -08:00
CitadelStationBot 2f11a73127 Automatic changelog generation for PR #9895 [ci skip] 2019-12-01 00:22:55 -06:00
Putnam3145andGitHub 44c621e5e9 Merge pull request #9895 from Thalpy/OrganQoL
[READY] Organ quality of life fixes. Adds Organ fridges with items, Tweaks scanner, new surgery, tweaks chems
2019-11-30 22:22:52 -08:00
CitadelStationBot f1f4086955 Automatic changelog generation for PR #9893 [ci skip] 2019-11-30 23:48:52 -06:00
kevinz000andGitHub c3dc0e7c71 Merge pull request #9893 from Putnam3145/threat-log-fixes
[DYNAMIC] Roundend threat log only shows changes that fully happened
2019-11-30 22:48:50 -07:00
Putnam 1b310d41bf Filters are now volume-based. 2019-11-29 21:23:08 -08:00
deathride58 6b3f992d8e fixes paperbins and papercutters proper 2019-11-29 23:11:27 -05:00
deathride58 b1fca2b74b Mousedrop fixes - Adds return value to item mousedrop and fixes current bugs with the few things that make use of it 2019-11-29 22:59:37 -05:00
CitadelStationBot 8c9bae52d8 Automatic changelog generation for PR #10015 [ci skip] 2019-11-29 19:30:30 -06:00
Putnam3145andGitHub fad36f2031 Merge pull request #10015 from Putnam3145/fix-traitor
[SPEEDMERGE] Fixes traitor unassigning incorrectly and spamming
2019-11-29 17:30:28 -08:00
Putnam 00f7305aa5 holy shit 2019-11-29 17:15:49 -08:00
loginsandylogoutandGitHub 67754daf22 Fixed 2019-11-29 10:57:51 -06:00
loginsandylogoutandGitHub 7ddaaea267 Cats 2019-11-29 10:56:18 -06:00
loginsandylogoutandGitHub 88bd7678b1 Eee 2019-11-29 10:55:00 -06:00
loginsandylogoutandGitHub a608003555 Equals 2019-11-29 10:53:57 -06:00
CitadelStationBot 81977819ac Automatic changelog generation for PR #9964 [ci skip] 2019-11-29 08:20:20 -06:00
Putnam3145andGitHub ad53b10faa Merge pull request #9964 from GrayRachnid/fixmyblunder
Fixes Codewords not changing color and MkUltra enthrall not having the proper hearing_args
2019-11-29 06:20:18 -08:00
CitadelStationBot 7f0f8e0be8 Automatic changelog generation for PR #9996 [ci skip] 2019-11-29 08:16:39 -06:00
Putnam3145andGitHub 4f018b070f Merge pull request #9996 from Ghommie/Ghommie-cit413
Fixes tinfoil hats giving random traumas.
2019-11-29 06:16:36 -08:00
Putnam3145andGitHub 3b437417b9 Merge pull request #10000 from Citadel-Station-13/kevinz000-patch-119
Nerfs nanite adrenals
2019-11-29 05:42:49 -08:00
loginsandylogoutandGitHub c8bc6941eb "don't copy paste code" 2019-11-29 02:46:31 -06:00
loginsandylogoutandGitHub 0da35fdde5 again 2019-11-29 02:33:33 -06:00
loginsandylogoutandGitHub f9d8c41c3e newline needed apparently 2019-11-29 02:32:47 -06:00
Commandersand 2c2f3ea8aa mandatory meme 2019-11-29 02:03:31 -06:00
Commandersand 60cee5814a keyholesweater 2019-11-29 01:59:34 -06:00
Commandersand 22d0dbc05b sundress and stripper 2019-11-29 01:56:47 -06:00
Commandersand 5b7bf08d10 sundress 2019-11-29 01:47:41 -06:00
Commandersand b715c088f6 add athletic shorts to loadout 2019-11-29 01:27:15 -06:00
Commandersand 57af7ba8af add plaid skirt,multipen,fountainpen to loadout 2019-11-29 01:24:24 -06:00
Ghommie 5aed21a6f0 It's just list tabbing, gray. 2019-11-29 07:43:31 +01:00
kevinz000andGitHub bcfa9c6c4d Merge pull request #9956 from Linzolle/duke-beret
Donator item fix
2019-11-28 23:12:35 -07:00
kevinz000andGitHub f0f2063884 Merge pull request #9958 from Ghommie/Ghommie-cit396
Ports a few telecomms updates and fixes.
2019-11-28 23:12:19 -07:00
CitadelStationBot 0c76c19e32 Automatic changelog generation for PR #9960 [ci skip] 2019-11-29 00:11:59 -06:00
kevinz000andGitHub 521fdec59b Merge pull request #9960 from Ghommie/Ghommie-cit398
Ports custom reagent icecreams.
2019-11-28 23:11:57 -07:00