82 Commits

Author	SHA1	Message	Date
Ghommie	0e3774d73f	Spinfusor nerf, cause a 7k cost supply pack containing 32 explosive munitions that work just fine without the gun is just pure balance.	2019-12-06 04:47:33 +01:00
Ghommie	21f15e411d	Part 3	2019-11-19 19:34:42 +01:00
kevinz000	2f4562a63b	Merge pull request #9656 from Ghommie/Ghommie-cit290 ... Purging a lot of space indention in favor of tabs.	2019-11-14 15:55:04 -07:00
kappa-sama	c9c7d3e64e	begone	2019-11-13 16:46:13 -05:00
Ghommie	e977ba6729	Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit290	2019-11-10 23:17:58 +01:00
Ghommie	3a9e4c1f13	Unmodularizing 2/3 of the sounds folder.	2019-11-06 23:11:15 +01:00
Ghommie	a5b37b658b	Purging a lot of space indention in favor of tabs.	2019-10-29 15:46:31 +01:00
kevinz000	9fd3ef7801	Merge branch 'magrifles_again' of github.com-kevinz000:Citadel-Station-13/Citadel-Station-13 into magrifles_again	2019-10-24 18:36:04 -07:00
kevinz000	31f9ed9665	fixes	2019-10-24 15:31:45 -07:00
kevinz000	9d78d8a259	Merge branch 'master' into magrifles_again	2019-10-23 17:57:19 -07:00
kevinz000	f96e1bbe33	lmao	2019-10-22 01:59:45 -07:00
kevinz000	95b81b5938	fix	2019-10-21 00:55:15 -07:00
kevinz000	c6c2a703e5	Merge remote-tracking branch 'origin/master' into magrifles_again	2019-10-21 00:47:03 -07: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
kevinz000	692f2322c0	Merge pull request #8928 from Ghommie/Ghommie-cit121 ... Reverts a commit that reverted a fix.	2019-07-25 17:43:14 -07:00
Ghommie	7065a86841	Revert "Revert "Fixes rocket launchers, buffing their accuracy etc.""	2019-07-19 22:02:22 +02:00
Ghommie	7e99dd205a	Fixing Shredder guns not accepting standard flechette mags, and magpistol mag sprites.	2019-07-19 21:54:48 +02:00
kevinz000	28072a31dc	Update magweapon.dm	2019-07-13 20:03:39 -07: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
Trilbyspaceclone	3bf667ba36	Update magweapon_energy.dm	2019-05-22 12:42:28 -04:00
Trilbyspaceclone	005647d4f6	Update magweapon_energy.dm	2019-05-22 12:12:06 -04:00
kevinz000	90c3e4b776	Merge pull request #8322 from Trilbyspaceclone/patch-117 ... Buffs mag-gun recharges speed	2019-05-11 22:18:29 -07:00
Trilbyspaceclone	dc4aa42525	Update magweapon_energy.dm	2019-05-05 06:35:32 -04:00
kevinz000	0bfac54070	Update magweapon_energy.dm	2019-05-04 23:16:27 -07:00
kevinz000	cbc0607086	Merge pull request #8290 from Trilbyspaceclone/Laser_gun_adv ... Readds Laser carbines.	2019-04-30 05:31:33 -07:00
Trilbyspaceclone	60a9544a6b	Update magweapon_energy.dm	2019-04-29 00:19:47 -04:00
Trilbyspaceclone	4492e60a9f	typo	2019-04-29 00:02:53 -04:00
Trilbyspaceclone	5430454c73	Update magweapon.dm	2019-04-28 23:59:29 -04:00
Trilbyspaceclone	d136d95743	Update magweapon.dm	2019-04-28 23:56:39 -04:00
Trilbyspaceclone	b51751dfa8	Update magweapon_energy.dm	2019-04-28 23:38:34 -04:00
Trilbyspaceclone	c5f3f67824	Update magweapon.dm	2019-04-28 23:33:31 -04:00
Trilbyspaceclone	514e15ee6c	Update magweapon.dm	2019-04-28 23:32:38 -04:00
Useroth	e51cdf98b2	Fixed the calibers up.	2019-04-29 04:58:26 +02:00
Trilbyspaceclone	22912832d7	Create magweapon_energy.dm	2019-04-28 22:46:50 -04:00
Trilbyspaceclone	bc251b59aa	Update magweapon.dm	2019-04-28 22:43:01 -04:00
Trilbyspaceclone	f6bb8b6aef	Update magweapon.dm	2019-04-28 22:33:58 -04:00
Trilbyspaceclone	9ff3918ffd	Update magweapon.dm	2019-04-28 22:25:19 -04:00
Trilbyspaceclone	ad2cacb59e	toys	2019-04-28 22:05:53 -04:00
Trilbyspaceclone	fb7a129ca5	Update magweapon.dm	2019-04-28 21:56:48 -04:00
Trilbyspaceclone	3eeafbb975	Merge branch 'master' into hell	2019-04-28 21:54:55 -04:00
Trilbyspaceclone	bec3cf8967	Update magweapon.dm	2019-04-28 21:24:45 -04:00
Trilbyspaceclone	0fa3fb6aca	Update magweapon.dm	2019-04-28 16:46:12 -04:00
Useroth	c59cb823bb	Let's try like this.	2019-04-28 21:14:11 +02:00
Trilbyspaceclone	b7b4bf1a61	Update magweapon.dm	2019-04-28 14:51:53 -04:00
Trilbyspaceclone	15a1b2baeb	Poojawa pointed this out	2019-04-27 18:56:40 -04:00
Trilbyspaceclone	0b58285b53	5 - > 2	2019-04-11 00:36:31 -04:00
Trilbyspaceclone	02f8f89a79	Update magweapon.dm	2019-04-09 09:52:05 -04:00