shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
25,836 Commits 5 Branches 0 Tags
6d6cc93e50ed1ab15fa4040739f64efef7eec6a0
Commit Graph

450 Commits

Author SHA1 Message Date
kevinz000
4c89b8c33f Merge pull request #9628 from Trilbyspaceclone/Cargo_MKII 
[Ready] [Testmerge] MK II Cargo Rework - Sell harder edition
 2019-11-14 16:00:45 -07:00
kevinz000
2f4562a63b Merge pull request #9656 from Ghommie/Ghommie-cit290 
Purging a lot of space indention in favor of tabs.
 2019-11-14 15:55:04 -07:00
kevinz000
d15a1b0e6b Merge pull request #9680 from Owai-Seek/extendedbounties 
Reworked a bit of bounty stuff.
 2019-11-14 15:53:07 -07:00
TrilbySpaceClone
ec57e28c17 Merge branch 'master' into Cargo_MKII 2019-11-13 08:00:24 -05:00
Ghommie
e977ba6729 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit290 2019-11-10 23:17:58 +01:00
Ghommie
a650e1e411 Ports "Renames is_hot and is_sharp to get_temperature and get_sharpness" 2019-11-05 05:37:28 +01:00
TrilbySpaceClone
82b148b7b7 Merge branch 'master' into Cargo_MKII 2019-11-03 17:53:06 -05:00
TrilbySpaceClone
bd4501e11c the last touches? 2019-11-03 17:26:28 -05:00
TrilbySpaceClone
a8248c68f4 perhaps 2019-11-03 12:53:02 -05:00
TrilbySpaceClone
5c4cd15762 Hmm 2019-11-03 11:05:45 -05:00
Winter Flare
7a9f48302d Reworked a bit of bounty stuff. 2019-11-01 01:38:27 -04:00
Ghommie
6cf35a67b1 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit290 2019-10-31 23:17:39 +01:00
Ghommie
a5b37b658b Purging a lot of space indention in favor of tabs. 2019-10-29 15:46:31 +01:00
Ghommie
3b51c3c5be Fixing invisible blackberry n strawberry chocolate cake slices. 2019-10-28 18:20:58 +01:00
Ghommie
e1928a18f1 Porting GetComponent macros removal, and some related changes. 2019-10-23 15:04:28 +02:00
Thalpy
564c1fde9f Merge branch 'master' into Reagents_bitflats 2019-10-08 07:31:03 +01:00
Thalpy
27c2c89766 Merge branch 'master' into Reagents_bitflats 2019-10-05 23:43:19 +01:00
Fermi
89f3a01bc0 Merge branch 'master' into tg-Organ-port 2019-10-01 06:17:58 +01:00
TrilbySpaceClone
41fbb759b2 Merge branch 'master' into more_cooking2 2019-09-25 14:56:11 -04:00
Fermi
9b2f67d67d reagent_flags is used elsewhere, renamed to chemical_flags 2019-09-20 19:43:37 +01:00
Thalpy
79011190c1 Merge branch 'master' into tg-Organ-port 2019-09-19 21:26:42 +01:00
Fermi
08eeda97f5 Heck 2019-09-19 01:45:21 +01:00
Fermi
587568bf88 Merge branch 'master' into tg-Organ-port 2019-09-19 01:33:15 +01:00
Fermi
dfa40a4b22 tg Code complete, now to bugtest and clear compile errors. 2019-09-18 23:57:21 +01:00
Fermi
c23d6f0113 I missed an earlier port. 2019-09-17 01:08:37 +01: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
Trilbyspaceclone
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
kevinz000
4494f42155 Merge pull request #9270 from Linzolle/reallyguys 
fixes donuts being uncraftable
 2019-09-13 10:40:21 -07: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
Thalpy
f50e84a20c Merge branch 'master' into NeuroFix 2019-09-11 16:24:00 +01:00
kevinz000
ff0c3ee844 Merge pull request #9147 from Code-Cygnet/The-Art-of-Drunken-Captaining 
The art of drunken captaining
 2019-09-10 22:06:36 -07:00
Linzolle
6cc92da914 bruh 2019-09-09 18:02:23 -05:00
Trilbyspaceclone
7476f117da pie 2019-09-03 10:45:33 -04:00
Trilbyspaceclone
8394f2f1c7 grammer 2019-09-03 10:44:59 -04:00
Trilbyspaceclone
1256d9382e complie 2019-08-29 21:07:57 -04:00
TrilbySpaceClone
d3852ebd56 even more 2019-08-29 19:39:10 -04:00
Fermi
a5b8a56f9a Realised it was impossible. 2019-08-29 00:32:05 +01:00
Fermi
124d8503dc Tests and fixes. 2019-08-29 00:12:16 +01:00
TrilbySpaceClone
4878510c2b Fixes that make this complie 2019-08-24 19:46:51 -04:00
TrilbySpaceClone
db317b65af Grand! 2019-08-24 19:39:15 -04:00
TrilbySpaceClone
044ef51dfa Relies on a PR 2019-08-20 18:32:39 -04:00
Code-Cygnet
d6c9daa4eb Update drinks_recipes.dm 
Fixed more errors, spelling and id errors to be exact with the help of Papa Pax :D.
 2019-08-19 16:04:16 -04:00
Code-Cygnet
e7d08d1fed Update drinks_recipes.dm 
Fixed error at line 803, allies_cocktail to alliescocktail. Am bone-head :(.
 2019-08-19 15:53:13 -04:00
TrilbySpaceClone
6c6391b4c4 Merge branch 'master' into fruit 2019-08-19 07:37:12 -04:00
TrilbySpaceClone
566a4e65a1 right crafting 2019-08-18 01:31:38 -04:00
Code-Cygnet
4b6b2cf195 Adds new drink to drink recipes 
It's a drink for Captains
 2019-08-17 01:37:28 -04:00
Fermi
e30f72067e Merge branch 'master' into NeuroFix 2019-08-12 00:00:28 +01:00
TrilbySpaceClone
821463f59c Nya 2019-08-11 11:47:56 -04:00
BlackMajor
5dcd419d8a Merge pull request #8356 from Thalpy/master 
[READY] FermiChem! Adds a new reaction mechanic, 9 new chems and a few extra features to accommodate the new chems.
 2019-08-11 16:09:23 +12:00