761 Commits

Author	SHA1	Message	Date
Ghom	a7d29ae830	Merge pull request #10973 from Trilbyspaceclone/put-a-pin-in-it ... Station Locked firing pins	2020-02-13 09:42:22 +01:00
Ghom	500ed0dd57	Merge pull request #10955 from Citadel-Station-13/kevinz000-patch-10 ... refactors and changes up gravity gun projectiles a bit	2020-02-13 09:39:26 +01:00
kevinz000	f1e0c62141	Update gravity.dm	2020-02-12 23:59:03 -07:00
Trilbyspaceclone	49a7657404	Correction ... Co-Authored-By: Ghom <42542238+Ghommie@users.noreply.github.com>	2020-02-12 14:26:29 -05:00
Ghom	af477aa28b	Merge pull request #10992 from Hatterhat/buckbuff ... buckshot buff - 60 to 75 on all pellet pointblank	2020-02-12 10:34:25 +01:00
Trilbyspaceclone	a4a128f9dd	Ok? ... Co-Authored-By: Ghom <42542238+Ghommie@users.noreply.github.com>	2020-02-11 15:55:54 -05:00
Hatterhat	1d071ff127	one off	2020-02-10 21:40:51 -06:00
kevinz000	d406086258	Update gravity.dm	2020-02-10 04:26:26 -07:00
kevinz000	0b28e17860	Update gravity.dm	2020-02-10 04:13:59 -07:00
kevinz000	45bec21520	fix sync	2020-02-10 04:01:21 -07:00
Hatterhat	d24afcde1b	pb burst from 60 to 81	2020-02-09 19:07:24 -06:00
Arturlang	29207b22fb	Merge branch 'master' into debug_outfit_updates	2020-02-09 22:05:26 +02:00
Ghom	2a0ba12896	Merge pull request #10952 from Citadel-Station-13/kevinz000-patch-11 ... gun qdel fix	2020-02-09 02:53:38 +01:00
TrilbySpaceClone	612b5c5da3	better name	2020-02-08 03:27:43 -05:00
TrilbySpaceClone	5dbfc9a514	Yay	2020-02-08 03:25:09 -05:00
kevinz000	c6c1cc484c	slight buff	2020-02-07 23:40:02 -07:00
kevinz000	826ed7d4f2	o k.	2020-02-07 23:39:09 -07:00
kevinz000	7c16830e91	ok	2020-02-07 23:31:38 -07:00
kevinz000	f8d5eae0c3	Update gravity.dm	2020-02-07 16:24:12 -07:00
Ghom	71f44a7085	Merge pull request #10892 from kevinz000/small_guncode_refactor ... Small guncode refactor but it works	2020-02-07 23:13:21 +01:00
Lin	5717700146	Merge pull request #10925 from Ghommie/Ghommie-cit558 ... runtime is forever, errors are eternal.	2020-02-07 17:29:49 +00:00
kevinz000	673079f995	Update gravity.dm	2020-02-07 03:31:15 -07:00
kevinz000	b5d6afac9a	Update gravity.dm	2020-02-07 03:20:45 -07:00
kevinz000	4f2acb6298	Update gun.dm	2020-02-07 00:08:19 -07:00
kevinz000	ae199cee28	Update beam_rifle.dm	2020-02-06 23:49:36 -07:00
kevinz000	353c13631a	Update beam_rifle.dm	2020-02-06 23:34:33 -07:00
Artur	c9dc35fd9a	Updates the debug outfit	2020-02-06 18:42:23 +01:00
Ghommie	233ed5873f	race conditions and turfs beings special.	2020-02-06 01:13:28 +01:00
Ghommie	7e2ad2b71f	Fixing accidental nerfs to the magpistol.	2020-02-05 18:45:15 +01: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
kevinz000	275b1f73e0	Merge pull request #10849 from Ghommie/Ghommie-cit547 ... Removing a troublesome argument from organ/Remove() in favor or using the 'owner' variable	2020-02-04 03:39:14 -07:00
kevinz000	54d70cd9fe	Update gun.dm	2020-02-03 18:33:24 -07:00
Ghommie	a365f3b499	Demodularize and nerfs mag rifles with re(?)added power cell requirements.	2020-02-03 05:16:32 +01:00
Ghommie	8de11845d5	Removing a troublesome argument from organ/Remove() in favor or using the 'owner' variable	2020-02-02 03:39:49 +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
Ghom	74ad10355c	Merge pull request #10805 from Citadel-Station-13/i-hate-dueling ... guns/ammo/projectiles now properly clean up while being deleted	2020-02-01 18:52:47 +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
necromanceranne	66862db7ab	Last change to this, now the damage is respected by energy armor	2020-02-01 14:07:23 +11:00
kevinz000	0d15a0ec8b	Update projectile.dm	2020-01-31 01:26:48 -07:00
kevinz000	885b22371b	Update _ammunition.dm	2020-01-31 01:25:39 -07:00
kevinz000	9e08f8bed7	Update energy.dm	2020-01-31 01:23:38 -07:00
kevinz000	fe5a83ea52	Update gun.dm	2020-01-31 01:22:53 -07:00
kevinz000	97caad18c5	Update dueling.dm	2020-01-31 01:18:43 -07: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