1101 Commits

Author	SHA1	Message	Date
Artur	435565f1d8	Merge remote-tracking branch 'origin/master' into TGUI_Updoot	2020-09-21 00:16:12 +03:00
silicons	1d8a030070	Update projectile.dm	2020-09-07 05:36:51 -07:00
silicons	9e204f167f	Merge pull request #12452 from Trilbyspaceclone/spike-loot-differentces ... Miner Loot Shuffle MK III	2020-09-06 01:58:46 -07:00
BlackMajor	8b59b4a80d	Merge pull request #13332 from Citadel-Station-13/silicons-patch-31 ... makes magweapons emp-immune	2020-09-06 18:05:34 +12:00
BlackMajor	75e38edb43	Merge pull request #13287 from Citadel-Station-13/revert-13122-haha ... Reverts load delays because it's still a problem and by god am I just done at this point	2020-09-06 18:01:09 +12:00
silicons	cbcacaa0af	Update magweapon.dm	2020-09-02 15:51:28 -07:00
Artur	d47a670f84	Cant put these on objects..	2020-09-02 19:10:35 +03:00
Artur	3bef4ba35e	TGUI updates + statpanel	2020-09-02 17:52:47 +03:00
Trilbyspaceclone	9c8f3305bb	Merge branch 'master' into spike-loot-differentces	2020-08-30 00:41:42 -04:00
silicons	05b5d39732	Update ballistic.dm	2020-08-29 21:38:45 -07:00
silicons	4a3b6054d3	Merge pull request #13266 from Ghommie/Ghommie-cit836 ... Fixing some mistakes with the priority overlays removal PR.	2020-08-29 21:22:44 -07:00
silicons	adc75a1d50	Merge branch 'master' into revert-13122-haha	2020-08-28 15:31:38 -07:00
Trilbyspaceclone	c4885d81f3	Merge branch 'master' into spike-loot-differentces	2020-08-27 03:41:14 -04:00
silicons	ff6beea525	rebalances shotgun shell stripper clips since no one else wants to (#13116) ... * Update volumetrics.dm * Update ammo_boxes.dm	2020-08-26 17:19:29 +02:00
Ghommie	2811f744e3	Fixing some mistakes with the priority overlays removal PR.	2020-08-26 14:00:35 +02:00
silicons	7737e76b32	Merge pull request #13224 from Ghommie/Ghommie-cit835 ... Removing priority overlays, update_icon() splitup for guns.	2020-08-22 15:19:07 -07:00
Ghom	cd10655985	fix 2	2020-08-20 23:02:13 +02:00
Ghommie	921a963e59	fix 1	2020-08-20 20:26:29 +02:00
Ghommie	fde859bca0	Removing priority overlays, update_icon() splitup for guns.	2020-08-20 18:33:23 +02:00
lolman360	ee4da21d38	Merge branch 'haha' of https://github.com/lolman360/Citadel-Station-13 into haha	2020-08-19 12:20:38 +10:00
lolman360	f35989b09e	Merge remote-tracking branch 'upstream/master' into haha	2020-08-19 12:20:07 +10:00
lolman360	5306da7938	Update code/modules/projectiles/guns/ballistic.dm ... Co-authored-by: silicons <2003111+silicons@users.noreply.github.com>	2020-08-19 12:02:53 +10:00
lolman360	09bba25050	Update code/modules/projectiles/boxes_magazines/_box_magazine.dm ... Co-authored-by: silicons <2003111+silicons@users.noreply.github.com>	2020-08-19 12:02:45 +10:00
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
silicons	50eca19658	Revert "load_delay var for /obj/item/ammo_box, nerfs shotgun stripper clips (hatter why'd you pr them)"	2020-08-17 20:20:04 -07:00
silicons	d35cba095f	Merge pull request #13108 from Hatterhat/357-dumdum ... .357 DumDum Rounds (they're adminspawn only don't worry)	2020-08-17 08:58:00 -07:00
silicons	384e5ae311	Merge branch '13167'	2020-08-16 18:51:48 -07:00
silicons	53fe2c95c5	Merge branch 'pr-13122'	2020-08-16 18:45:01 -07:00
Detective-Google	13f6df3991	nerfs plasma cutters	2020-08-14 19:38:14 -05:00
Trilbyspaceclone	1b61a5feb2	Merge branch 'master' into spike-loot-differentces	2020-08-12 15:10:37 -04:00
lolman360	3aba9eb5a6	kee	2020-08-12 15:11:55 +10:00
Hatterhat	eeefc1cbaa	heho woundies	2020-08-11 16:01:29 -05:00
lolman360	8c70b56706	whoops	2020-08-11 19:04:59 +10:00
lolman360	472ef6165f	imamurderer	2020-08-11 18:52:26 +10:00
silicons	a8d61b60ef	Merge pull request #13011 from timothyteakettle/insane-shot-eyepatch ... adds a cybernetic eyepatch to the syndicate uplink	2020-08-11 01:47:32 -07:00
Hatterhat	8370a31942	funny adminspawn wound bullets	2020-08-10 12:12:32 -05: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
TrilbySpaceClone	3ae10ac826	update?	2020-08-06 13:09:41 -04:00
timothyteakettle	a3b3e23bac	fix ricochets	2020-08-04 23:41:55 +01:00
Timothy Teakettle	ef53f3faea	the old system isnt needed really but sure i guess	2020-08-04 11:43:15 +01:00
Hatterhat	25ab96cf53	funny revolver reskins	2020-08-03 20:39:06 -05:00
Timothy Teakettle	91664f5064	bracket	2020-08-03 22:17:35 +01:00
Timothy Teakettle	3a0b34fb1b	funny aim go brr	2020-08-03 21:58:58 +01:00
Timothy Teakettle	8a3e69d32f	no more inaccuracy	2020-08-03 21:40:10 +01:00
Timothy Teakettle	2153f9ea35	i too, want people to be hit their ricochets	2020-08-03 17:36:40 +01:00
Trilbyspaceclone	e1e6198140	Merge branch 'master' into spike-loot-differentces	2020-08-03 10:53:08 -04:00
Timothy Teakettle	9b34407c9f	uplink	2020-08-03 15:27:17 +01:00