1070 Commits

Author	SHA1	Message	Date
kevinz000	97caad18c5	Update dueling.dm	2020-01-31 01:18:43 -07:00
Ghommie	40b6ef79fe	reagent projectiles fix.	2020-01-30 19:15:07 +01:00
kevinz000	1a439b8758	Update stun.dm	2020-01-29 20:51:31 -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	9dfcef68ed	Merge branch 'master' into duke_moxley	2020-01-28 17:53:08 -07:00
kevinz000	f430fbcbd6	doubles stutter	2020-01-28 17:48:56 -07:00
kevinz000	611fd7ea89	Merge remote-tracking branch 'citadel/master' into mobility_flags	2020-01-27 23:35:35 -07:00
kevinz000	4c2b0a826a	WEW LAD	2020-01-27 23:26:24 -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	57b977c2e5	why	2020-01-27 20:41:45 -07:00
kevinz000	7d53d6e162	s	2020-01-27 20:24:02 -07:00
kevinz000	7ae43a2249	fix	2020-01-27 17:51:59 -07:00
kevinz000	3055c2b4c1	Merge pull request #10742 from Ghommie/Ghommie-cit532 ... Fixes det revolver being risky to use.	2020-01-27 17:43:46 -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
Ghommie	b6998a0b56	Fixes det revolver being riiiisky.	2020-01-27 00:44:25 +01:00
necromanceranne	8e489a7726	Hopefully I put in the override correctly	2020-01-27 10:41:27 +11:00
kevinz000	97c65aac89	Update kinetic_accelerator.dm	2020-01-26 03:06:31 -07:00
necromanceranne	5ce066a21e	Altering the effects of the ebow to hopefully make it not terrible	2020-01-26 17:18:09 +11:00
kevinz000	a01d7260d8	Merge pull request #10641 from jakeramsay007/Calibers-101 ... Revolver caliber changes; .357 revolvers can now also load .38 but not vice-versa.	2020-01-23 04:34:24 -07:00
Chayse Ramsay	5e5d80238b	Revolver caliber changes; .357 revolvers can now also load .38 but not vice-versa. ... Effectively it means you can load .38 rubber into a .357 revolver to make it less than lethal, or use the various different .38 ammo types.	2020-01-21 22:29:15 +00:00
kevinz000	ed5172f9ca	changes	2020-01-20 23:17:58 -07:00
kevinz000	8f60d01208	Merge remote-tracking branch 'citadel/master' into kevinz000-patch-8	2020-01-20 22:47:21 -07:00
kevinz000	f85527ab4b	Merge remote-tracking branch 'citadel/master' into mobility_flags	2020-01-19 16:18:12 -07:00
Ghommie	9c0b78bc09	Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit265	2020-01-18 01:23:08 +01:00
kevinz000	aea0de30d1	Merge pull request #10125 from Ghommie/Ghommie-cit449 ... Ports a few projectile code updates by ke:b:inz.	2020-01-17 15:15:08 -07:00
kevinz000	7bcb37c5d1	Merge remote-tracking branch 'citadel/master' into mobility_flags	2020-01-16 21:12:56 -07:00
kevinz000	45c92bcb6f	s	2020-01-15 19:07:47 -07:00
kevinz000	b0c2e4cbdd	Revert "shotgun pointblanking people actually throws them"	2020-01-15 01:13:26 -07:00
Ghommie	c14439494a	Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit265	2020-01-12 19:18:03 +01:00
Ghommie	02fbbd4f95	Ouch.	2020-01-12 16:54:08 +01:00
AffectedArc07	16a37e2769	Standardises all files from CRLF to LF	2020-01-12 14:28:01 +00:00
Ghommie	825b4f01c2	Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit490	2020-01-10 02:26:19 +01:00
Putnam3145	b09ef97ae3	Merge pull request #10305 from BlackMajor/Yeehaw ... Various Mining borg changes. And some extras.	2020-01-07 16:50:21 -08:00
BlackMajor	05a644cc41	Revert "Merge branch 'master' into Yeehaw" ... This reverts commit 972c03f79f, reversing changes made to 8ebd698763.	2020-01-08 12:26:45 +13:00
BlackMajor	972c03f79f	Merge branch 'master' into Yeehaw	2020-01-08 12:25:50 +13:00
BlackMajor	b41c9cd844	Sync with master	2020-01-08 12:25:22 +13:00
kevinz000	7378d91684	([\W\.])Knockdown\(	2020-01-06 03:39:20 -08:00
kevinz000	39461e2806	Update beams.dm	2020-01-05 15:16:04 -08:00
kevinz000	aca8c33149	Update beams.dm	2020-01-05 15:08:12 -08:00
kevinz000	f26c02801a	Update beams.dm	2020-01-05 15:04:51 -08:00