shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
24,411 Commits 5 Branches 0 Tags
2ddb69a135b75ee3be7d05caecfe9b0a62ff02c2
Commit Graph
1540 Commits
Author SHA1 Message Date
deathride58andGitHub af39f679a7 Merge pull request #9489 from Ghommie/Ghommie-cit232 
Ports slighty improved drink sprites
 2019-10-15 06:17:39 -04:00
Ghommie 22fc7a9088 Resprites bedsheet bins in 3/4 perspective, adds towel bins subtype. 2019-10-14 02:32:23 +02:00
Ghommie e65e11b2f6 Ports "drinksprites" 2019-10-14 00:25:38 +02:00
kevinz000andGitHub 0643a7b230 Merge pull request #9387 from Sishen1542/goose 
the geese have been unleased
 2019-10-11 12:11:50 -07:00
kevinz000andGitHub b0b274762c Merge pull request #9441 from lolman360/whydowehave1000branches 
Ports /tg/ advanced surgerytools and tool defines.
 2019-10-11 12:10:31 -07:00
kevinz000andGitHub 3e6415d4b5 Merge pull request #9324 from Linzolle/crusher 
Ports "Adds toggleable light and blinking charging light to crusher" and "Lets the kinetic crusher be one-hand carried"
 2019-10-10 02:23:15 -07:00
kevinz000andGitHub fda64df569 Merge pull request #9257 from Thalpy/Blind-quirk-without-anger 
[READY] Blind quirk without anger
 2019-10-10 02:19:17 -07:00
lolman360 04521551f0 one commit wonder 2019-10-08 19:46:28 +11:00
kevinz000andGitHub 1d7deedd34 Merge pull request #9389 from Weblure/beepsky-animation-port 
Ports Beepsky Animations
 2019-10-08 00:38:16 -07:00
kevinz000andGitHub 143e8c4186 Merge pull request #9404 from Poojawa/qm-is-a-head 
QM is a head of staff, Cargo ID Console added
 2019-10-08 00:34:07 -07:00
kevinz000andGitHub 6fc746a5af Merge pull request #9226 from Trilbyspaceclone/unmodular_2 
Unmodulars a few things + new sprite + new welder tank(unused
 2019-10-08 00:30:54 -07:00
kevinz000andGitHub 06e312b208 Merge pull request #9032 from Ghommie/Ghommie-cit178 
Ports plasmaman departmental envirosuits and tweaks.
 2019-10-08 00:28:06 -07:00
Ghommie d9ff93fdff consistency 2019-10-07 22:13:21 +02:00
Ghommie 99e9280eaf Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit178 2019-10-07 21:41:04 +02:00
Poojawa 6d9aa8de70 More carpet options and ways to get them 2019-10-03 22:54:10 -05:00
Poojawa 27b26978be Quartermaster is a head of staff 
Suck it, non believers.
 2019-10-03 19:13:56 -05:00
kevinz000andGitHub 1aac0942e9 Merge pull request #9373 from Trilbyspaceclone/beepalm 
Beebalm and Honeybalm plants
 2019-10-02 00:02:05 -07:00
Sishen f3d373a6b8 loose goose 
honk honk
 2019-10-02 02:27:30 -04:00
WeblureandGitHub 2fa8f8955a Ports Beepsky Animations 2019-10-01 23:24:03 -07:00
deathride58andGitHub 35b54f9b53 Merge pull request #9376 from Citadel-Station-13/flightgoggles 
Flight Goggles - Donator
 2019-10-01 13:43:06 -04:00
FermiandFermi 4b6d996416 Merge branch 'master' into Blind-quirk-without-anger 2019-10-01 08:41:12 +01:00
kevinz000andGitHub 250c6ed986 Merge pull request #9367 from Poojawa/totally-radical 
Totally RADical. Rad levels for Medhud, radiation flags added to storage, suits.
 2019-10-01 00:12:32 -07:00
Jay e0b8d28386 donator item 2019-09-30 22:16:27 -05:00
TrilbySpaceClone 3f893195bf tested! 2019-09-30 11:42:07 -04:00
kevinz000andGitHub 8d9520ee58 Merge pull request #9336 from Thalpy/beakerpH_tweaks 
Tweaks how beakers melt in response to poll and feedback. Allows syringe/dropper use on beakers in heaters.
 2019-09-28 00:26:51 -07:00
kevinz000andGitHub 5562db4ed4 Merge pull request #8914 from Ghommie/Ghommie-cit147 
Updating spraycans and crayons.
 2019-09-28 00:20:42 -07:00
FermiandFermi 3f7c657111 Plate and pH (pHlate) 2019-09-27 12:01:03 +01:00
FermiandFermi 146219edf9 Merge branch 'master' into beakerpH_tweaks 2019-09-27 11:50:31 +01:00
nik707andGitHub 3f1f234686 Merge pull request #9170 from Trilbyspaceclone/more_cooking2 
Makes peaches used in crafting a lot more, grammer fixes and new icecreams and floats - Remakes charrie shakes into icecreams rather then drinks
 2019-09-26 23:54:17 -05:00
TrilbySpaceClone 41fbb759b2 Merge branch 'master' into more_cooking2 2019-09-25 14:56:11 -04:00
FermiandFermi 00a46fe971 Missed a beaker 2019-09-22 03:03:33 +01:00
FermiandFermi f301a85cdd Bucket lip 2019-09-22 02:59:08 +01:00
FermiandFermi a48c881a8c Sprites. 2019-09-22 02:58:23 +01:00
FermiandFermi 0dcdede8fa In response to poll and feedback. 2019-09-22 02:28:59 +01:00
Ghommie 293d0f02c9 Fixes clown shoes icon_state. 2019-09-21 22:06:40 +02:00
TrilbySpaceClone 45a5b4974d Merge branch 'master' into unmodular_2 2019-09-21 06:21:06 -04:00
kevinz000andGitHub 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
kevinz000andGitHub 5c8e585010 Merge pull request #9292 from Ghommie/Ghommie-cit94 
Fixes clown shoes and work boots.
 2019-09-21 01:42:03 -07:00
kevinz000andGitHub 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
Linzolle 8bc8a0e440 fix shit 2019-09-20 18:25:36 -05:00
skoglolandLinzolle c1e84774ac one-hand shit 2019-09-20 17:28:44 -05:00
kevinz000andGitHub 9108c1ce89 Merge pull request #9203 from Trilbyspaceclone/fancy 
Makes brass tools look better*
 2019-09-20 12:09:33 -07:00
Ghommie 277f031143 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit147 2019-09-20 02:27:39 +02:00
TrilbySpaceClone 5ecf68918b tada 2019-09-18 03:47:52 -04:00
Ghommie 300c572886 Added work boots and bananium clown shoes inhands, more fixes. ready. 2019-09-15 18:21:48 +02: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 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
TrilbyspacecloneandGitHub 5b2dba354a Merge branch 'master' into fruit 2019-09-13 14:00:11 -04: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
Poojawa 94afbbd560 Adding Horn colors, multiple-select legs, and species squash 
Moths -> Insects. Avians & Aquatics into Mammal -> Anthromorphics. Modular Citadel sprite accessories decommissioned and sorted to my liking.  Sprites tweaked on a bunch of critters. Added new wings....
 2019-09-11 17:46:17 -05:00