shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
32,485 Commits 5 Branches 0 Tags
0f15b0ce841aeb2b7ce46bbd0159989fdb26ae1a
Commit Graph

129 Commits

Author SHA1 Message Date
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
1bb0c01ff1 Hypereutactic blade properly slows you down again, adds set_slowdown() and hooks vv_edit_var for it (#11553) 
* ok

* Update items.dm
 2020-03-21 02:42:02 +01:00
necromanceranne
5eb93eaa56 And these too 2020-03-17 02:49:27 +11:00
necromanceranne
b5872bba63 Pretty sure this should now use the correct sprites 2020-03-17 02:43:44 +11:00
kevinz000
87928d43ea stamcrit check for fireaxe afterattack() (#11426) 
* Update twohanded.dm

* Update twohanded.dm
 2020-03-12 14:21:47 +01:00
kevinz000
0b6c5b7960 Update twohanded.dm 2020-03-11 18:19:09 -07:00
Ghom
7a2e0892d3 Merge pull request #11277 from kevinz000/sword_point 
En garde! (nah just sword pointing)
 2020-03-04 17:11:39 +01:00
Ghom
0b74bc9da3 Update twohanded.dm 2020-03-04 16:43:57 +01:00
kevinz000
18bdb753d3 bet 2020-03-03 21:13:59 -07:00
Lin
d32cc370ad Merge pull request #11177 from Citadel-Station-13/Ghommie-patch-1 
Broom shenanigeans.
 2020-02-29 00:22:24 -06:00
kevinz000
ba55351e4a Update twohanded.dm 2020-02-28 13:43:11 -07:00
kevinz000
93d91b1808 Merge remote-tracking branch 'citadel/master' into sword_point 2020-02-28 13:39:56 -07:00
kevinz000
8ef68fa36b En garde! 2020-02-28 13:35:41 -07:00
kevinz000
e39d7fa49d Merge pull request #11259 from Ghommie/Ghommie-cit590 
Porting update_icon improvements.
 2020-02-28 04:30:12 -07:00
Ghommie
fc76cd9a9b Porting update_icon improvements. Part 1. 2020-02-27 01:21:03 +01:00
kevinz000
626cf886d6 Update twohanded.dm 2020-02-26 05:31:47 -07:00
kevinz000
00c70acee9 Target wew 2020-02-24 13:20:12 -07:00
kevinz000
26b908f53d thonk 2020-02-24 13:19:38 -07:00
kevinz000
90d7fd81b1 k 2020-02-24 13:17:08 -07:00
kevinz000
fa9e275237 k 2020-02-24 13:16:12 -07:00
kevinz000
59e95555bb Merge remote-tracking branch 'citadel/master' into staves 2020-02-24 13:09:45 -07:00
Ghommie
8fbfd07692 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit229 2020-02-22 00:55:32 +01:00
Ghom
d38c2bc6c0 Update twohanded.dm 2020-02-21 02:20:38 +01:00
Ghom
26bbc64f16 Merge pull request #11136 from Owai-Seek/broomport-2-17-19 
Ports Broom, Tweak Janitor Vendor
 2020-02-20 11:48:06 +01:00
kevinz000
8610c7f664 better inhands 2020-02-19 19:10:19 -07:00
kevinz000
49cef552a0 cleaner 2020-02-18 02:27:38 -07:00
kevinz000
43db506161 stopa ccidently recycling this 2020-02-18 02:26:05 -07:00
kevinz000
8666a36b1e fixes most things 2020-02-18 02:24:31 -07:00
Winter Flare
1a994e7f1e Ports Broom, Tweak Janitor Vendor 
Ports Brooms from TG https://github.com/tgstation/tgstation/pull/49120

Makes Broom printable.

Reduces Broom sound effect.

Updates Janitor Vendor to have equipment for at least 2 janitors.
 2020-02-17 23:36:22 -05:00
kevinz000
e8ccf4b6d7 fix 2020-02-13 16:25:43 -07:00
kevinz000
de5186026d Update twohanded.dm 2020-02-06 01:10:47 -07:00
kevinz000
643eeb9474 Update twohanded.dm 2020-02-05 05:05:11 -07:00
kevinz000
77667dc1d2 Update twohanded.dm 2020-02-05 04:51:16 -07:00
kevinz000
477853891d Update twohanded.dm 2020-02-04 23:54:10 -07:00
kevinz000
f3d955f397 Merge branch 'master' into staves 2020-02-04 14:54:35 -07:00
Ghommie
a726f09201 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit229 2020-02-04 03:54:52 +01:00
kevinz000
09bb223af0 eh fine 2020-02-03 15:49:41 -07:00
kevinz000
9b4e40e3a7 on second thought, fitting on OCLOTHING slot is a bad idea 2020-02-03 13:48:03 -07:00
kevinz000
c69446d2d1 woops miscalculated 2020-02-03 13:46:54 -07:00
kevinz000
dd113f5c71 L 2020-02-03 13:39:36 -07:00
kevinz000
e1ed34dcde s 2020-02-03 13:38:18 -07:00
kevinz000
8556bcf2b3 compile 2020-02-03 13:36:10 -07:00
kevinz000
70beec5985 woops 2020-02-03 13:30:41 -07:00
kevinz000
e9ec314cf6 yo this is a horrible idea 2020-02-03 13:15:12 -07:00
kevinz000
3e30c9409b riot staves 2020-02-03 13:11:26 -07:00
Ghom
6f66d76680 Merge pull request #10705 from kevinz000/revert_poojawa_blood_1 
Cleanup/Partial revert of RGB blood ""rework""
 2020-02-02 19:08:57 +01:00
Ghommie
95db5084ab Screw commit history. 2020-02-02 01:26:04 +01:00
Ghommie
188f726ffd unicode support port wip 2020-01-31 05:32:00 +01:00
kevinz000
75e1108f33 optizmize 2020-01-24 21:45:43 -07:00
Ghommie
b0da18e404 Fixes chainsaw force being set to 0 on unwield. 2020-01-23 02:13:55 +01:00