shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
25,353 Commits 5 Branches 0 Tags
12a69dcee5b67c1908d3f9fded2670b3e6f3ea35
Commit Graph

10345 Commits

Author SHA1 Message Date
Poojawa
92218d0213 doing the little things 2019-09-16 17:59:04 -05:00
Poojawa
fa7bf43ce7 Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods 2019-09-16 17:44:10 -05:00
Fermi
6814aae0f8 Tweaks! 2019-09-16 21:28:23 +01: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
Fermi
41c8c7dde6 Why tho 2019-09-16 01:12:49 +01: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
Ghommie
c813555697 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit45 2019-09-15 04:05:14 +02:00
Fermi
f6b96a818e Update 2019-09-15 00:55:40 +01: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
fbf92d6486 Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into gen-poppers 2019-09-13 23:28:53 -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
ec4b1fba72 Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods 2019-09-13 23:27:50 -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
Fermi
e281384b7a It's actually less laggy than I thought. 2019-09-14 03:10:54 +01:00
Fermi
c823a2d23a Preview. 2019-09-14 03:09:32 +01:00
Fermi
80b79ef94e Mostly complete for now 2019-09-14 02:26:06 +01:00
Fermi
e62a491c18 Now does chem reactions too. 2019-09-14 00:08:23 +01:00
Fermi
80997e4ef3 Works. 2019-09-13 23:06:09 +01:00
Fermi
04b492924b Works kinda 2019-09-13 20:23:07 +01:00
Fermi
87de05622e Justin case 2019-09-13 19:26:20 +01:00
Fermi
eeddcfa295 I think it works, well, not sure about the CR stuff 2019-09-13 19:22:05 +01:00
Poojawa
2250f0e516 Merge remote-tracking branch 'refs/remotes/origin/job-menu-improvements' into gen-poppers 2019-09-13 13:00:45 -05:00
Poojawa
fa364bbad0 Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into gen-poppers 2019-09-13 13:00:29 -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
53895106dc Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods 2019-09-13 12:58:02 -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
kevinz000
c4f5ce67b8 Merge pull request #9276 from Trilbyspaceclone/war_on_fashen 
Adds clip on pokadoted pants, only in 4 types for now
 2019-09-13 10:43:00 -07:00
kevinz000
42613d1800 Merge pull request #9251 from Linzolle/chaplain-fashion-time 
Allow all chaplain gear to equip the same things in their suit storage
 2019-09-13 10:42:42 -07:00
kevinz000
4494f42155 Merge pull request #9270 from Linzolle/reallyguys 
fixes donuts being uncraftable
 2019-09-13 10:40:21 -07:00
Fermi
44cff04515 Atom stop crashing pls 2019-09-13 18:03:39 +01:00
Poojawa
9561819fb7 Fixes Horn coloration issues, allows mammals to choose their meat type 
Because reasons I guess.
 2019-09-13 10:58:04 -05:00
TrilbySpaceClone
626e525d24 ..? 2019-09-12 23:36:59 -04:00
TrilbySpaceClone
6a36e5a317 huh 2019-09-12 23:26:07 -04:00
TrilbySpaceClone
ef4b5c1b34 gone_reduced_to_atoms 2019-09-12 23:06:46 -04:00
Poojawa
8946d6d059 Update preferences_savefile.dm 2019-09-12 19:02:06 -05:00
Poojawa
4289f4c419 Better way of doing the conversions I think 2019-09-12 19:01:39 -05:00
Ghommie
e987eb27b9 Adjusting a few dozen suits' body coverage. 2019-09-12 23:56:50 +02:00
kevinz000
39b840b180 Merge pull request #9278 from deathride58/fuckkeydown 
[s] ports tgstation/tgstation#46425
 2019-09-12 12:10:01 -07:00