Commit Graph

165 Commits

Author SHA1 Message Date
kevinz000
826ed7d4f2 o k. 2020-02-07 23:39:09 -07:00
kevinz000
8db3fbdf88 modularize out taser rework 2020-02-04 03:49:09 -07:00
kevinz000
8556a6188f Merge remote-tracking branch 'citadel/master' into small_guncode_refactor 2020-02-04 03:47:01 -07:00
Ghommie
a365f3b499 Demodularize and nerfs mag rifles with re(?)added power cell requirements. 2020-02-03 05:16:32 +01:00
Ghom
6ae5ffddb1 Merge pull request #10731 from necromanceranne/howdoiswitchhands
Energy crossbow changed from RNG to static effects
2020-02-01 18:58:03 +01:00
Putnam3145
17e08280b1 Merge pull request #10804 from Citadel-Station-13/kevinz000-patch-9
fixes a very likely race condition in dueling pistols
2020-02-01 04:15:32 -08:00
Ghom
ed3ebd16a8 Merge pull request #10830 from Seris02/nomoreglitches
[s] fixes a glitch with the PKA
2020-02-01 10:06:58 +01:00
Seris02
3c8dcbbcd2 merp 2020-02-01 16:02:30 +08:00
Seris02
fc70b88b06 actually we only need it here 2020-02-01 11:51:15 +08:00
Seris02
20308b54dd exploit fix 2020-02-01 11:48:55 +08:00
kevinz000
97caad18c5 Update dueling.dm 2020-01-31 01:18:43 -07:00
kevinz000
0612649eb7 Update stun.dm 2020-01-29 20:50:06 -07:00
kevinz000
831fafb72b Update dueling.dm 2020-01-29 19:06:11 -07:00
kevinz000
562659b5b8 Update dueling.dm 2020-01-29 19:00:11 -07:00
kevinz000
9df12f94d4 Merge branch 'master' into one_last_taser_attempt 2020-01-29 16:27:58 -07:00
necromanceranne
f9d6a9b9c4 Added the tweaks suggested by kevin but good fucking lord this changes a lot and also fuck the pka reload proc 2020-01-29 14:23:50 +11:00
kevinz000
d89b8d95cf BRAINLETMOMENT 2020-01-27 22:44:51 -07:00
kevinz000
9d047f07f8 separate this a bit 2020-01-27 21:08:47 -07:00
kevinz000
57b977c2e5 why 2020-01-27 20:41:45 -07:00
kevinz000
7d53d6e162 s 2020-01-27 20:24:02 -07:00
kevinz000
0eb13d8f23 refactors guns a bit 2020-01-27 17:39:49 -07:00
kevinz000
1e19ec2c50 bad var 2020-01-27 02:59:27 -07:00
kevinz000
4883b36576 compile 2020-01-27 02:55:32 -07:00
kevinz000
d4d315b447 :^) 2020-01-27 02:51:01 -07:00
necromanceranne
5e7b7143de Additional adjustments, added more damage to the mini ebow becaues I forgot to do that originally and made large ebows bulky and heavy weapons 2020-01-27 11:48:56 +11:00
kevinz000
97c65aac89 Update kinetic_accelerator.dm 2020-01-26 03:06:31 -07:00
AffectedArc07
16a37e2769 Standardises all files from CRLF to LF 2020-01-12 14:28:01 +00:00
BlackMajor
2e03a529bf checking off the list 2019-12-29 22:11:10 +13:00
BlackMajor
c81d1fe7a3 Merge pull request #9867 from Ghommie/Ghommie-cit375
Ports "examine-code refactor"
2019-11-25 11:31:03 +13:00
Ghommie
dd101ef221 Part 2 2019-11-19 18:00:56 +01:00
GrayRachnid
3edaf75722 Ports the Saboteur borg for nukeops and ports new cyborg tool icons and cyborg taser/laser icons. 2019-11-15 16:58:45 -05:00
kevinz000
48fb3a0f08 Merge pull request #9694 from kappa-sama/hosnowflake
Buffs security, nerfs antags
2019-11-10 11:40:41 -07:00
kappa-sama
3e95a66513 Update energy_gun.dm 2019-11-02 23:04:06 -04:00
Ghommie
b86c5059d5 [s] modkit uninstall() calling forceMove() calling loc.Exited() calling modkit.uninstall() calling f... 2019-10-30 13:17:12 +01:00
kevinz000
0064529362 Merge pull request #9610 from Ghommie/Ghommie-cit273
ports anti-magic component code updates (holymelon sold separately).
2019-10-29 21:26:03 -07:00
Ghommie
8c4e031a1b atom/movable's Destroy() calls MoveToNullSpace() which calls Exited(), thus handle_atom_del() is redunant. 2019-10-28 17:59:32 +01:00
Ghommie
68b1583a1a Fixing PKA mod double installation et similars. 2019-10-28 17:47:29 +01:00
Ghommie
ad7101d0aa ports anti-magic component code updates (holymelon not included). 2019-10-25 03:20:42 +02:00
BlackMajor
cebdc1414f Merge pull request #9540 from YakumoChen/laser-minigone
Reverts #9189 (Laser Minigun)
2019-10-22 13:36:45 +13:00
YakumoChen
6a5d1c20bd delete minigun 2019-10-20 03:08:20 +00:00
deathride58
50c27df28f Taser rework - Gives electrodes a debilitating status effect, makes disabler the default taser mode, and more 2019-10-15 03:48:44 -04:00
Ghommie
689136fe94 Nerfs cyborg disabler to hold 25 shots rather than 43, just like a normal disabler. 2019-10-09 23:07:39 +02:00
kevinz000
6e55fec7bd Merge pull request #9189 from Sishen1542/gatling
[READY] craftable laser minigun, because why not
2019-09-28 00:40:02 -07:00
YakumoChen
e297dbd0a3 Update energy_gun.dm 2019-09-21 02:39:47 +00:00
Sishen
a3967b6f77 aaaaaaaa 2019-09-03 02:29:08 -04:00
Sishen
b4f27b8841 allows renaming of non null rod holyweapons, fixes hypertool description 2019-08-31 18:05:09 -04:00
Sishen
d9fff579b1 damage and stamina balances 2019-08-31 17:39:51 -04:00
Sishen
ba5021af5b gives lasrifle the damage component, turns kevs divine lightblade into a hypereut to balance stats, adds hypertool 2019-08-31 02:55:29 -04:00
Sishen
b69c928419 FOR THE EMPEROR 2019-08-30 16:50:03 -04:00
Sishen
47ee3a8a6d fuck 2019-08-28 23:56:08 -04:00