Commit Graph

26452 Commits

Author SHA1 Message Date
Ghommie
fa270c8a79 leftovers. 2019-12-03 06:48:25 +01:00
Ghommie
6e318bfb09 Fixes traitor codewords highlight and some other hear signal hoonks. 2019-12-03 06:31:35 +01:00
CitadelStationBot
f526a6f4d8 Automatic changelog generation for PR #9915 [ci skip] 2019-12-02 01:34:57 -06:00
Putnam3145
0a5e9bdb62 Merge pull request #9915 from Owai-Seek/tinytweaks
Janitor QoL, Vendor Updates, and some tweaks.
2019-12-01 23:34:54 -08:00
Putnam3145
8d09f5a082 Merge branch 'master' into tinytweaks 2019-12-01 23:24:56 -08:00
CitadelStationBot
f1ae57b626 Automatic changelog generation for PR #9946 [ci skip] 2019-12-02 01:12:38 -06:00
Putnam3145
8da17c5aaf Merge pull request #9946 from Citadel-Station-13/kevinz000-patch-117
Removes hyperspeed from light pink stabilized for -4.5 stam/tick + free sprint
2019-12-01 23:12:35 -08:00
CitadelStationBot
06617d1094 Automatic changelog generation for PR #9976 [ci skip] 2019-12-02 01:07:56 -06:00
Putnam3145
af31fe12c7 Merge pull request #9976 from Ghommie/Ghommie-cit405
Ports "Fixes transit tube barricade spam"
2019-12-01 23:07:53 -08:00
CitadelStationBot
4f9cb5f8c4 Automatic changelog generation for PR #9989 [ci skip] 2019-12-02 01:06:43 -06:00
Putnam3145
7bb2b042ee Merge pull request #9989 from Ghommie/Ghommie-cit410
Ports the energy gun empty state overlay fix.
2019-12-01 23:06:40 -08:00
Putnam3145
4942002698 Merge pull request #10022 from Sishen1542/n
techfabs are now easier to investigate
2019-12-01 13:44:00 -08:00
CitadelStationBot
35830be594 Automatic changelog generation for PR #10010 [ci skip] 2019-12-01 15:43:24 -06:00
Putnam3145
c5c52caf2e Merge pull request #10010 from Ghommie/Ghommie-cit415
Fixes implant pads and updates them a little (WHY THE HELL DO WE STILL HAVE THIS OLDCODE CRAP LINGERING AROUND?)
2019-12-01 13:43:21 -08:00
Sishen
a4323b2e4e Update _production.dm 2019-12-01 05:10:30 -07:00
Sishen
3ac863d0ac Revert "n"
This reverts commit 975a1a968c.
2019-12-01 05:09:34 -07:00
Sishen
975a1a968c n 2019-12-01 05:03:18 -07:00
Ghommie
b914791a87 ??? 2019-12-01 09:09:08 +01:00
CitadelStationBot
7089208162 Automatic changelog generation for PR #9980 [ci skip] 2019-12-01 00:53:09 -06:00
Putnam3145
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
Putnam3145
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
Lin
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
Putnam3145
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
Putnam3145
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
Putnam3145
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
Putnam3145
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
Putnam3145
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
kevinz000
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
Putnam3145
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
Ghommie
d9636398e1 Fixes implant pads 2019-11-29 20:12:10 +01:00
loginsandylogout
67754daf22 Fixed 2019-11-29 10:57:51 -06:00
loginsandylogout
7ddaaea267 Cats 2019-11-29 10:56:18 -06:00
loginsandylogout
88bd7678b1 Eee 2019-11-29 10:55:00 -06:00
loginsandylogout
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
Putnam3145
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