Ghom
c8c5073c35
Merge pull request #11981 from Hatterhat/10mm-doesnt-have-a-dot-in-front-idiot
...
10mm doesnt have a dot in the caliber name bro
2020-04-25 02:31:28 +02:00
kevinz000
45319b4942
Merge pull request #11976 from Citadel-Station-13/Ghommie-patch-1
...
Updates ammo_box/update_icon() to nowadays standards.
2020-04-23 11:41:51 -07:00
Ghommie
42201343a9
Backward 512 compatibility removal.
2020-04-23 00:59:23 +02:00
Hatterhat
2126ca1674
dot on casing name gone
2020-04-22 15:41:22 -05:00
Ghom
0c15c09e48
Update _box_magazine.dm
2020-04-22 16:30:30 +02:00
Artur
f910a0fd32
Conflict fixes
2020-04-14 09:27:54 +03:00
kevinz000
6b6683846b
Merge pull request #11819 from Ghommie/Ghommie-cit672
...
Minor action datum refactor and spellcasting fix.
2020-04-12 17:02:36 -07:00
Ghommie
31e0321808
Minor action datum refactor and spellcasting fix.
2020-04-11 16:53:08 +02:00
spookydonut
230e5fca20
fix everything
2020-04-11 15:32:09 +08:00
Akrilla
87dce0c3e9
dont need to null when qdeling later
2020-04-09 18:41:39 +01:00
kevinz000
22bf4cdb83
Merge pull request #11760 from Trilbyspaceclone/10mmchanges
...
Stechkin and ASP ammo boxes in uplink and ASP ammo boxes
2020-04-09 02:38:44 -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
TrilbySpaceClone
2cd59a6fb0
that was easy
2020-04-06 08:40:34 -04:00
kevinz000
12d78dd7d8
Merge pull request #11329 from Ghommie/Ghommie-cit601
...
Made laser carbines and magrifles bulkier.
2020-04-03 16:30:47 -07:00
Artur
a903752ff9
Merge remote-tracking branch 'Citadel-Station-13/master' into Garlic
2020-03-31 19:42:35 +03:00
necromanceranne
a4313ee101
Nerfs scattershot, removes it from nukie uplink, buffs bioterror dart slugs, includes them into nukie uplink ( #11675 )
2020-03-29 17:45:01 +02:00
necromanceranne
cd9a782d9f
Double-barreled shotgun and their children now can be used with off-hand weapons ( #11674 )
2020-03-29 17:20:39 +02:00
necromanceranne
02a8104c3b
Makes taserslugs actually tasers, makes mech scattershot not a oneshot ( #11671 )
2020-03-29 17:19:27 +02:00
Putnam3145
b5c4124d7a
Merge pull request #11638 from Ghommie/Ghommie-cit646
...
Moderately unoriginal PR title about runtime errors.
2020-03-27 17:12:49 -07:00
Ghommie
3c42e9eefd
Moderately unoriginal PR title about runtime errors.
2020-03-26 23:22:51 +01:00
necromanceranne
26ec48f174
straight shooting guns ( #11602 )
2020-03-25 21:18:02 +01:00
necromanceranne
84f37092fe
Prevents being able to fire a russian revolver in your off-hand while dual-wielding. ( #11610 )
2020-03-25 14:29:32 +01:00
Detective-Google
912ec5806d
Bringing Our shotguns up to (TG)snuff ( #11595 )
...
* Makes Citadel shotguns match TG shotgun fire delay
* Makes Riot + Combat shotguns require two hands to fire
* also makes the 2handed change apply to double barrels and improvs.
2020-03-25 14:17:43 +01:00
Artur
c6a8515297
Merge remote-tracking branch 'Citadel-Station-13/master' into Garlic
2020-03-24 12:36:21 +02:00
Ghommie
e59e809556
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit601
2020-03-23 19:01:25 +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
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
225d5a3c40
Nerfs HoS taser and warden stun pump action blaster ( #11352 )
...
* Update stun.dm
* Update pumpenergy.dm
2020-03-20 16:09:10 +01:00
kevinz000
6e84781670
tasers are now as fast as disablers and 7 --> 14 tile range but do not have impact damage ( #11351 )
...
* Update stun.dm
* Update stun.dm
* Update stun.dm
* Update debuffs.dm
2020-03-20 03:15:03 +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
Hatterhat
1e10a042be
arrow craft nitpicking (alt title: "why are subtypes like this") ( #11516 )
...
* subtypes (tm)
* ok fine jeez
Co-authored-by: Hatterhat <Hatterhat@users.noreply.github.com >
2020-03-18 19:34:14 +01:00
kevinz000
9bd275e430
Merge remote-tracking branch 'citadel/master' into shield_refactor
2020-03-16 13:47:53 -07:00
kevinz000
d3724d5fbd
f
2020-03-16 10:59:34 -07:00
necromanceranne
6f0fc2bdea
I LOVE YOU KITCHEN GUN!
2020-03-17 03:20:53 +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
c35ffacf50
k
2020-03-16 04:29:18 -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
kevinz000
3ae8016ec8
Merge pull request #11373 from kappa-sama/supershotty
...
miner powercreep starring 150 damage pointblank shotgun
2020-03-11 17:27:22 -07:00
kevinz000
69c21f4b76
Merge pull request #10327 from Seris02/tggenetics
...
ports tg genetics
2020-03-11 17:01:37 -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
9f681e9a76
Merge pull request #11409 from necromanceranne/taser_nerf
...
Particle Defender no longer just the HoS taser but a shotgun/Stimulants protect against the tased effect.
2020-03-12 00:30:52 +01: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
