shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
34,303 Commits 5 Branches 0 Tags
b3afed69f44f6b8564951ebeef06f7acf8beefaf
Commit Graph

167 Commits

Author SHA1 Message Date
kevinz000
92d1af5889 adjustments 2020-06-04 22:18:19 -07:00
kevinz000
a35fce64e2 fixes 2020-06-04 20:02:59 -07:00
kevinz000
bad809ffce fixes 2020-06-04 19:56:06 -07:00
kevinz000
1a9787a9c2 Merge remote-tracking branch 'citadel/master' into combat_rework 2020-06-02 21:49:43 -07:00
Ghom
a41f40503d More lenient soft stamina combat, decentralized gun inaccuracy from combat mode. (#12347) 
* A more lenient soft stamina crit.

* Yea, your shots are gonna go straight toh.

* accuracy whacks (leaves the bow as is for now).

* Fixing stam penalties calculations, spread the range.

* aaaaaah

* 1.4 seconds delay vs 1.2

* Thanks, linter.

* Missed one.
 2020-06-02 15:22:06 -07:00
Yawet330
8e26876634 Makes Spears rational. (#12401) 
* hate spears, hate elances, hate embedding.

* Update code/game/objects/items/twohanded.dm

Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com>

* Update code/game/objects/items/twohanded.dm

Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com>

* Update code/game/objects/items/twohanded.dm

Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com>

* Update code/game/objects/items/twohanded.dm

Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com>
 2020-06-01 01:44:31 +02:00
kevinz000
5b6e797c4f desword adjustments 2020-05-30 23:43:05 -07:00
kevinz000
34d8aa0ee9 refactor 2020-05-30 23:13:16 -07:00
kevinz000
2232271ea5 fixes and render 2020-05-30 22:29:41 -07:00
kevinz000
1fef5825a9 definition fixes 2020-05-30 22:09:13 -07:00
kevinz000
d47841ee54 documentation 2020-05-30 20:38:07 -07:00
kevinz000
588443e928 fix 2020-05-30 20:12:50 -07:00
kevinz000
e5c32c1746 changes 2020-05-30 20:11:18 -07:00
kevinz000
9d4d6e6b6f your goddamn ass isn't a constant expression 2020-05-30 02:12:49 -07:00
kevinz000
519552cb78 more handling 2020-05-30 01:59:58 -07:00
kevinz000
1214c99a34 is this a good idea 2020-05-30 01:46:43 -07:00
kevinz000
f326c06324 fixEs 2020-05-27 21:07:07 -07:00
Ghommie
a412e840f7 'mob_run_block' and 'mob_check_block' macros 2020-05-08 18:52:32 +02: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
7c1e5aa2c9 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit655 2020-04-09 15:46:19 +02:00
Ghommie
c3faf94d8f WIP 2020-03-30 05:29:39 +02:00
kevinz000
0d35033736 Update twohanded.dm 2020-03-27 21:28:45 -07: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
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
kevinz000
e3301f8722 bet 2020-03-16 10:44:02 -07: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
6af9c54da5 better 2020-03-16 04:59:55 -07:00
kevinz000
a77be038b8 refactoring this whole thing again 2020-03-16 04:56:32 -07:00
kevinz000
763c835a53 bitflags not equals 2020-03-16 04:26:19 -07:00
kevinz000
69374c64c9 k 2020-03-16 04:18:22 -07:00
kevinz000
644273beca k 2020-03-16 04:09:25 -07:00
kevinz000
94db06509c slight desword reflect meme buff 2020-03-16 03:50:26 -07:00
kevinz000
d32bff7815 return list 2020-03-16 03:35:10 -07:00
kevinz000
09e1be9651 block args 2020-03-16 03:32:12 -07:00
kevinz000
703fca5f90 add owner argument 2020-03-16 03:24:19 -07:00
kevinz000
9ead492bb0 changes 2020-03-16 00:28:18 -07:00
kevinz000
4d0677daa9 s 2020-03-14 21:48:23 -07:00
kevinz000
2113b63428 o boy 2020-03-14 21:42:23 -07: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
Ghommie
2b4b626fac support for items that switch states through update_icon. 2020-03-10 16:55:30 +01: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