1046 Commits

Author	SHA1	Message	Date
lolman360	a7a964154e	Update code/modules/projectiles/boxes_magazines/_box_magazine.dm ... Co-authored-by: silicons <2003111+silicons@users.noreply.github.com>	2020-08-19 12:02:34 +10:00
lolman360	6f21b23a87	Fixes Shit.	2020-08-18 14:28:57 +10:00
lolman360	8027706bea	Update _box_magazine.dm	2020-08-18 13:45:44 +10:00
lolman360	2d1edc9fa2	Update _box_magazine.dm	2020-08-18 13:30:49 +10:00
lolman360	3aba9eb5a6	kee	2020-08-12 15:11:55 +10:00
lolman360	8c70b56706	whoops	2020-08-11 19:04:59 +10:00
lolman360	472ef6165f	imamurderer	2020-08-11 18:52:26 +10:00
silicons	6876edbd85	Merge pull request #12992 from Hatterhat/rifle-book-pt2 ... unatomic as shit PR about nukie guns	2020-08-06 19:40:09 -07:00
Hatterhat	25ab96cf53	funny revolver reskins	2020-08-03 20:39:06 -05:00
Timothy Teakettle	03d01d917f	Merge branch 'master' into wounds-part-2	2020-08-02 18:10:31 +01:00
Hatterhat	6a5e26eb1c	unatomic as shit	2020-08-01 12:31:13 -05:00
silicons	f02bc4a572	Update toy.dm	2020-07-29 19:49:11 -07:00
Timothy Teakettle	9721025582	Merge branch 'master' into wounds-part-2	2020-07-29 15:47:44 +01:00
Lin	bbffd41d55	Merge pull request #12883 from Citadel-Station-13/silicons-patch-49 ... beam rifles are now practical in emitters	2020-07-28 22:05:39 -05:00
Lin	81a7542aa6	Merge pull request #12834 from silicons/clickcd_experimental ... Experimental hybrid clickdelay system (No seriously I'm trying my best to not call it Minecraft attack delays)	2020-07-28 21:51:10 -05:00
Lin	87eac49bbf	Merge pull request #12862 from Citadel-Station-13/silicons-patch-44 ... you can now shoot yourself with a gun by using disarm intent will this cause balance issues maybe do i care not really	2020-07-27 11:46:37 -05:00
Lin	2514f4111d	Merge pull request #12900 from Citadel-Station-13/silicons-patch-53 ... drops 1.5 second taser alt fire delay to normal fire rate (0.4 seconds)	2020-07-27 11:43:31 -05:00
Ghom	4fad4ad969	Merge pull request #12888 from Citadel-Station-13/silicons-patch-50 ... sorry gamers, no more self healing with a medbeam	2020-07-27 15:27:07 +02:00
silicons	1990f75957	Merge remote-tracking branch 'citadel/master' into clickcd_experimental	2020-07-25 23:46:27 -07:00
silicons	2a29f73ac8	ok	2020-07-25 17:34:12 -07:00
silicons	23465355d0	Update stun.dm	2020-07-24 22:16:06 -07:00
timothyteakettle	3ca098fe98	bugfixes	2020-07-25 00:22:24 +01:00
timothyteakettle	8360bb1a7f	section 2	2020-07-24 23:44:57 +01:00
Timothy Teakettle	7fb55a02a5	section one	2020-07-24 22:34:22 +01:00
silicons	1c4249c99d	Update medbeam.dm	2020-07-24 00:57:30 -07:00
silicons	f47a7449e3	Update gun.dm	2020-07-23 18:52:23 -07:00
silicons	0b4185e26f	Update beam_rifle.dm	2020-07-23 18:52:18 -07:00
silicons	ce18584fb1	Update beam_rifle.dm	2020-07-23 18:47:22 -07:00
silicons	99737b6e11	Update projectile.dm	2020-07-23 18:35:32 -07:00
Lin	1f7488aad2	Merge pull request #12821 from Citadel-Station-13/silicons-patch-36 ... Increases projectile speed across the board by around 40-45%	2020-07-23 13:41:17 -05:00
silicons	ffd44b78ba	Merge remote-tracking branch 'citadel/master' into clickcd_experimental	2020-07-23 10:26:03 -07:00
silicons	2eb6f0467d	fix guns	2020-07-23 09:56:38 -07:00
silicons	38a9e89687	ok bet	2020-07-23 09:49:56 -07:00
silicons	0858af4b85	ok	2020-07-23 09:43:43 -07:00
silicons	76f885e1a6	ok	2020-07-23 00:16:43 -07:00
silicons	3ed854bdb3	Update gun.dm	2020-07-21 19:38:38 -07:00
silicons	3a83c526b6	Update gun.dm	2020-07-21 19:36:37 -07:00
silicons	4d48abf3a6	fixes	2020-07-21 11:46:17 -07:00
silicons	98d3ac80d9	:pika:	2020-07-20 11:25:17 -07:00
silicons	984796b8c6	sigh	2020-07-20 10:46:52 -07:00
silicons	20381927e4	Update projectile.dm	2020-07-18 19:18:42 -07:00
Timothy Teakettle	1a5008fee7	Merge branch 'master' into wound-port	2020-07-18 23:06:49 +01:00
Timothy Teakettle	974b80a2fd	Merge branch 'master' into wound-port	2020-07-18 21:45:24 +01:00
timothyteakettle	e8fade4f7f	changes	2020-07-18 02:29:12 +01:00
timothyteakettle	7714fcfaba	more changes	2020-07-18 01:26:38 +01:00
silicons	993b4ec222	Merge remote-tracking branch 'citadel/master' into unarmed_parry	2020-07-16 19:39:46 -07:00
Letter N	2afab07b4a	https://github.com/tgstation/tgstation/pull/52255	2020-07-16 20:05:37 +08:00
timothyteakettle	03bd806c73	pickle	2020-07-16 02:51:07 +01:00
silicons	6cbab55ef8	Merge remote-tracking branch 'citadel/master' into unarmed_parry	2020-07-07 21:07:58 -07:00
silicons	6ee63f66aa	whew	2020-07-07 20:48:54 -07:00