Commit Graph

38 Commits

Author SHA1 Message Date
Ghom
5a6a205b9d Merge pull request #11868 from Arturlang/tackling_and_lunge
Ports TG Tackling and uses it to rework bloodsucker lunge
2020-04-21 15:50:44 +02:00
Ghom
79eb0f5838 Merge pull request #11956 from Trilbyspaceclone/crafting_menu
Fixes Crafting menu
2020-04-21 01:25:46 +02:00
TrilbySpaceClone
c3fc133282 *crys* 2020-04-20 18:28:57 -04:00
TrilbySpaceClone
58cb5e391e *scream* 2020-04-20 18:22:13 -04:00
TrilbySpaceClone
4d55f169d5 oh god oh fuck 2020-04-20 17:05:03 -04:00
kevinz000
85fcdbf673 Merge pull request #11916 from Trilbyspaceclone/crafting_menu
Cleans up misc tab in the crafting menu
2020-04-20 11:37:13 -07:00
necromanceranne
cb39ba3491 Replaces the Scarp stamina mod, adds tased resistance which I forgot to do for almost a month even though I kind of made it with scarp in mind, fixes the capitalization of armwraps 2020-04-19 04:25:41 +10:00
TrilbySpaceClone
8ca7bb7535 Right... 2020-04-18 09:46:56 -04:00
Artur
eafc69aa65 Reviewer suggestion, reduces paralyze
And ports that commit that ghommie said
2020-04-17 16:22:15 +03:00
necromanceranne
d0d766efb5 Some balance alterations to make pugilism actually worth a damn, lets you craft armwraps (magic ones too if you want to go to the effort), and also buffs some stamina damage on various martial arts 2020-04-15 19:00:01 +10: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
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
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
Hatterhat
094b92e58b silk, time, rods 2020-02-23 13:12:25 -06:00
Hatterhat
accc4ce776 grammar shit, silkstring buff, arrow costs, yikes 2020-02-22 15:33:07 -06: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
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
TrilbySpaceClone
30c78c5be2 Let their be lists 2020-02-08 02:37:37 -05:00
Artur
8bb0e30036 Initial Commit V3 2020-01-31 18:17:14 +01:00