Commit Graph
26965 Commits
Author SHA1 Message Date
Seris02 1d449fcd12 changes 2019-12-29 19:46:47 +08:00
Seris02 160e8c1ec5 stunglasses 2019-12-27 23:21:40 +08:00
CitadelStationBot 5be981e026 Automatic changelog generation for PR #10228 [ci skip] 2019-12-18 10:39:11 -06:00
kevinz000andGitHub cdb26e4916 Merge pull request #10228 from Putnam3145/quirk-fix
fixes quirks (again)
2019-12-18 09:39:08 -07:00
Putnam 114026f9ae argk 2019-12-18 02:40:51 -08:00
CitadelStationBot 5ec5650c6f Automatic changelog generation for PR #10227 [ci skip] 2019-12-18 00:41:44 -06:00
kevinz000andGitHub 29d6820ef0 Merge pull request #10227 from Putnam3145/quirk-fix
Probably fixes only neutral traits existing
2019-12-17 23:41:42 -07:00
Putnam 3dbf813817 probably fixes only neutral traits existing 2019-12-17 22:34:28 -08:00
CitadelStationBot 8b61c07713 Automatic changelog generation for PR #10153 [ci skip] 2019-12-17 14:09:11 -06:00
Putnam3145andGitHub 6b8f9427d0 Merge pull request #10153 from Linzolle/fireman-clarity
make unable to carry fireman message more clear when unable to carry non-humans
2019-12-17 12:09:08 -08:00
CitadelStationBot 844e9861b0 Automatic changelog generation for PR #10076 [ci skip] 2019-12-17 13:58:42 -06:00
Putnam3145andGitHub c0e548427b Merge pull request #10076 from Ghommie/Ghommie-cit437
Fixes alien tech node not being unlockable with subtypes of the accepted items.
2019-12-17 11:58:39 -08:00
CitadelStationBot 27a03aa30f Automatic changelog generation for PR #10026 [ci skip] 2019-12-17 13:58:03 -06:00
Putnam3145andGitHub b8c5290011 Merge pull request #10026 from Linzolle/neck-slice
Neck slice
2019-12-17 11:58:00 -08:00
Putnam3145andGitHub cfe35ce2fd Merge pull request #10167 from Ghommie/Ghommie-cit458
Fixing some not safe for work oddity.
2019-12-17 11:52:41 -08:00
CitadelStationBot 5d6c2e9f82 Automatic changelog generation for PR #10172 [ci skip] 2019-12-17 13:51:05 -06:00
Putnam3145andGitHub ed44b3130c Merge pull request #10172 from Ghommie/Ghommie-cit460
Porting several quirks code updates.
2019-12-17 11:51:03 -08:00
CitadelStationBot d215aa2d79 Automatic changelog generation for PR #10216 [ci skip] 2019-12-17 13:47:21 -06:00
Putnam3145andGitHub 7017ab243b Merge pull request #10216 from Ghommie/Ghommie-cit474
Porting a few martial art code updates.
2019-12-17 11:47:19 -08:00
Putnam3145andGitHub 37cfec22aa Merge pull request #10066 from Sishen1542/aaaaaaaa
neovgre qol changes
2019-12-17 11:40:43 -08:00
CitadelStationBot f84bb03bf6 Automatic changelog generation for PR #10111 [ci skip] 2019-12-17 13:38:37 -06:00
Putnam3145andGitHub 7a6541936c Merge pull request #10111 from kappa-sama/patch-11
send help please, or how i vowed to kill kevinz (you can now strip people while aggrograbbing)
2019-12-17 11:38:35 -08:00
CitadelStationBot 1727bf321e Automatic changelog generation for PR #10155 [ci skip] 2019-12-17 13:34:15 -06:00
Putnam3145andGitHub 0adcb900c1 Merge pull request #10155 from Seris02/windowfix
adds some distance checks to some things
2019-12-17 11:34:13 -08:00
CitadelStationBot 6888ca7e29 Automatic changelog generation for PR #10157 [ci skip] 2019-12-17 13:33:36 -06:00
Putnam3145andGitHub 634154e7cf Merge pull request #10157 from Ghommie/Ghommie-cit452
Ports "Fixes powernet avail checks"
2019-12-17 11:33:33 -08:00
CitadelStationBot 85b504042a Automatic changelog generation for PR #10203 [ci skip] 2019-12-17 13:32:58 -06:00
Putnam3145andGitHub 10f0fa6868 Merge pull request #10203 from DeltaFire15/mechaccess
Nukies and deathsquaddies can now finally fix their mechs internal fires
2019-12-17 11:32:56 -08:00
Putnam3145andGitHub 670141edf7 Merge pull request #10209 from Ghommie/Ghommie-cit470
ports "Standardize obj/updateicon() and update_icons() to update_icon()"
2019-12-17 11:26:36 -08:00
CitadelStationBot a749df2596 Automatic changelog generation for PR #10225 [ci skip] 2019-12-17 13:22:33 -06:00
Putnam3145andGitHub 5945f30523 Merge pull request #10225 from Ghommie/Ghommie-cit475
Two slimepeople fixes.
2019-12-17 11:22:30 -08:00
CitadelStationBot e751d6bef3 Automatic changelog generation for PR #10072 [ci skip] 2019-12-17 06:02:31 -06:00
BlackMajorandGitHub 95c0eddc2a Merge pull request #10072 from Useroth/new-tg-plants
Ported bamboo stuff from tg.
2019-12-18 01:02:29 +13:00
Ghommie f2cf146255 Two slimepeople fixes. 2019-12-17 12:49:04 +01:00
Ghommie 6b7dcbceb0 Porting a few martial art code updates. 2019-12-17 03:19:07 +01:00
CitadelStationBot 4011f9a1e1 Automatic changelog generation for PR #10181 [ci skip] 2019-12-16 19:08:30 -06:00
LinandGitHub 6f70ba1477 Merge pull request #10181 from Ghommie/Ghommie-cit463
Fixing a few pill bottle issues with the ChemMaster.
2019-12-17 01:08:27 +00:00
CitadelStationBot 274f35dd23 Automatic changelog generation for PR #10180 [ci skip] 2019-12-16 19:05:13 -06:00
LinandGitHub 237fbaa02d Merge pull request #10180 from Ghommie/Ghommie-cit462
[s] virtual reality component improvements, fixes and documentation.
2019-12-17 01:05:10 +00:00
Putnam3145andGitHub 6365a430cc Merge pull request #10208 from Ghommie/Ghommie-cit469
Fixes AI being unable to talk through the holopad.
2019-12-16 10:57:26 -08:00
Ghommie 93fbc17428 ports "Standardize obj/updateicon() and update_icons() to update_icon()" 2019-12-16 17:58:50 +01:00
Ghommie 9c5a66af67 Fixes AI being unable to talk through the holopad. 2019-12-16 15:58:10 +01:00
CitadelStationBot 5f59d7a9c5 Automatic changelog generation for PR #10115 [ci skip] 2019-12-16 05:24:00 -06:00
BlackMajorandGitHub d1a37fd192 Merge pull request #10115 from Useroth/lavaland-tumors
[READY] Ported lavaland tumors and elites from tg.
2019-12-17 00:23:57 +13:00
Useroth 8151a1f3ff Merged master into this branch. 2019-12-16 12:06:30 +01:00
DeltaFire 05497bb392 Changes required to enable for maintenance protocols
All combat mechs that are special get their internals_access increased so the pilots of the deathsquad / nuke team can fix up their mechs without having to steal a robotics ID. Also removes engineering from being able to access mech internals, seems weird to have if only robotics is allowed to handle mechs, probably remnant of engineering robotics?
2019-12-16 11:25:11 +01:00
CitadelStationBot 6e08366d40 Automatic changelog generation for PR #9736 [ci skip] 2019-12-15 21:20:41 -06:00
LinandGitHub b54c8a6a2a Merge pull request #9736 from Citadel-Station-13/kevinz000-patch-113
I want to have a word with whoever wrote the original antagonist reputation proc
2019-12-16 03:20:38 +00:00
CitadelStationBot 05460586e1 Automatic changelog generation for PR #9971 [ci skip] 2019-12-15 21:11:11 -06:00
kevinz000andGitHub ba7a3f5fd2 Merge pull request #9971 from Xantholne/xantholne-christmas01
Adds the Christmas Clothes you never knew you wanted.
2019-12-15 20:11:09 -07:00