Commit Graph

1096 Commits

Author SHA1 Message Date
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
Artur
fe755a1424 Tackling Working so far, working on the lunge now 2020-04-09 21:42:00 +03:00
Timothy Teakettle
cfec83b8a2 what if butchering didnt suck! 2020-04-09 18:38:29 +01:00
kevinz000
857716c473 k 2020-04-09 09:30:28 -07:00
kevinz000
e6f98fa270 compile 2020-04-09 09:16:46 -07:00
Timothy Teakettle
7fe5bb71d7 more quality 2020-04-09 16:07:45 +01: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
timothyteakettle
d985ea8c84 more quality 2020-04-09 02:51:32 +01:00
timothyteakettle
bc6294baa9 i too, like food quality. 2020-04-09 01:10:34 +01: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
Artur
fdc6a02eea Hm 2020-03-25 12:46:42 +02:00
monster860
38802fdbf5 hm maybe dont use reserved words for parameter names 2020-03-25 05:54:29 -04:00
monster860
3497307814 Makes so turning in place updates riders when riding someone's back 2020-03-25 05:50:57 -04:00
Ghommie
a2b2e08e31 Fixes crafting hud icon overlapping the second pocket on 1:1 screen mode. 2020-03-24 17:53:53 +01:00
kevinz000
bf0970d8c3 Merge remote-tracking branch 'citadel/master' into shield_refactor 2020-03-23 15:34:04 -07:00
Ghommie
86898cc451 Force pushed updates 2020-03-22 01:43:19 +01:00
kevinz000
300c8e3c6d Merge remote-tracking branch 'citadel/master' into shield_refactor 2020-03-21 09:53:39 -07:00
kevinz000
0e3193e929 relatively small 71 file 700 lines changed refactor/rework to combat mode/sprint and some miscellaneous things that totally aren't important (#11376)
* combat refactoring

* i hate this

* mobility flags part 2 time xd

* whew

* stuff

* a

* ok

* changes

* Wew

* k

* add flags

* FUCKYOUVORE

* fixes

* typo

* no using this in hard stamcrit

* update icon

* woopsy

* . = ..()

* sigh

* Update living_combat.dm

* wew

* wups

* fix

* i hate you

* wrong button

* k

* ok

* bet

* k

* Update code/modules/mob/living/living_combat.dm

Co-Authored-By: Ghom <42542238+Ghommie@users.noreply.github.com>

* Update code/modules/mob/living/living_combat.dm

Co-Authored-By: Ghom <42542238+Ghommie@users.noreply.github.com>

* Update code/modules/mob/living/living_combat.dm

Co-Authored-By: Ghom <42542238+Ghommie@users.noreply.github.com>

* early returns

* skreee

* agony

* k

* k

* k

* k

* wack

* compile

* wack

Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com>
2020-03-21 16:04:26 +01:00
kevinz000
6754b794b1 Merge remote-tracking branch 'citadel/master' into shield_refactor 2020-03-20 22:59:17 -07:00
kevinz000
8b0600a7fa Merge pull request #11527 from Ghommie/Ghommie-cit628
More bug reports yee'd their last haw.
2020-03-19 18:56:32 -07:00
Ghommie
32975bf509 More bug reports yee'd their last haw. 2020-03-18 23:43:23 +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