shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
32,993 Commits 5 Branches 0 Tags
ddcfcb5cd8fe7bbb8361c2a541cd1908add46296
Commit Graph

45 Commits

Author SHA1 Message Date
Artur
2134515d5c Merge remote-tracking branch 'upstream/master' into tackling_and_lunge 2020-04-15 12:19:37 +03:00
Artur
356f2913d7 Ghommies suggestions and renames a proc 2020-04-14 09:30:14 +03:00
Artur
f910a0fd32 Conflict fixes 2020-04-14 09:27:54 +03:00
Artur
fe755a1424 Tackling Working so far, working on the lunge now 2020-04-09 21:42:00 +03:00
TrilbySpaceClone
b350436fbc working 2020-04-07 18:31:23 -04:00
TrilbySpaceClone
e9d2e798a3 more glasswork 2020-04-07 17:58:23 -04:00
Artur
2cf7a1f6ba Merge remote-tracking branch 'origin/master' into Garlic 2020-04-02 20:41:58 +03:00
kiwedespars
d825a10e58 makes the mask craftable 2020-03-31 01:51:14 -07:00
Artur
6e22438fb5 Whoopsie~ Forgot to rename the recipy 2020-03-25 19:39:19 +02:00
Artur
fdc6a02eea Hm 2020-03-25 12:46:42 +02:00
Ghommie
a2b2e08e31 Fixes crafting hud icon overlapping the second pocket on 1:1 screen mode. 2020-03-24 17:53:53 +01:00
Ghommie
86898cc451 Force pushed updates 2020-03-22 01:43:19 +01:00
Hatterhat
1e10a042be arrow craft nitpicking (alt title: "why are subtypes like this") (#11516) 
* subtypes (tm)

* ok fine jeez

Co-authored-by: Hatterhat <Hatterhat@users.noreply.github.com>
 2020-03-18 19:34:14 +01:00
Detective Google
815844accd corrects sechud requirement. 2020-03-16 01:48:29 -05:00
Detective Google
94f694e568 adds some hudpatches 
seemed like fun flavor, inspired by bay and a request.
 2020-03-16 01:44:26 -05:00
Ghom
1cd9c19b4c Merge pull request #11288 from Trilbyspaceclone/patch-300 
[ready] Craftable Prescription & Sunglasses HUDs
 2020-03-09 00:01:12 +01:00
Ghom
bceed5d002 Update recipes_clothing.dm 2020-03-08 23:46:33 +01:00
Trilbyspaceclone
c2e56f156f Update recipes_weapon_and_ammo.dm 2020-03-06 17:18:10 -05:00
Ghommie
f08d79767b Removes makeshift switchblades 2020-03-02 19:33:31 +01:00
Trilbyspaceclone
9540c47adf Update recipes_clothing.dm 2020-03-02 00:24:36 -05:00
Trilbyspaceclone
c6be46c6bd Update recipes_clothing.dm 2020-03-02 00:22:46 -05:00
Trilbyspaceclone
787edfb2a7 Update recipes_clothing.dm 2020-03-01 08:16:39 -05:00
TrilbySpaceClone
51c675603e ??? 2020-03-01 02:48:13 -05:00
Trilbyspaceclone
65b03d3a4e Update recipes_clothing.dm 2020-03-01 00:32:48 -05: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
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
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
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
TrilbySpaceClone
30c78c5be2 Let their be lists 2020-02-08 02:37:37 -05: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
Artur
8bb0e30036 Initial Commit V3 2020-01-31 18:17:14 +01:00