kevinz000
dbfa8ac1ea
Merge branch 'master' into typing_indicators
2020-05-11 05:00:23 -07:00
kevinz000
6b9fc7eccf
Merge pull request #12169 from Ghommie/Ghommie-cit734
...
Porting some radial menu updates, and that one clown mask skin.
2020-05-10 14:14:19 -07:00
Lin
dd7db603d2
Merge pull request #12159 from Ghommie/Ghommie-cit732
...
'mob_run_block' and 'mob_check_block' macros
2020-05-10 18:25:16 +00:00
Ghommie
88d86e53d0
Porting some radial menu updates, and that one clown mask.
2020-05-09 00:45:48 +02:00
Ghommie
ffd5dd9615
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit732
2020-05-08 19:01:28 +02:00
Ghommie
a412e840f7
'mob_run_block' and 'mob_check_block' macros
2020-05-08 18:52:32 +02:00
Ghom
73d958649e
Update item_attack.dm
2020-05-08 17:12:13 +02:00
Ghommie
60bdbfaf61
Merge conflicts, procs instead of macros, mood signals.
2020-05-08 02:12:41 +02:00
kevinz000
73144a4f92
Merge branch 'master' into typing_indicators
2020-05-07 09:04:44 -07:00
Ghommie
91d6faaf21
more obligatory changes.
2020-05-05 21:06:53 +02:00
Ghommie
81dde7debd
Obligatory.
2020-05-05 21:04:19 +02:00
Ghommie
001109cfcd
About ready.
2020-05-05 20:58:44 +02:00
Ghommie
791b05871f
Hey.
2020-05-05 05:24:40 +02:00
Ghommie
0adca2d9b8
Oh.
2020-05-05 04:45:43 +02:00
Ghommie
643ef48f0e
Macros, generic skill implementations.
2020-05-05 04:42:34 +02:00
Putnam
c1cd4d104f
Replaces the pAI candidate button with a ghost roles button
2020-05-03 20:31:11 -07:00
kevinz000
f99d904dc7
ports /tg/station vis_flags related fixes ( #12064 )
...
* fixes
* Update layers_planes.dm
* kay
2020-05-01 21:14:04 +02:00
kevinz000
abb7f199df
tweaks
2020-04-24 23:39:08 -07:00
kevinz000
07dedea81a
Merge remote-tracking branch 'citadel/master' into typing_indicators
2020-04-24 22:49:54 -07:00
Ghommie
42201343a9
Backward 512 compatibility removal.
2020-04-23 00:59:23 +02:00
Ghom
5a6a205b9d
Merge pull request #11868 from Arturlang/tackling_and_lunge
...
Ports TG Tackling and uses it to rework bloodsucker lunge
2020-04-21 15:50:44 +02:00
kevinz000
ad8c0c2687
Update storage.dm
2020-04-16 22:55:01 -07:00
Artur
2134515d5c
Merge remote-tracking branch 'upstream/master' into tackling_and_lunge
2020-04-15 12:19:37 +03: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
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
Artur
fe755a1424
Tackling Working so far, working on the lunge now
2020-04-09 21:42:00 +03: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
kevinz000
d4c6148a11
Merge remote-tracking branch 'citadel/master' into typing_indicators
2020-03-23 15:33:22 -07:00
Ghommie
3c2cb76792
Fixing owner not being set in mutation/on_aquiring.
2020-03-22 15:23:05 +01:00
