shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
23,768 Commits 5 Branches 0 Tags
ff451c8cf44ead9f8bdd016693adcd31d463535d
Commit Graph

9439 Commits

Author SHA1 Message Date
kevinz000
5608d37fd5 Merge pull request #9263 from Trilbyspaceclone/batter_up 
Adds a new traitor bundle - Synda Major Leage Player
 2019-09-21 01:56:41 -07:00
kevinz000
15aab80d75 Merge pull request #9253 from chefferz/chefferz-balance1 
Doubles stamina regen when standing/laying down
 2019-09-21 01:48:20 -07:00
kevinz000
313956002b Merge pull request #9269 from Thalpy/FermiGrenades 
Re-enables fermichem mechanics for grenades, nuances heat for general handling and enables SDGF/hatmium explosions.
 2019-09-21 01:46:22 -07:00
kevinz000
3e899e59f9 Merge pull request #9283 from Trilbyspaceclone/removal 
Removes a lot of unused files
 2019-09-21 01:45:11 -07:00
kevinz000
f259d98d7a Merge pull request #9282 from Ghommie/Ghommie-cit193 
Fixed a few dozen suits' body coverage inconsistencies.
 2019-09-21 01:43:52 -07:00
kevinz000
1fda7755d3 Merge pull request #9298 from Ghommie/Ghommie-cit197 
Fixes undershirts n socks colors prefs.
 2019-09-21 01:43:10 -07:00
kevinz000
5c8e585010 Merge pull request #9292 from Ghommie/Ghommie-cit94 
Fixes clown shoes and work boots.
 2019-09-21 01:42:03 -07:00
kevinz000
f898c99f62 Merge pull request #9304 from Trilbyspaceclone/bs_blood 
Its a blood bath! A BlueSpace Blood Bath!
 2019-09-21 01:39:29 -07:00
kevinz000
7d192c305a Merge pull request #9306 from kappa-sama/voidcell 
Abductor batteries can be used to unlock abductor research
 2019-09-21 01:39:08 -07:00
kevinz000
30fa8d8231 Merge pull request #9293 from Ghommie/Ghommie-cit195 
leftover legcuffs/handcuffs overlays fix.
 2019-09-21 01:38:14 -07:00
kevinz000
a9965d64b3 Merge pull request #9312 from Linzolle/ligament 
ports ligament surgeries as well as dissection
 2019-09-21 01:37:47 -07:00
Linzolle
573932437e COMMA 2019-09-18 23:55:52 -05:00
Linzolle
cd2e894ebe display results and wording 2019-09-18 23:51:35 -05:00
Linzolle
4bf9c8cc84 citadel fixes 2019-09-18 23:15:05 -05:00
XDTM
023428f6a4 port experimental dissection 2019-09-18 23:04:11 -05:00
XDTM
8ad11d7250 ports ligament surgeries 2019-09-18 22:55:46 -05:00
Fermi
df4da58ce8 Merge branch 'NeuroFix' of https://github.com/Thalpy/Citadel-Station-13 into NeuroFix 2019-09-19 01:46:32 +01:00
Fermi
08eeda97f5 Heck 2019-09-19 01:45:21 +01:00
Thalpy
18ce46d7ec Merge branch 'master' into NeuroFix 2019-09-19 01:44:09 +01:00
kappa-sama
34d109f6a2 on further thought, all of them 2019-09-18 17:12:06 -04:00
kappa-sama
9bdbf444e4 abductor batteries to tech tree 2019-09-18 17:09:24 -04:00
TrilbySpaceClone
5ecf68918b tada 2019-09-18 03:47:52 -04:00
kevinz000
2cf1e6ff85 Merge pull request #9302 from deathride58/jobcodesanitychecks 
fixes roundstart runtimes by job_preferences index checks be explicit key checks instead, plus some extra sanity checks
 2019-09-17 22:00:59 -07:00
Ghommie
8bf4d5754e I'm a moron. 2019-09-18 04:23:52 +02:00
deathride58
18e97451a3 Merge branch 'master' into jobcodesanitychecks 2019-09-17 22:15:09 -04:00
Ghommie
abb8450e29 ninja shoes. 2019-09-18 04:07:51 +02:00
deathride58
d0296a5e81 fixes roundstart runtimes by job_preferences index checks be explicit key checks instead, plus some extra sanity checks 2019-09-17 20:15:06 -04:00
Ghommie
150da1d34a code quality 2019-09-18 01:37:17 +02:00
Ghommie
63fbf225a6 aaaaa 2019-09-18 01:24:44 +02:00
Ghommie
040b6472b4 FUCK 2019-09-18 01:21:18 +02:00
Ghommie
3ba5a2fd69 Fixes undershirts n socks colors. 2019-09-17 18:34:16 +02:00
Poojawa
6668630649 Merge branch 'master' into are-those-horns-are-are-you-just-retarded 2019-09-15 23:25:22 -05:00
BlackMajor
5a58ac6875 Merge pull request #9027 from Poojawa/job-menu-improvements 
Job menu improvements Except maybe Kevin will merge it this time instead of a month later
 2019-09-16 16:19:42 +12:00
Ghommie
f3a5e2e321 leftover legcuffs/handcuffs overlays fix. 2019-09-15 20:30:10 +02:00
Ghommie
300c572886 Added work boots and bananium clown shoes inhands, more fixes. ready. 2019-09-15 18:21:48 +02:00
Ghommie
89360c3574 Fixes clown shoes and work boots. 2019-09-15 17:56:20 +02:00
kevinz000
f3592a54a7 Merge pull request #9288 from Trilbyspaceclone/patch-227 
Fixes orical UI being broken and taking modular files that are not a thing
 2019-09-14 15:55:43 -07:00
Sishen
5159a58fef Update strained_muscles.dm 2019-09-14 12:00:28 -04:00
Trilbyspaceclone
bad8a816ab Update themed.dm 2019-09-14 06:51:19 -04:00
Poojawa
bf3d30c0e4 Seperates Insect fluff from wings 
Fluff can be the new body markings I guess.
 2019-09-14 04:27:38 -05:00
Poojawa
0417c0d6af Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into job-menu-improvements 2019-09-13 23:28:08 -05:00
Poojawa
0faafe8deb Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into are-those-horns-are-are-you-just-retarded 2019-09-13 23:26:27 -05:00
Poojawa
344ccaf20d cleans up some other species related stuff, unmodularizes some code 2019-09-13 22:18:53 -05:00
Trilbyspaceclone
5b2dba354a Merge branch 'master' into fruit 2019-09-13 14:00:11 -04:00
Poojawa
f0afc9c490 Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into job-menu-improvements 2019-09-13 12:59:15 -05:00
Poojawa
9376bfb44d Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into are-those-horns-are-are-you-just-retarded 2019-09-13 12:56:57 -05:00
kevinz000
39beca1a0f Merge pull request #9199 from Tupinambis/IUsedTheShotgunYouKnowWhy 
I Used The Shotgun, You Know Why? (Shotgun Balance Pass)
 2019-09-13 10:47:15 -07:00
kevinz000
e107c51e19 Merge pull request #9241 from Linzolle/oracleui 
Ports Oracle UI framework, and updates UI for paper and disposal bins.
 2019-09-13 10:46:11 -07:00
kevinz000
eab0b8934f Merge pull request #9279 from Ghommie/Ghommie-cit192 
Fixing undergarments color preferences resetting each round.
 2019-09-13 10:43:43 -07:00
kevinz000
591a584785 Merge pull request #9275 from Thalpy/InitialD 
Fixes analyse function on ChemMasters to correctly display purity and fixes the custom transfer for buffer to beaker button.
 2019-09-13 10:43:22 -07:00