Commit Graph

112 Commits

Author SHA1 Message Date
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
Chayse Ramsay
f95222fee0 For the stranger there among them had a big iron on his hip. Big iron on his hiiiiiiip. (#12155)
* HoS modular revolver, ported from vore

* Bugfixing, sanity checks etc.

* Update hos.dm

* Sprite fixed

* Automatic changelog compile [ci skip]

* HoS Weapon Selection

* Icons

* Clamp fix, removing rogue items from ye olde list

* Update ammo.dmi

* Requested Changes Part 1

* Beacon fixed (kind of)

* Subtypes fix

* User

* Giving process_chamber a user so that the proc can use to_chat without requiring loc, fixes switching so the gun only switches to the same type when empty

* redundant item

* Adds an examine notice on how to remove the magazine

* Requested Changes

* Icons

Co-authored-by: Changelogs <action@github.com>
2020-05-30 03:17:56 +02:00
Ghom
968426fd48 Combat mode component. (#12338)
* Combat mode component.

* Whoops.

* test.

* Oh

* refs begone, and documentation.
2020-05-27 18:00:32 -07:00
Rohesie
d88c815845 vars (#12373) 2020-05-28 01:18:26 +02:00
Ghom
a41a06bc4b Fixing beam rifles lacking pin and pacifism checks. (#12349) 2020-05-24 13:29:45 -07:00
Ghom
c8cd97351d Makes gun weight akimbo restrictions work the other way around. (#12297)
* Makes gun weight akimbo restrictions work the other way around.

* web edits
2020-05-24 13:19:28 -07:00
kevinz000
fd5c635840 adds a snowflakey-ish(??? maybe???) way to modify gun damage so we don't need more shot types for improvised shotguns (#12274)
* Update gun.dm

* Update _firing.dm

* Update code/modules/projectiles/ammunition/_firing.dm

Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com>
2020-05-18 02:59:50 +02:00
Ghommie
31e0321808 Minor action datum refactor and spellcasting fix. 2020-04-11 16:53:08 +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
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
Ghommie
4ff63b7791 Made laser carbines and magrifles bulkier. 2020-03-04 22:28:02 +01: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
kevinz000
fc5eeeac00 Update gun.dm 2020-02-15 12:14:51 -07:00
kevinz000
24b977f655 Merge branch 'master' into stuff 2020-02-15 11:45:25 -07:00
kevinz000
3865224e78 fine 2020-02-13 15:40:30 -07:00
Linzolle
790b7bf9cc sanity check 2020-02-13 15:20:01 -06:00
Linzolle
d22631700c update the fucking craft component because artur forgot to 2020-02-13 12:59:56 -06:00
kevinz000
a8a071851a s 2020-02-13 00:32:26 -07:00
Linzolle
4622f66162 for real this time 2020-02-09 19:45:22 -06:00
Ghom
2a0ba12896 Merge pull request #10952 from Citadel-Station-13/kevinz000-patch-11
gun qdel fix
2020-02-09 02:53:38 +01:00
kevinz000
7c16830e91 ok 2020-02-07 23:31:38 -07:00
kevinz000
4f2acb6298 Update gun.dm 2020-02-07 00:08:19 -07:00
kevinz000
8556a6188f Merge remote-tracking branch 'citadel/master' into small_guncode_refactor 2020-02-04 03:47:01 -07:00
kevinz000
54d70cd9fe Update gun.dm 2020-02-03 18:33:24 -07:00
Ghommie
95db5084ab Screw commit history. 2020-02-02 01:26:04 +01:00
kevinz000
fe5a83ea52 Update gun.dm 2020-01-31 01:22:53 -07:00
kevinz000
9df12f94d4 Merge branch 'master' into one_last_taser_attempt 2020-01-29 16:27:58 -07:00
kevinz000
d89b8d95cf BRAINLETMOMENT 2020-01-27 22:44:51 -07:00
kevinz000
3ce1fe2585 changes 2020-01-27 22:26:43 -07:00
kevinz000
9d047f07f8 separate this a bit 2020-01-27 21:08:47 -07:00
kevinz000
7ae43a2249 fix 2020-01-27 17:51:59 -07:00
kevinz000
0eb13d8f23 refactors guns a bit 2020-01-27 17:39:49 -07:00
kevinz000
4883b36576 compile 2020-01-27 02:55:32 -07:00
kevinz000
b0c2e4cbdd Revert "shotgun pointblanking people actually throws them" 2020-01-15 01:13:26 -07:00
Hatterhat
318a6812c3 manually copied tgstation#47443 2019-12-31 21:38:11 -06:00
Ghommie
91ffa11bc9 Nerfs circuit pneumatic cannons and guns with extra sanity checks. 2019-12-04 01:07:36 +01:00
Ghommie
dd101ef221 Part 2 2019-11-19 18:00:56 +01:00
kevinz000
d1f6483687 Merge pull request #9704 from Ghommie/Ghommie-cit314
Minor ninja tweaks and stealth nerf.
2019-11-10 11:31:25 -07:00
Ghommie
286b78c84c Minor ninja tweaks and stealth nerf. 2019-11-03 17:14:55 +01:00
Ghommie
b653595702 Ports "Replaces the rpg loot datum with a component and makes some suffixes have real effects" & co 2019-10-31 22:40:11 +01:00
BlackMajor
6a7a121d56 Merge pull request #8856 from Citadel-Station-13/magrifles_again
Security Gun Rebalancing Electric Boogaloo - overhauls magrifles/magpistols, burst fire autorifles, nerfs laser carbines, resprites energy guns
2019-10-28 16:47:02 +13:00
kevinz000
c6c2a703e5 Merge remote-tracking branch 'origin/master' into magrifles_again 2019-10-21 00:47:03 -07:00
Ghommie
fe71e2984c Fixing sniper rifles scope datum action oddities. 2019-10-19 16:40:01 +02:00
Ghommie
e991328087 progress 2019-10-19 15:02:56 +02:00
Ghommie
7065a86841 Revert "Revert "Fixes rocket launchers, buffing their accuracy etc."" 2019-07-19 22:02:22 +02:00
kevinz000
69f06444e6 smgs 2019-07-09 08:20:45 -07:00
kevinz000
a2d52c0ed9 HERE WE GO AGAIN. 2019-07-09 07:55:44 -07:00
Ghommie
9081b5b773 Revert "Fixes rocket launchers, buffing their accuracy etc."
This reverts commit 1c6156dd0e.
2019-07-08 07:17:49 +02:00
Ghommie
1c6156dd0e Fixes rocket launchers, buffing their accuracy etc. 2019-07-08 06:56:20 +02:00
Ghommie
f39a5d2f6a Ports in RPGs for nuke ops, failsafe uplinks and some carp plushie exploit fix. 2019-06-30 21:53:33 +02:00