Commit Graph

668 Commits

Author SHA1 Message Date
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
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
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
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
kevinz000
121b9f0d92 Update ui.dm 2020-04-16 22:57:27 -07: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
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
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
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