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

439 Commits

Author SHA1 Message Date
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
Artur f910a0fd32 Conflict fixes 2020-04-14 09:27:54 +03:00
Ghom b00e97b848 Merge pull request #10732 from kevinz000/eldritch_affairs 
Eldritch Affairs
 2020-04-12 20:47:19 +02: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 2e9e38cd89 close 2020-04-09 09:30:34 -07:00
kevinz000 857716c473 k 2020-04-09 09:30:28 -07:00
kevinz000 a888c7c29a continue 2020-04-09 02:52:32 -07:00
kevinz000 5c53314ee3 cancel 2020-04-08 00:57:09 -07:00
kevinz000 7ec669ecd4 bet 2020-04-07 16:11:58 -07: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
Putnam 5f71efe07a Adds a message to the AI to reconnect, since this is a common bug 2020-04-05 22:41:50 -07:00
Artur a903752ff9 Merge remote-tracking branch 'Citadel-Station-13/master' into Garlic 2020-03-31 19:42:35 +03:00
actioninja f419653c28 functionality 2020-03-28 23:50:06 -07:00
kevinz000 c39dd52b5f Merge remote-tracking branch 'citadel/master' into eldritch_affairs 2020-03-27 21:32:40 -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
kevinz000 d2e98679f4 Merge pull request #11598 from Ghommie/Ghommie-cit640 
Fixes crafting hud icon overlapping the second pocket on 1:1 screen mode.
 2020-03-25 12:19:37 -07:00
kevinz000 cbb5d52ca1 Melee Stagger (#11443) 
* 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

* wack

* animation is now shorter

* linter save me

* i hate you

* k

* k

* k

* i hate you

* wrong button

* k

* ok

* bet

* bet

* bet

* Update item_attack.dm

* 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

* fix

Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com>
 2020-03-25 18:37:39 +01:00
Artur 7d22cb00d0 Mixes and fixes 2020-03-25 19:32:46 +02:00
Artur fdc6a02eea Hm 2020-03-25 12:46:42 +02: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 3c2cb76792 Fixing owner not being set in mutation/on_aquiring. 2020-03-22 15:23:05 +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 d3724d5fbd f 2020-03-16 10:59:34 -07:00
kevinz000 2113b63428 o boy 2020-03-14 21:42:23 -07:00
necromanceranne 49c0aba205 bleeding out from a toolbox smack is not cool gamers 2020-03-14 04:25:12 +11:00
kevinz000 18471be4ce cult team 2020-03-10 20:11:18 -07:00
keronshb 930643b01a Blob Reroll 
Also ports blob reroll
 2020-03-06 19:06:50 -05:00
keronshb 228012c718 Blob refactor (#43872) 
Ports over Blob Refactor from TG
 2020-03-06 15:58:17 -05:00
kevinz000 1e99cd0bfe Merge remote-tracking branch 'citadel/master' into mobility_flags 2020-03-03 03:08:41 -07:00
Ghommie fc76cd9a9b Porting update_icon improvements. Part 1. 2020-02-27 01:21:03 +01:00
kevinz000 0e4692c63d Merge remote-tracking branch 'citadel/master' into mobility_flags 2020-02-18 18:16:34 -07:00
kevinz000 139508a9a4 Update drag_drop.dm 2020-02-17 22:36:57 -07:00
kevinz000 481f038e01 Update item_attack.dm 2020-02-13 05:40:36 -07:00
kevinz000 863ce5152b Merge remote-tracking branch 'citadel/master' into stuff 2020-02-13 04:14:44 -07:00
kevinz000 eca0e0f2dc Merge remote-tracking branch 'citadel/master' into mobility_flags 2020-02-13 00:39:20 -07:00
kevinz000 a8a071851a s 2020-02-13 00:32:26 -07:00
kevinz000 01390fa0e0 Merge remote-tracking branch 'citadel/master' into attack_chain 2020-02-10 04:18:02 -07:00
kevinz000 18910a23a2 Merge pull request #10881 from Ghommie/Ghommie-cit552 
Refactoring mob holders into an element.
 2020-02-06 00:41:28 -07:00
kevinz000 6a8a606f97 Merge remote-tracking branch 'citadel/master' into mobility_flags 2020-02-04 16:01:25 -07:00
Ghommie 63c8612ccd Refactoring mob holders into an element. 2020-02-04 01:42:59 +01:00
Ghommie 84d9430ee4 PC too slow for compile. 2020-02-03 07:21:39 +01:00
Ghommie 81b5fe2de3 Further buff and fix for clown ops tearstache nade. 2020-02-03 07:08:47 +01:00
Artur e7ddfdd8d8 Merge remote-tracking branch 'upstream/master' into TGUIs_Nexties 2020-02-02 13:31:54 +01:00
Artur 8bb0e30036 Initial Commit V3 2020-01-31 18:17:14 +01:00
Arturlang 83ce84cdc4 Merge branch 'master' into TGUIs_Nexties 2020-01-30 20:46:20 +02:00