shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
31,111 Commits 5 Branches 0 Tags
4ff63b7791a185c62c1e0e3ef1817e4bf29030f4
Commit Graph
13121 Commits
Author SHA1 Message Date
kevinz000andGitHub 3709992b46 Update reagent_containers.dm 2020-02-24 14:07:58 -07:00
kevinz000andGitHub 77edc602dc Update glass.dm 2020-02-24 13:59:27 -07:00
kevinz000andGitHub d4657df9f5 Update glass.dm 2020-02-24 13:58:51 -07:00
kevinz000andGitHub 1668bc598a Update glass.dm 2020-02-24 13:55:44 -07:00
GhomandGitHub f86e17d945 Merge pull request #11129 from Owai-Seek/movefood-2-16-20 
Reorganize Food Recipes, "Balance" Tweaks
 2020-02-24 20:53:36 +01:00
Putnam feaadffd93 Gave jittering to salbutamol. 2020-02-24 11:23:51 -08:00
GhomandGitHub 9355e9319b Merge pull request #11110 from Hatterhat/hyper-96-aus-unk 
you kids like extend votes?
 2020-02-24 16:39:16 +01:00
Artur 528a226dae Done. 2020-02-24 13:36:55 +02:00
YakumoChenandGitHub 6385445fd5 ruining the joke 2020-02-24 10:31:47 +00:00
YakumoChenandGitHub ff10b70ffe 2cat heating up 2020-02-24 10:20:47 +00:00
YakumoChenandGitHub 7a759f68aa Merge pull request #24 from YakumoChen/master 
k
 2020-02-24 04:58:07 -05:00
YakumoChenandGitHub 96bf8d6969 Update tails.dm 2020-02-24 09:55:39 +00:00
kevinz000andGitHub 8cf41997f5 Merge pull request #11201 from Hatterhat/bows 
really just a lot of shit about bows
 2020-02-24 02:33:54 -07:00
kevinz000andGitHub 43c17b4ab3 Merge pull request #11180 from Detective-Google/psych+paramedic 
Adds epic and also cool paramedics [lazy tg port]
 2020-02-24 02:30:36 -07:00
Detective-GoogleandGitHub 0caed52ca5 removes the epic and cool access and makes it less epic and more cool 2020-02-24 03:28:33 -06:00
kevinz000andGitHub 3e77952652 Merge pull request #11216 from Putnam3145/rename-logging 
[S] Adds rename logging
 2020-02-24 02:27:27 -07:00
kevinz000andGitHub 59074d1174 Merge pull request #11183 from Trilbyspaceclone/patch-291 
Removes more Trek armor.
 2020-02-24 02:27:05 -07:00
kevinz000andGitHub 4fc0ef5e74 Merge pull request #11185 from Trilbyspaceclone/J.A.S.O.N 
Makes all IPC organs look robotic!
 2020-02-24 02:24:06 -07:00
kevinz000andGitHub 493d62c17e Merge pull request #11184 from Trilbyspaceclone/patch-292 
Remember when Kev made IPCs hearts no longer emp? Me ether!
 2020-02-24 02:23:45 -07:00
kevinz000andGitHub 73c03adbbb Merge pull request #11199 from Detective-Google/pai.pai.pai.png 
Lets pAIs hold encryption keys and play music.
 2020-02-24 02:23:17 -07:00
Putnam f7e0eb43f8 Adds rename logging 2020-02-23 22:53:20 -08:00
GhomandGitHub 565fa77cf9 Merge pull request #11162 from Hatterhat/quickpatch-enzyme 
biogen enzyme fix, multitool basic tools node fix
 2020-02-23 22:48:07 +01:00
Winter Flare 4c03d552ee Gettin Salty. Fish is now Seafood. 2020-02-23 16:22:19 -05:00
kevinz000andGitHub ae42db8674 Merge pull request #11210 from Ghommie/Ghommie-cit588 
[s] Fixing an issue with slot machines crashing the server.
 2020-02-23 06:02:13 -07:00
GhomandGitHub 2075147ee9 Merge pull request #11206 from Trilbyspaceclone/patch-294 
Corn dogs now have a sprite
 2020-02-23 13:30:23 +01:00
Ghommie 2b740f9bad [s] Fixing an issue with slot machines crashing the server. 2020-02-23 13:09:21 +01:00
TrilbySpaceClone 845e719ade But what if we did it right? 2020-02-23 01:52:36 -05:00
TrilbyspacecloneandGitHub 2dea3cf15c Gives ash sandstone 2020-02-23 00:53:42 -05:00
TrilbyspacecloneandGitHub 342f1cd4c1 Update snacks_meat.dm 2020-02-22 23:17:30 -05:00
HatterhatandGitHub ba81184fef Merge branch 'master' into quickpatch-enzyme 2020-02-22 18:06:17 -06:00
Winter Flare 60b4c10215 Fish Category, Misc Moves 2020-02-22 19:02:43 -05:00
Hatterhat b89a2314a2 mmm that's compiling i don't like that 2020-02-22 16:17:51 -06:00
GhomandGitHub 0c558f53d9 Merge pull request #11179 from Trilbyspaceclone/patch-290 
AIs now understand dwarf
 2020-02-22 22:49:08 +01:00
Hatterhat 99475488d3 mistake 2020-02-22 15:45:06 -06:00
Hatterhat accc4ce776 grammar shit, silkstring buff, arrow costs, yikes 2020-02-22 15:33:07 -06:00
GhomandGitHub 520f5eab83 Merge pull request #11191 from YakumoChen/beelord 
Beegions
 2020-02-22 22:24:20 +01:00
GhomandGitHub 6f181365c2 Merge pull request #11172 from Trilbyspaceclone/bows! 
Bow corrections.
 2020-02-22 15:53:27 +01:00
GhomandGitHub b7fab93209 Merge pull request #11186 from Putnam3145/fixed-flavor 
Fixed temp flavor text (for real)
 2020-02-22 15:09:58 +01:00
Putnam d328d554ba Reduced copypasta 2020-02-22 02:38:57 -08:00
kevinz000andGitHub 856af1f182 Merge pull request #10848 from Ghommie/Ghommie-cit229 
Porting Floyd Materials: Trying again edition
 2020-02-21 23:28:44 -07:00
Detective Google ca29246878 adds the loudness booster(instruments) and Encryption key slot to pAIs. (lazy tg port 2.) 2020-02-22 00:02:49 -06:00
Ghommie 8fbfd07692 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit229 2020-02-22 00:55:32 +01:00
Putnam 0f9bda8f90 wow okay make it do this instead 2020-02-21 11:53:16 -08:00
Putnam 8e865a5081 Made power increase with raw damage. 2020-02-21 11:37:17 -08:00
YakumoChenandGitHub 418374be06 beegion 2020-02-21 17:56:14 +00:00
GhomandGitHub 42416483e7 Merge pull request #11175 from keronshb/NaniteFixes 
Fixes healing nanites
 2020-02-21 16:46:19 +01:00
Winter Flare d112556ea3 Fix, New Category, file renames. 
Remove Sweets Category
Add Donut Category
Rename recipies_sushi.dm to recipies_eastern_fish.dm (for sorting in the UI)
Rename recipies_pie.dm to recipies_pie_sweets.dm
Remove Onigiri from Misc (It's in Eastern)
 2020-02-21 09:34:13 -05:00
Artur e08c89ce48 Reverts some 2020-02-21 15:10:39 +02:00
Winter Flare 34c8315c2f I forgot to hit save. 2020-02-21 07:26:32 -05:00
Winter Flare 79967b0ac5 Resolving some convos. 
Rename Pastries to Pastry & Sweets
Move all sweets to Pastry & Sweets
Revert Weight Class Changes
Add Whitelist to trays. Glasswear, Drinks, Foods, Kitchen Items, ect.
Move Brioche Cake item/recipe
Move Scotch Egg item/recipe
 2020-02-21 07:16:39 -05:00