606 Commits

Author	SHA1	Message	Date
Cheridan	15439b8c4e	Merge branch 'ObjProcessingFix' of git://github.com/phil235/-tg-station into phil235-ObjProcessingFix ... Conflicts: code/game/gamemodes/wizard/artefact.dm	2015-02-15 10:27:50 -06:00
Cheridan	6de520bbb2	Merge pull request #7710 from phil235/JitterFix ... Add a do_jitter_animation proc	2015-02-14 16:23:18 -06:00
Cheridan	47a631b1c7	Merge pull request #7713 from paprka/wotdefuk ... fixes improvised shotgun back slot invisible shit	2015-02-14 16:01:39 -06:00
phil235	135293bedf	Fixes object processing list by replacing "SSobj.processing.Add" by "SSobj.processing |= " to avoid having duplicated objects in the list, meaning the objects would be processed more than once per iteration. ... Fixes Alien embryo processing that was processed twice.	2015-02-14 14:18:49 +01:00
Swag McYolosteinen	1aa7f423e9	Merge pull request #7720 from Iamgoofball/patch-32 ... fixes #7719	2015-02-14 12:14:17 +01:00
Swag McYolosteinen	b2d6ce5481	Merge pull request #7668 from dannno/suicidefix ... Fixes #7647	2015-02-14 12:12:38 +01:00
Iamgoofball	a51ffe8cd4	fixes #7719 ... welp	2015-02-13 20:08:01 -08:00
Cheridan	14c9abaaee	Merge pull request #7539 from Iamgoofball/kinetic ... Ports the kinetic accelerator changes from NT	2015-02-13 17:56:03 -06:00
paprka	cff73d83c6	fixes improvised shotgun back slot invisible shit	2015-02-13 14:04:23 -08:00
phil235	5b7a0b0358	Fixed the jitter effect of the taser (it was broken). Hulks now don't jitter when stunned but scream. Humans and monkeys jitter immediately after getting tazed and only fall after 2 seconds.	2015-02-13 22:53:47 +01:00
dannno	db0fd07f0f	fixes blowing your brains out without a gun	2015-02-12 15:05:45 -05:00
Cheridan	566fd07593	Merge pull request #7651 from paprka/tacticalfleshlight ... makes flashlight attaching more modular	2015-02-12 07:55:26 -06:00
Remie Richards	6613851028	Merge pull request #7593 from Cheridan/pin_fix ... Pin fixes, additions	2015-02-12 06:43:11 +00:00
dannno	b34c5180ae	modifies and fixes suicide messages for guns and bananas	2015-02-11 22:39:11 -05:00
paprka	eabbd88858	makes flashlight attaching more modular	2015-02-10 14:17:57 -08:00
dannno	54f1d333d7	Adds a slurring filter, replaces stutter filter where appropriate	2015-02-10 16:39:17 -05:00
Swag McYolosteinen	e5e8b27790	Merge pull request #7491 from paprka/simplyepicbuff ... Removes range from ebow bolts + price revert + bugfix	2015-02-10 17:15:44 +01:00
Cheridan	3da8f70e4d	fixes #7608	2015-02-07 20:48:50 -06:00
Cheridan	2b880ff4ff	honk	2015-02-07 10:12:40 -06:00
Cheridan	6d3584fa63	Pin Fixes ... Implant pins now require the actual specific implant instead of allowing any implant at all.	2015-02-07 09:43:03 -06:00
Steelpoint	ea3bb2e80b	Merge branch 'master' of https://github.com/tgstation/-tg-station into SecBorgDisabler ... Conflicts: code/modules/research/designs/mechfabricator_designs.dm	2015-02-06 13:19:15 +08:00
Iamgoofball	791381394c	Ports the kinetic accelerator changes from NT	2015-02-03 21:19:30 -08:00
paprka	53a1590a9e	fixes ebow sound when reloading	2015-02-03 14:48:04 -08:00
Cheridan	5f884b6017	Merge pull request #7496 from dannno/killyoselfmyman ... Adds proper suicide messages to like a lot of stuff	2015-02-03 16:43:09 -06:00
paprka	18a90495b2	updates to ERT stuff	2015-02-02 03:33:37 -08:00
paprka	8173cd2460	fixes pulse rifles not being emp proof apparently	2015-02-01 23:27:56 -08:00
paprka	f6be6754ae	readds the stun revolver (oops)	2015-02-01 21:32:51 -08:00
paprka	a5dcd1abd8	improves ert spawning and centcomm	2015-02-01 21:16:11 -08:00
paprka	55bdca20da	Merge branch 'master' of https://github.com/tgstation/-tg-station into gunstuff	2015-02-01 18:22:02 -08:00
dannno	c48bf44a47	framework for a future "suicide hotline" job	2015-02-01 19:44:54 -05:00
dannno	a0b2e72b4c	gun suicide messages	2015-02-01 11:04:40 -05:00
paprka	6108f10b63	removes range from ebow bolts	2015-02-01 03:56:23 -08:00
Swag McYolosteinen	d5ccc9cffe	Merge pull request #7436 from Incoming5643/WaitingForTheSun ... Fixes #6885	2015-02-01 12:46:16 +01:00
paprka	453a3db196	etc	2015-01-30 23:18:02 -08:00
Cheridan	9eb4e67d58	Merge pull request #7412 from paprka/capwazer ... adds unique inhands for the captain's laser	2015-01-30 14:07:12 -06:00
Incoming	31b84ca71f	changes how the bolt of door creation works so it behaves expectedly on shuttles ... adds butterflies to the staff/wand of change/polymorph since I'm here. Removes two colons	2015-01-29 16:30:31 -05:00
paprka	e5b4a32cc4	adds unique inhands for the captain's laser	2015-01-28 16:37:03 -08:00
Steelpoint	4262a1c89c	WrongDescription	2015-01-27 20:37:00 +08:00
Steelpoint	f279e0754b	MisplacedLine	2015-01-27 17:47:25 +08:00
Steelpoint	8b78853c68	Tweaking	2015-01-27 17:43:13 +08:00
Steelpoint	359514e239	SecBorgDisabler	2015-01-27 17:24:13 +08:00
Cheridan	b28d1773a3	Fixes firing pins replicating original lockbox anti-melee functionality.	2015-01-26 16:23:25 -06:00
Cheridan	8c893f6aca	Merge pull request #7065 from phil235/GibtoniteLogFix ... Gibtonite log fix	2015-01-25 00:29:18 -06:00
Swag McYolosteinen	ab0518ef55	Merge pull request #7203 from Delimusca/theyshootback ... Night of the living deathwands	2015-01-24 13:55:09 +01:00
Swag McYolosteinen	de47d7cea6	Merge pull request #7298 from paprka/fixlmg ... fixes borg lmg	2015-01-24 12:49:47 +01:00
paprka	3430cfaf44	Merge branch 'master' of https://github.com/tgstation/-tg-station into jamesbondiguess ... Conflicts: code/modules/projectiles/guns/projectile/automatic.dm	2015-01-23 16:55:52 -08:00
Swag McYolosteinen	d19f48fe15	Merge pull request #7265 from Firecage/ProtoSMGpin ... Fixes proto SMG having a firing pin.	2015-01-23 17:48:21 +01:00
Swag McYolosteinen	10ea66cb6b	Merge pull request #7164 from Steelpoint/ERTBalanceV1 ... [BALANCE|FIX]ERT Balance Pass: 1 + Minor Ops Ship Fix	2015-01-23 17:16:33 +01:00
paprka	d96c9c2fdd	fixes borg lmg	2015-01-23 02:57:52 -08:00
paprka	c41e707ee4	restores the ability to attach suppressors	2015-01-22 18:53:46 -08:00