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

413 Commits

Author SHA1 Message Date
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
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
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
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
TrilbySpaceClone
ab13b62bdd fruits of labor 2019-08-08 16:14:04 -04:00
Thalpy
5795f6bbe2 Merge branch 'master' into master 2019-08-05 09:09:36 +01:00
kevinz000
9ec56077b6 Merge pull request #8908 from Ghommie/Ghommie-cit142 
Fixes Zelus flasks a bit.
 2019-08-05 00:54:43 -07:00
kevinz000
2654a5388e Merge pull request #9024 from Ghommie/Ghommie-cit176 
Ports "Lizardwine drink crafting fix"
 2019-08-04 19:22:52 -07:00
kevinz000
7a3d895997 Merge pull request #9040 from Trilbyspaceclone/cooking_101_Cakes 
Tweaks cakes, adds in more of them as well as a few more tarts - All hidden
 2019-08-04 19:15:18 -07:00
kevinz000
e04547b838 Merge pull request #9015 from Trilbyspaceclone/patch-203 
fixes a few snowcones being bad grammared
 2019-08-04 19:13:44 -07:00
TrilbySpaceClone
3a85f9473c amazing 2019-08-02 14:37:52 -04:00
Ghommie
a9b16701a1 Ports "Lizardwine drink crafting fix" 2019-08-01 00:31:14 +02:00
Trilbyspaceclone
c68fb90955 Update snacks_cake.dm 2019-07-31 12:03:56 -04:00
Trilbyspaceclone
ef6be90435 Update recipes_frozen.dm 2019-07-31 11:42:20 -04:00
Trilbyspaceclone
3dca4dd379 Update snacks_frozen.dm 2019-07-31 11:35:19 -04:00
Ghommie
57d5ddb80f removed extra broken bottle strength. 2019-07-21 12:20:10 +02:00
Thalpy
15ab1a26a4 Merge branch 'master' into master 2019-07-21 01:50:41 +01:00
kevinz000
66ddaf3ae8 Merge pull request #8903 from Trilbyspaceclone/patch-192 
Re-words brass flasks to not be wrong
 2019-07-20 11:59:30 -07:00
kevinz000
70d7ebbb45 Merge pull request #8881 from Ghommie/Ghommie-cit134 
Fixing a reagent ID typo.
 2019-07-17 14:44:54 -07:00
Trilbyspaceclone
bc158f4fd8 Update code/modules/food_and_drinks/drinks/drinks/bottle.dm 
weh

Co-Authored-By: Ghom <42542238+Ghommie@users.noreply.github.com>
 2019-07-17 16:39:14 -04:00
Ghommie
9f6a3f428c last bit. 2019-07-16 16:15:31 +02:00
Ghommie
0d1988b6be More fixes. 2019-07-16 16:10:16 +02:00
Ghommie
75a8cbcc39 Makes Zelus flasks a subtype of bottle. 2019-07-16 15:39:30 +02:00
Trilbyspaceclone
4c971ea012 from afar 2019-07-15 22:12:20 -04:00
Trilbyspaceclone
3422dad9ec Update bottle.dm 2019-07-15 17:07:53 -04:00
Thalpy
9c7b1dee97 Merge branch 'master' into master 2019-07-15 21:23:04 +01:00
Thalpy
4c4dbd0e17 Merge branch 'master' into master 2019-07-13 19:33:46 +01:00
Ghommie
129ca9d71f Ports "Refactors NODROP flag into TRAIT_NODROP" 2019-07-13 10:27:39 +02:00
Ghommie
b7c8909a18 Fixing a reagent ID typo. 2019-07-13 02:12:01 +02:00
kevinz000
280aa9da08 Merge pull request #8860 from Trilbyspaceclone/Zelus_oil 
Zelus oil - CWC gear
 2019-07-12 07:41:28 -07:00
kevinz000
c76f6b8a54 Merge pull request #8862 from BlackMajor/Burgit-Branch-2 
Admin cream pie smite no longer makes its victims fat
 2019-07-11 04:57:50 -07:00
Trilbyspaceclone
d53d11de6b Apply suggestions from code review 
Grammer and such

Co-Authored-By: Ghom <42542238+Ghommie@users.noreply.github.com>
 2019-07-10 18:21:03 -04:00
BlackMajor
2717590e9f No more fat smites 2019-07-10 21:01:41 +12:00
TrilbySpaceClone
54c28b19af Zelus indeed 2019-07-10 02:29:42 -04:00
Thalpy
c418312cc6 Merge branch 'master' into master 2019-07-09 05:33:09 +01:00
deathride58
42cee552fe Merge pull request #8709 from Trilbyspaceclone/Fel_port_1 
Ports "Fixes every issue in the slimes milestone. #44450"
 2019-07-08 18:10:46 -04:00
Thalpy
cc39c9f896 Merge branch 'master' into master 2019-07-06 16:03:17 +01:00
Ghommie
3c2e03c247 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit58 2019-07-04 23:46:04 +02:00
Thalpy
8a6e669060 Merge branch 'master' into master 2019-07-04 03:14:29 +01:00
kevinz000
bce4ce31ab Merge pull request #8778 from Ghommie/Ghommie-cit97 
Porting in 18 new drinks from the TGstation, plus tweaking and fixes.
 2019-07-03 13:47:04 -07:00