kevinz000
|
7828c4a5ab
|
Merge pull request #12102 from Ghommie/Ghommie-cit722
Removing cargo "paperwork" and a few other bloat packs.
|
2020-05-07 09:11:45 -07:00 |
|
Ghommie
|
65899bf906
|
Removing cargo "paperwork" and a few other bloat packs.
|
2020-05-03 19:56:00 +02:00 |
|
Lin
|
f659c036ef
|
Merge pull request #12036 from kevinz000/electrochromatic_windows
Electrochromatic (dim-on-demand) windows
|
2020-05-02 19:13:29 +00:00 |
|
TrilbySpaceClone
|
1191268430
|
kevs request
|
2020-04-27 07:34:23 -04:00 |
|
kevinz000
|
28da033111
|
fine
|
2020-04-26 17:37:27 -07:00 |
|
kevinz000
|
bf7962d8f9
|
wow lotsa effort huh
|
2020-04-26 03:36:09 -07:00 |
|
kevinz000
|
af3651172c
|
wow lotsa effort huh
|
2020-04-26 03:29:31 -07:00 |
|
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
|
747e27007f
|
***ahhhh***
|
2020-04-20 17:26:22 -04:00 |
|
TrilbySpaceClone
|
4d55f169d5
|
oh god oh fuck
|
2020-04-20 17:05:03 -04:00 |
|
Timothy Teakettle
|
c5b8c45bf0
|
Merge branch 'master' into food-quality
|
2020-04-20 19:53:39 +01: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
|
42bb01057f
|
now with working code!
|
2020-04-18 10:09:15 -04:00 |
|
TrilbySpaceClone
|
8ca7bb7535
|
Right...
|
2020-04-18 09:46:56 -04:00 |
|
Timothy Teakettle
|
cd25a7c145
|
Merge branch 'master' into food-quality
|
2020-04-17 15:03:44 +01:00 |
|
Artur
|
eafc69aa65
|
Reviewer suggestion, reduces paralyze
And ports that commit that ghommie said
|
2020-04-17 16:22:15 +03:00 |
|
kevinz000
|
3c4c67b6c5
|
Merge pull request #11869 from necromanceranne/pawnch_updaties
Pawnch Update 2.5: I swear this will be the last one for a while. + some slight fixes
|
2020-04-17 05:43:49 -07:00 |
|
timothyteakettle
|
a4cc54781f
|
implements isfood helper
|
2020-04-17 01:45:15 +01:00 |
|
Ghom
|
e511deabcf
|
Merge pull request #11844 from Arturlang/crafting_fixes
Its no longer possible to craft multiple things at a time
|
2020-04-16 19:08:09 +02:00 |
|
Artur
|
2134515d5c
|
Merge remote-tracking branch 'upstream/master' into tackling_and_lunge
|
2020-04-15 12:19:37 +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 |
|
Artur
|
5f44d37ca0
|
Its no longer possible to craft multiple things at a time
|
2020-04-13 23:51:54 +03:00 |
|
Artur
|
fe755a1424
|
Tackling Working so far, working on the lunge now
|
2020-04-09 21:42:00 +03:00 |
|
timothyteakettle
|
bc6294baa9
|
i too, like food quality.
|
2020-04-09 01:10:34 +01: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 |
|