cyberpresidentvanellope/S.P.L.U.R.T-Station-13
1
0
Fork 0
mirror of https://github.com/SPLURT-Station/S.P.L.U.R.T-Station-13.git synced 2026-01-03 21:54:24 +00:00
Code Issues Packages Projects Releases Wiki Activity
35,842 Commits 55 Branches 0 Tags
80233e52afab5d8f76aa303c0867950b3ae40b51
Commit Graph

846 Commits

Author SHA1 Message Date
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
kevinz000
cbc9f325f4 Merge pull request #11921 from necromanceranne/minor_fix_scarp_stammod 
Sleeping Carp has a Stamina Mod again, gets Taser resistance, various fixes (no more universal pugilism)
 2020-04-20 11:34:06 -07:00
kevinz000
792af56b67 Update riding.dm 2020-04-19 00:48:51 -07:00
Ghom
f714403d6e Merge pull request #11895 from Seris02/piggybackfix 
fixes piggyback merging
 2020-04-19 04:56:04 +02:00
kevinz000
b65ad491b4 Merge pull request #11902 from Citadel-Station-13/revert-11611-patch-2 
Revert "Makes so turning in place updates riders when riding someone's back"
 2020-04-18 19:32:34 -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
Ghom
bd03d2a362 Merge pull request #11908 from Putnam3145/fix-tactical-destroy 
Makes tactical component destroy() work properly.
 2020-04-18 13:32:49 +02:00
Ghom
9b981d0749 Merge pull request #11888 from Citadel-Station-13/kevinz000-patch-9 
fixes closer extending too many rows up
 2020-04-18 13:28:34 +02:00
Artur
edb7b1d61c Fixes catstuffs 2020-04-18 13:52:27 +03:00
Artur
85c5548d1a Ports https://github.com/tgstation/tgstation/pull/50521/ 2020-04-18 13:49:06 +03:00
Seris02
cc82f08ebc weh 2020-04-18 18:28:35 +08:00
Putnam
d361a8d6ae Makes tactical destroy() work properly. 2020-04-17 22:33:11 -07:00
Ghom
2676d663d6 Revert "Makes so turning in place updates riders when riding someone's back" 2020-04-18 03:09:49 +02: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
Seris02
e30bd1f8ea FIXES IT FINALLY OHHHH MY FUCKING GOD WHY IT WAS SO SIMPLE BUT SO HIDDEN FUCK 2020-04-17 17:17:50 +08:00
kevinz000
121b9f0d92 Update ui.dm 2020-04-16 22:57:27 -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
Ghom
19f79f8843 Merge pull request #11611 from monster860/patch-2 
Makes so turning in place updates riders when riding someone's back
 2020-04-16 19:06:10 +02:00
Seris02
b6672e8df4 yes 2020-04-15 17:44:39 +08:00
Artur
2134515d5c Merge remote-tracking branch 'upstream/master' into tackling_and_lunge 2020-04-15 12:19:37 +03:00
Artur
375c62175f Finishing touches, fixes icons 2020-04-15 12:04:25 +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
Ghom
49e36e47ff Merge pull request #11809 from kevinz000/storage_rework 
Adds baystation-style volumetric space storage support
 2020-04-14 13:17:11 +02:00
Ghom
5d01e05991 Merge pull request #11618 from Arturlang/Garlic 
Adds garlic, and tweaks bloodsuckers a bunch.
 2020-04-14 12:38:34 +02:00
kevinz000
e271376c4e Merge pull request #11830 from Ghommie/Ghommie-cit676 
Fixes the phantom thief component, again
 2020-04-14 01:34:18 -07: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
325c011142 Comsigs are hard... 2020-04-14 09:07:37 +03:00
Artur
5f44d37ca0 Its no longer possible to craft multiple things at a time 2020-04-13 23:51:54 +03:00
Ghommie
05a954f000 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit611 2020-04-13 02:01:01 +02:00
Seris02
1b7f34d230 yeet 2020-04-12 16:43:54 +08:00
Ghommie
acb5c39b59 Fixes the phantom thief component for the Xth time. 2020-04-12 07:47:28 +02:00
spookydonut
230e5fca20 fix everything 2020-04-11 15:32:09 +08:00
kevinz000
b21598a441 fix 2020-04-10 12:47:16 -07:00
kevinz000
bf1ffb7ebd Merge branch 'storage_rework' of github.com-kevinz000:kevinz000/Citadel-Station-13 into storage_rework 2020-04-10 12:44:28 -07:00
kevinz000
3788496204 multiline support 2020-04-10 12:42:50 -07:00
Artur
38d1634e13 Weh 2020-04-10 21:07:15 +03:00
Artur
f481be1496 Makin stuff nice and dandy 2020-04-10 20:53:28 +03:00
kevinz000
a02bad15ea Update stack.dm 2020-04-10 04:45:28 -07:00
kevinz000
6705fc9724 Update rped.dm 2020-04-10 04:45:19 -07:00
kevinz000
a9f6ac4131 default to legacy 2020-04-10 04:42:51 -07:00
kevinz000
84c8183ccb k 2020-04-10 04:42:34 -07:00
kevinz000
bc16600070 alternative way 2020-04-10 04:00:59 -07:00