shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
27,193 Commits 5 Branches 0 Tags
bb99be25045e05bcb287c958b7bdf667ef5a63af
Commit Graph
27193 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
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 3cb8391f38 Hopefully this won't screw up travis. 2019-12-17 12:15:28 +01:00
BlackMajor 5245898c25 whoops 2019-12-17 23:46:15 +13:00
BlackMajor 03d2e9eb6d Compress secK9 2019-12-17 23:32:51 +13:00
Ghommie 3f06661de5 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit453 2019-12-17 03:34:11 +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
Ghommie 1c3682cd15 Brings carbon action intent hotkeys down to living. 2019-12-17 00:03:39 +01: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 57163600ef Travis had a stroke. 2019-12-16 16:01:50 +01:00
Ghommie 9c5a66af67 Fixes AI being unable to talk through the holopad. 2019-12-16 15:58:10 +01:00
r4d6GitHubdeathride58
 		51a17dff94 Commit suggestions 
Co-Authored-By: deathride58 <deathride58@users.noreply.github.com>
 2019-12-16 09:23:42 -05:00
r4d6GitHubdeathride58
 		c291511ab6 Commit suggestions 
Co-Authored-By: deathride58 <deathride58@users.noreply.github.com>
 2019-12-16 09:23:35 -05:00
r4d6GitHubdeathride58
 		bfbb6231a5 Commit suggestions 
Co-Authored-By: deathride58 <deathride58@users.noreply.github.com>
 2019-12-16 09:23:28 -05:00
r4d6GitHubdeathride58
 		2d488bee52 Commit suggestions 
Co-Authored-By: deathride58 <deathride58@users.noreply.github.com>
 2019-12-16 09:23:21 -05:00
r4d6GitHubdeathride58
 		3e86e2207e Commit suggestions 
Co-Authored-By: deathride58 <deathride58@users.noreply.github.com>
 2019-12-16 09:23:07 -05:00
r4d6GitHubdeathride58
 		21b7fb0759 Commit suggestions 
Co-Authored-By: deathride58 <deathride58@users.noreply.github.com>
 2019-12-16 09:22:58 -05:00
Ghommie f738e370a4 Fixes pubby wall meds being var-edited snowflakes. 2019-12-16 15:22:50 +01:00
r4d6andGitHub 7142894ce7 Make the boop louder. 2019-12-16 09:02:01 -05:00
r4d6andGitHub 2e4187b7c8 Add a boop sound effect 2019-12-16 08:56:51 -05:00
r4d6andGitHub 728ca4fe99 Add a nose boop sound 2019-12-16 08:54:18 -05:00
Ghommie b0e8fb42cd AAAAA 2019-12-16 14:00:14 +01:00