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 2025-12-11 10:22:13 +00:00
Code Issues Packages Projects Releases Wiki Activity
32,971 Commits 55 Branches 0 Tags
d0d766efb58091e02decaa0c73a9ebe9c29b20c6
Commit Graph

656 Commits

Author SHA1 Message Date
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
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
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
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
kevinz000
165379c0b8 storage 2020-04-10 02:19:19 -07:00
kevinz000
36cd3b4c35 i should have just ported from baystation instead of reinventing the fricking wheel 2020-04-10 01:23:36 -07:00
kevinz000
e2440034f5 matrices.. 2020-04-10 01:07:53 -07:00
kevinz000
d658a0c1d4 k 2020-04-10 00:21:40 -07:00
kevinz000
be398004b7 groan 2020-04-10 00:16:43 -07:00
kevinz000
a9e738b8b1 k 2020-04-09 23:14:07 -07:00
kevinz000
9b13f009fe k 2020-04-09 23:12:37 -07:00
kevinz000
ffe206f3e1 k 2020-04-09 22:33:54 -07:00
kevinz000
00ebd842b8 k 2020-04-09 22:17:42 -07:00
kevinz000
a559fef230 runtime 2020-04-09 22:12:39 -07:00
kevinz000
0a67f5c6ea compile 2020-04-09 21:30:42 -07:00
kevinz000
857716c473 k 2020-04-09 09:30:28 -07:00
kevinz000
e6f98fa270 compile 2020-04-09 09:16:46 -07:00
kevinz000
e3c6ebb81e compile 2020-04-09 02:54:29 -07:00
kevinz000
a888c7c29a continue 2020-04-09 02:52:32 -07:00
kevinz000
f60cf32562 Merge pull request #11775 from Trilbyspaceclone/frail-crafting 
Frail crafting - Glass work additions and changes!
 2020-04-09 02:41:01 -07:00
kevinz000
a071a5f2f6 ok 2020-04-08 01:05:09 -07:00
kevinz000
33aa16bfcf ok 2020-04-08 01:04:56 -07:00
kevinz000
5c53314ee3 cancel 2020-04-08 00:57:09 -07:00
kevinz000
7ec669ecd4 bet 2020-04-07 16:11:58 -07:00
TrilbySpaceClone
b350436fbc working 2020-04-07 18:31:23 -04:00
TrilbySpaceClone
e9d2e798a3 more glasswork 2020-04-07 17:58:23 -04:00
Lin
8379169b81 Merge pull request #11476 from kevinz000/shield_refactor 
Completely overhauls how blocking, shields, reflecting, and anything in between is handled. Has some small gameplay effects.
 2020-04-07 20:47:15 +00:00
kevinz000
0d0ee1cd46 Merge remote-tracking branch 'citadel/master' into storage_rework 2020-04-06 18:40:58 -07:00
kevinz000
154e145e25 storage 2020-04-06 18:40:20 -07:00
Timothy Teakettle
aabcfb580b discounts rerolling is bad 2020-04-06 19:49:06 +01:00
Timothy Teakettle
864f9b3244 except this times its in the right order 2020-04-06 18:59:48 +01:00
Timothy Teakettle
e8002ee449 imagine if it compiled and was less bad 2020-04-06 17:45:19 +01:00
Timothy Teakettle
3b322b9f7c population locked uplink items use current population 
yay?
 2020-04-06 17:34:34 +01: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
kevinz000
0f4444b567 Nerfs piggyback and fireman carrying (#11555) 
* ok

* daze duration increased, MOBILITY_USE now has.. a use.

* k

* @ghommie
 2020-03-25 21:16:35 +01:00
Artur
6e22438fb5 Whoopsie~ Forgot to rename the recipy 2020-03-25 19:39:19 +02:00