906 Commits

Author	SHA1	Message	Date
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
Ghommie	83a08ee9f5	Extras and tg#45018	2020-02-07 05:21:08 +01:00
Ghommie	0703c6eea6	First tweak to cargo reagents selling.	2020-02-06 22:34:54 +01: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	3d7fef76f3	Update sniper.dm	2020-02-05 05:57:16 -07:00
kevinz000	67489d62d4	Update projectile.dm	2020-02-05 05:56:31 -07:00
Ghommie	5dc1de1d04	Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit229	2020-02-05 04:34:54 +01:00
kevinz000	6a8a606f97	Merge remote-tracking branch 'citadel/master' into mobility_flags	2020-02-04 16:01:25 -07: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
Ghommie	95db5084ab	Screw commit history.	2020-02-02 01:26:04 +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
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