shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
30,967 Commits 5 Branches 0 Tags
e39d7fa49d041d227ceb298d399d9beff00a046e
Commit Graph

556 Commits

Author SHA1 Message Date
Ghommie
fc76cd9a9b Porting update_icon improvements. Part 1. 2020-02-27 01:21:03 +01:00
Ghom
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
Winter Flare
4c03d552ee Gettin Salty. Fish is now Seafood. 2020-02-23 16:22:19 -05:00
Hatterhat
094b92e58b silk, time, rods 2020-02-23 13:12:25 -06:00
Winter Flare
60b4c10215 Fish Category, Misc Moves 2020-02-22 19:02:43 -05:00
Hatterhat
accc4ce776 grammar shit, silkstring buff, arrow costs, yikes 2020-02-22 15:33:07 -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
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
kevinz000
ca777c6c8b Merge pull request #11153 from Ghommie/Ghommie-cit587 
Fixing addiction moodlets not going away and secret sauce recipe paper.
 2020-02-20 06:17:33 -07:00
Ghom
d680ab9fd5 Merge pull request #11025 from Arturlang/TGUI_Next_Nanites 
Ports TGUI Next and a lot of misc updates for nanites.
 2020-02-20 11:27:48 +01:00
Arturlang
796f51b557 Merge branch 'master' into TGUI_Next_Nanites 2020-02-20 00:52:55 +02:00
Ghom
eb342d1591 Update mood.dm 2020-02-19 17:14:30 +01:00
Ghommie
ee1f61b5de F 2020-02-19 14:26:11 +01:00
Ghommie
057b6f591c HEEY 2020-02-19 14:23:12 +01:00
Winter Flare
00d66c9b91 Renamed CAT_FISH to CAT_EASTERN 2020-02-18 22:19:58 -05:00
Winter Flare
c97111beda Reorganise Food + Balance Tweaks 
-Reorganised -ALL- foods in the crafting menu.
-Made a section for Eastern Dishes, Mexican Dishes, and Sweets
-Made Bowls, Salads, Soups, Eggs Benedict, and Omelettes normal sized.
-Moved Easter Recipies to the food files, fixing it in the process.
-Capitalised a few things.
 2020-02-17 05:32:03 -05:00
TrilbySpaceClone
a1f1a01a81 grammer and quiver 2020-02-15 00:52:19 -05:00
TrilbySpaceClone
bbe1ddc0cf silk, bows, and graytide! 2020-02-14 23:04:02 -05:00
Ghom
b0d85c4aea Merge pull request #11070 from Citadel-Station-13/kevinz000-patch-18 
ghosts can not force re rendering of storage to a different size
 2020-02-14 19:22:05 +01:00
Ghom
64882b8a90 Merge pull request #10993 from Linzolle/bows 
adds the bow
 2020-02-14 08:01:12 +01:00
Linzolle
790b7bf9cc sanity check 2020-02-13 15:20:01 -06:00
Linzolle
083a6e4c19 runtime? 2020-02-13 13:29:07 -06:00
Linzolle
9a87087378 message unnecessary 2020-02-13 13:26:19 -06:00
Linzolle
f890317810 maybe this will work 2020-02-13 13:02:51 -06:00
Linzolle
d22631700c update the fucking craft component because artur forgot to 2020-02-13 12:59:56 -06:00
Artur
7964d768fa Initial Commit 2020-02-13 20:51:52 +02:00
Artur
c01f78b8e8 Conflict fix 2020-02-13 17:52:28 +02:00
Artur
8c37cfef24 Should work now 2020-02-13 15:26:18 +02:00
kevinz000
87097fb059 Update storage.dm 2020-02-13 05:30:44 -07:00
kevinz000
3aa3fc3614 Update storage.dm 2020-02-13 05:15:19 -07:00
Artur
21ce2242ac Conflict fix 2020-02-12 16:21:29 +02:00
Artur
a9a167b9d3 Suffering and co 2020-02-11 20:18:32 +02:00
Artur
8e50c278bb Rebuild and misc nuke tweak 2020-02-10 17:34:14 +01:00
Ghom
c7614958bc Merge pull request #10937 from Arturlang/debug_outfit_updates 
Updates the debug outfit
 2020-02-09 22:49:22 +01:00
TrilbySpaceClone
30c78c5be2 Let their be lists 2020-02-08 02:37:37 -05:00
Artur
c9dc35fd9a Updates the debug outfit 2020-02-06 18:42:23 +01:00
Artur
f0b22a119d Interface routing and modifying uplink component 2020-02-05 20:03:36 +01:00
kevinz000
a45038d214 Update pockets.dm 2020-02-05 03:31:55 -07:00
Ghommie
5dc1de1d04 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit229 2020-02-05 04:34:54 +01:00
Artur
614a44ea18 Merge remote-tracking branch 'upstream/master' into TGUI_Next_Crafting 2020-02-04 13:11:02 +01:00
Artur
ed60724a8e Whoops 2020-02-04 12:13:14 +01:00
Artur
0391513220 Works now 2020-02-04 12:05:15 +01:00
Artur
4bd916d08a Adds the initial crafting UI stuff. 2020-02-04 10:28:53 +01:00
Ghommie
a726f09201 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit229 2020-02-04 03:54:52 +01:00
Ghom
40f7a72e3c Update slippery.dm 2020-02-03 20:32:50 +01:00
Ghom
3cb1a0e9c8 Update slippery.dm 2020-02-03 20:31:57 +01:00
Artur
e7ddfdd8d8 Merge remote-tracking branch 'upstream/master' into TGUIs_Nexties 2020-02-02 13:31:54 +01:00
kevinz000
66a2216ef3 Merge pull request #10829 from Ghommie/Ghommie-cit544 
Fixed and brutalized clown op slippery weapons a little.
 2020-02-02 03:16:23 -07:00
Ghommie
55fa48737e Forgot about not versioned files. 2020-02-02 01:28:16 +01:00
Ghommie
95db5084ab Screw commit history. 2020-02-02 01:26:04 +01:00