642 Commits

Author	SHA1	Message	Date
kevinz000	fb936a5319	Merge pull request #9598 from deathride58/runtimefixpass ... various runtime fixes - plasmaman tongues no longer have a maxHealth of "alien" and more	2019-10-29 21:41:11 -07:00
kevinz000	0064529362	Merge pull request #9610 from Ghommie/Ghommie-cit273 ... ports anti-magic component code updates (holymelon sold separately).	2019-10-29 21:26:03 -07:00
kevinz000	fc073748ec	Merge pull request #9644 from Ghommie/Ghommie-cit284 ... Fixes a few issues with PKA mods.	2019-10-29 21:21:42 -07:00
Ghommie	8c4e031a1b	atom/movable's Destroy() calls MoveToNullSpace() which calls Exited(), thus handle_atom_del() is redunant.	2019-10-28 17:59:32 +01:00
Ghommie	68b1583a1a	Fixing PKA mod double installation et similars.	2019-10-28 17:47:29 +01:00
BlackMajor	6a7a121d56	Merge pull request #8856 from Citadel-Station-13/magrifles_again ... Security Gun Rebalancing Electric Boogaloo - overhauls magrifles/magpistols, burst fire autorifles, nerfs laser carbines, resprites energy guns	2019-10-28 16:47:02 +13:00
deathride58	c1742c0572	applies ghommie's suggested change ... Co-Authored-By: Ghom <42542238+Ghommie@users.noreply.github.com>	2019-10-27 20:41:44 -04:00
Ghommie	80cd4902ca	Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit273	2019-10-28 00:49:22 +01:00
kevinz000	da502aa31d	Merge pull request #9535 from Ghommie/Ghommie-cit247 ... Fixing sniper rifles scope datum action oddity.	2019-10-24 19:05:25 -07: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
Ghommie	ad7101d0aa	ports anti-magic component code updates (holymelon not included).	2019-10-25 03:20:42 +02:00
kevinz000	31f9ed9665	fixes	2019-10-24 15:31:45 -07:00
Ghommie	4c8d7023c5	Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit258	2019-10-24 09:50:20 +02:00
deathride58	0ae8953da9	various runtime fixes - plasman tounges no longer have a maxhealth value of "alien", simplemobs no longer runtime when shot, removing filters from something that lacks filters now works	2019-10-24 02:52:40 -04:00
Linzolle	9250b1c103	big uppdate season	2019-10-23 21:08:47 -05:00
kevinz000	9d78d8a259	Merge branch 'master' into magrifles_again	2019-10-23 17:57:19 -07:00
deathride58	f85f110baa	Merge pull request #9047 from Poojawa/syntheticbloods ... RGB Blood Reworks + Blood generator	2019-10-23 20:54:55 -04:00
Ghommie	fc1f10c97f	Porting components updates and fixing phantom thief component.	2019-10-23 13:01:31 +02:00
nik707	107bb36253	Merge pull request #9566 from Citadel-Station-13/kevinz000-patch-104 ... Fixes neurotoxin stunning non-carbons	2019-10-22 16:47:53 -05:00
Poojawa	7463bbc001	Merge branch 'master' into syntheticbloods	2019-10-21 21:06:18 -05:00
deathride58	f7cf10853e	Merge pull request #8894 from Citadel-Station-13/tgfusion ... T G F U S I O N	2019-10-21 21:17:16 -04:00
BlackMajor	cebdc1414f	Merge pull request #9540 from YakumoChen/laser-minigone ... Reverts #9189 (Laser Minigun)	2019-10-22 13:36:45 +13:00
Poojawa	6fc750dca0	Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods	2019-10-21 19:13:19 -05:00
kevinz000	69a125d996	Update neurotoxin.dm	2019-10-21 14:41:40 -07:00
kevinz000	838575da50	Merge pull request #9503 from deathride58/tasernerf ... Taser rework - Gives electrodes a debilitating status effect, makes disabler the default taser mode, and more	2019-10-21 00:59:58 -07:00
kevinz000	c6c2a703e5	Merge remote-tracking branch 'origin/master' into magrifles_again	2019-10-21 00:47:03 -07:00
YakumoChen	e39a087dc8	remove beam	2019-10-20 03:09:32 +00:00
YakumoChen	6a5d1c20bd	delete minigun	2019-10-20 03:08:20 +00:00
YakumoChen	61bc735ee7	remove gatling laser	2019-10-20 03:07:23 +00:00
Ghommie	fe71e2984c	Fixing sniper rifles scope datum action oddities.	2019-10-19 16:40:01 +02:00
Ghommie	e991328087	progress	2019-10-19 15:02:56 +02:00
Poojawa	ffeae20daa	Merge remote-tracking branch 'Citadel-Station-13/master' into syntheticbloods	2019-10-18 06:01:52 -05:00
Thalpy	597160ca15	Fixed werid stuff.	2019-10-15 14:17:36 +01:00
Thalpy	e115c456f3	Ohh I'm fixing	2019-10-15 13:41:49 +01:00
Thalpy	acc0ff8a17	Adds craftable extended mags	2019-10-15 12:37:35 +01: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
Poojawa	394c947d14	Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods	2019-10-11 23:10:45 -05:00
kevinz000	b0b274762c	Merge pull request #9441 from lolman360/whydowehave1000branches ... Ports /tg/ advanced surgerytools and tool defines.	2019-10-11 12:10:31 -07:00
Ghommie	689136fe94	Nerfs cyborg disabler to hold 25 shots rather than 43, just like a normal disabler.	2019-10-09 23:07:39 +02:00
lolman360	04521551f0	one commit wonder	2019-10-08 19:46:28 +11:00
Poojawa	3113074bfb	Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods	2019-10-08 02:55:32 -05:00
Ghommie	5232728ee7	Ports "Adds three new .38 ammo types", also lazily adding .357 AP	2019-10-07 05:25:47 +02:00
Fermi	89f3a01bc0	Merge branch 'master' into tg-Organ-port	2019-10-01 06:17:58 +01:00
Poojawa	117e5a409d	Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods	2019-10-01 00:05:44 -05:00
kevinz000	6e55fec7bd	Merge pull request #9189 from Sishen1542/gatling ... [READY] craftable laser minigun, because why not	2019-09-28 00:40:02 -07:00
kevinz000	6fa6502b75	Merge branch 'master' into tgfusion	2019-09-28 00:35:50 -07:00
Poojawa	f57bdc39a2	I still fucking hate components.	2019-09-23 02:03:37 -05:00
YakumoChen	e297dbd0a3	Update energy_gun.dm	2019-09-21 02:39:47 +00:00
Fermi	587568bf88	Merge branch 'master' into tg-Organ-port	2019-09-19 01:33:15 +01:00
Fermi	c23d6f0113	I missed an earlier port.	2019-09-17 01:08:37 +01:00