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
4eaa3a22c2
fixes beam rifles and some micro optimizations to projectiles and readds the chameleon gun for debugging ( #11528 )
...
* wew
* ah
* k
* k
* faster
2020-03-21 02:45:34 +01: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
Ghom
b03955b085
Update dueling.dm
2020-03-19 05:26:38 +01:00
Ghommie
a0294698c0
extra runtime fixes, also porting tgstation#49997
2020-03-19 04:49:01 +01:00
kevinz000
9bd275e430
Merge remote-tracking branch 'citadel/master' into shield_refactor
2020-03-16 13:47:53 -07: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
d32bff7815
return list
2020-03-16 03:35:10 -07:00
kevinz000
703fca5f90
add owner argument
2020-03-16 03:24:19 -07:00
kevinz000
339ea13e00
Update beam_rifle.dm ( #11477 )
2020-03-15 20:54:23 +01:00
kevinz000
4d0677daa9
s
2020-03-14 21:48:23 -07:00
Putnam3145
480eb32c68
Merge pull request #11418 from Ghommie/Ghommie-cit615
...
Fix runtimes some more.
2020-03-11 17:01:13 -07:00
Ghom
d55f7aba42
Merge pull request #11401 from Trilbyspaceclone/bow_sprites
...
Gives pipe and ashen bow inhand sprites
2020-03-11 00:03:29 +01:00
Ghommie
27a7f754c4
Fix runtimes some more.
2020-03-10 22:40:06 +01:00
Trilbyspaceclone
8e030763b6
Odd but ok?
...
Co-Authored-By: Ghom <42542238+Ghommie@users.noreply.github.com >
2020-03-09 12:38:45 -04:00
TrilbySpaceClone
4968c22b5f
sprites!
2020-03-09 08:47:56 -04:00
Ghommie
59b1a223a3
Ok, done.
2020-03-08 22:51:36 +01:00
kevinz000
d376b99af6
Merge pull request #11315 from Citadel-Station-13/Ghommie-patch-3-2
...
Fixing a little issue with the Holodeck's Kobayashi Maru phaser
2020-03-06 00:19:51 -07:00
deathride58
2e35c09dec
Merge pull request #10451 from kevinz000/mobility_flags
...
Mobility flags + combat rework stuff refactoring, fixes a few edge cases including the Oh Dreaded Xenomorph Hardstuns, etc etc time to break the game
2020-03-05 20:03:56 -05:00
BlackMajor
43e77f7d3a
Last few fixes. Adds arcane wand to dead wizard roid.
2020-03-04 19:12:56 +13:00
Ghom
b378da2468
Update energy.dm
2020-03-03 15:06:42 +01:00
kevinz000
56eab760fc
Merge remote-tracking branch 'citadel/master' into mobility_flags
2020-02-27 20:11:36 -07:00
Ghom
6f181365c2
Merge pull request #11172 from Trilbyspaceclone/bows!
...
Bow corrections.
2020-02-22 15:53:27 +01:00
kevinz000
f6542b381c
Merge remote-tracking branch 'citadel/master' into mobility_flags
2020-02-21 23:29:25 -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
TrilbySpaceClone
5401796a5f
corrections
2020-02-20 02:40:34 -05:00
kevinz000
c7273c03be
Merge remote-tracking branch 'citadel/master' into mobility_flags
2020-02-19 19:12:27 -07:00
kevinz000
6f31e1270e
Merge pull request #11098 from Trilbyspaceclone/bows!
...
Silk into clothing, bows, arrows, quivers and more!
2020-02-19 19:05:49 -07:00
kevinz000
9589c3116b
Merge pull request #11115 from Ghommie/Ghommie-cit583
...
Something more about runtime errors.
2020-02-19 19:03:01 -07:00
kevinz000
9289ca8873
fix
2020-02-19 08:14:28 -07:00
kevinz000
0e4692c63d
Merge remote-tracking branch 'citadel/master' into mobility_flags
2020-02-18 18:16:34 -07:00
Ghom
5e10f822e6
Update energy.dm
2020-02-17 13:40:37 +01:00
Ghommie
aba636a44c
ok
2020-02-17 00:13:16 +01:00
Ghommie
1a0fba8a2a
Something about consistency and magnetic rifles.
2020-02-16 18:37:51 +01:00
kevinz000
f79148d549
Merge pull request #10947 from Ghommie/Ghommie-cit563
...
Holopad static fix and a few other mistakes.
2020-02-15 12:16:23 -07:00
TrilbySpaceClone
bbe1ddc0cf
silk, bows, and graytide!
2020-02-14 23:04:02 -05:00
Ghom
0b8dd2a03d
Merge pull request #11045 from Trilbyspaceclone/patch-280
...
Flat guns can no longer be suppressed
2020-02-14 08:26:00 +01:00
Ghom
64882b8a90
Merge pull request #10993 from Linzolle/bows
...
adds the bow
2020-02-14 08:01:12 +01:00
kevinz000
eca0e0f2dc
Merge remote-tracking branch 'citadel/master' into mobility_flags
2020-02-13 00:39:20 -07:00
Trilbyspaceclone
7cd3a51c4e
Update pistol.dm
2020-02-12 14:48:53 -05:00
kevinz000
45bec21520
fix sync
2020-02-10 04:01:21 -07:00
Linzolle
63be3300d2
actually
2020-02-09 19:52:44 -06:00
Linzolle
4622f66162
for real this time
2020-02-09 19:45:22 -06:00
Arturlang
29207b22fb
Merge branch 'master' into debug_outfit_updates
2020-02-09 22:05:26 +02:00
kevinz000
826ed7d4f2
o k.
2020-02-07 23:39:09 -07:00
kevinz000
7c16830e91
ok
2020-02-07 23:31:38 -07:00
Ghom
71f44a7085
Merge pull request #10892 from kevinz000/small_guncode_refactor
...
Small guncode refactor but it works
2020-02-07 23:13:21 +01:00
