5537 Commits

Author	SHA1	Message	Date
paprka	64bc2abec3	sprite and fix	2014-08-07 14:52:40 -07:00
paprka	726b939754	whole bunch of gun stuff	2014-08-07 14:39:31 -07:00
paprka	d41a469ff4	Merge branch 'master' of https://github.com/tgstation/-tg-station into goodbyedeadspace ... Conflicts: code/game/mecha/mecha.dm	2014-08-06 15:22:56 -07:00
Alex	c79b9fe6bf	Merge pull request #4336 from Incoming5643/bluepanties ... Magic Mania 1⅔: Fixes #4335	2014-08-06 10:41:07 +01:00
Incoming	879f5d7c0e	Changed it!	2014-08-05 19:51:08 -04:00
Incoming	4e91b2b655	Simplifies the species picking ... Adds an update_icons() to minimize the effects of #4252, but it's still a problem	2014-08-05 14:11:45 -04:00
Alex	bec4e856ca	Merge pull request #4327 from Aranclanos/clickcooldowndefine ... Defines for click cooldown numbers and click cooldown for paper camera spam.	2014-08-05 10:22:52 +01:00
Alex	4bcb228ea3	Merge pull request #4320 from MrPerson/MM7_Junk_Man ... Fixes that "temporary black screen on deletion" issue for disposals	2014-08-05 10:22:15 +01:00
Incoming	2283b303ac	Fixes #4335 ... Readds the 1/12 chance of stumbling out the bolt of change fully human with no mutantrace. It must have gotten lost during the mutantrace datumizing	2014-08-04 17:51:33 -04:00
Alex	7946e96fcb	Merge pull request #4326 from Aranclanos/strippanel ... Strip panel.	2014-08-04 09:26:24 +01:00
Alex	ff84e58ad6	Merge pull request #4321 from Incoming5643/tincans ... Fixes #2738	2014-08-04 09:24:47 +01:00
Aranclanos	ccae5781c5	added two defines CLICK_CD_RANGE and CLICK_CD_MELEE (4 and 8), replaced all changeNext_move() procs to use these two defines. ... Added melee click cooldown for paper spam on cameras.	2014-08-03 22:14:56 -03:00
Aranclanos	f5ee1a573a	The set internals button on the strip panel will properly appear if it's on the exosuit. ... The strip panel should be prettier now.	2014-08-03 17:59:56 -03:00
Incoming	ac0a1d1813	Fixes #2738 ... Only 6 months later than I could have fixed it! #FreeTheTinCans	2014-08-02 23:29:41 -04:00
MrPerson	7473daf467	Fixes that "temporary black screen on deletion" issue for disposals	2014-08-02 18:47:00 -07:00
MrPerson	5b0aba0e67	Merge pull request #4262 from kyrahabattoir/ItemNameFixing07-2014 ... Another lowercasing pass on a bunch of items and furnitures.	2014-08-02 18:02:50 -07:00
Alex	1e6603a2b7	Merge pull request #4289 from cookingboy3/asay ... Admin notification when emitter loses power.	2014-08-01 09:24:45 +01:00
KyrahAbattoir	1b2c95a81c	Merge branch 'master' into ItemNameFixing07-2014	2014-07-31 18:54:38 +02:00
Jordie0608	b2641f9af6	Adds away missions to readme.md	2014-07-31 21:54:55 +10:00
cookingboy3	64131818d8	fix for #4243, adds notification ... squashed commits	2014-07-30 11:00:31 -07:00
paprka	265b4db7d4	one more pass	2014-07-29 16:59:20 -07:00
paprka	eea9ae50ad	merging	2014-07-29 16:50:21 -07:00
paprka	23a8609d99	typo!	2014-07-29 16:32:43 -07:00
paprka	21768c5ab0	indentations and such	2014-07-29 11:46:31 -07:00
paprka	d992c907c6	goodbye rigsuits my old friends	2014-07-29 11:43:34 -07:00
Cheridan	9f4c87bc7c	Merge pull request #4269 from Firecage/metroidbegone ... Metroid-be-gone	2014-07-28 20:17:03 -05:00
Firecage	61efb7f100	METROID FUCK OFF	2014-07-28 21:52:55 +02:00
Alex	93c23f9c35	Merge pull request #4261 from Firecage/Bookcasefix ... Fixes bookcase menu	2014-07-28 19:42:05 +01:00
Alex	aed0c7cc4f	Merge pull request #4260 from Firecage/Chamjumpsuit ... Removed object verb from Chameleon jumpsuit.	2014-07-28 10:01:17 +01:00
KyrahAbattoir	fcb2fb9de3	Another lowercasing pass on a bunch of items and furnitures. ... Synthflesh should be a plural. Leg cuffs is better than legcuffs. LaserTag -> laser tag is not a brand name. centcom -> Centcom is always capitalised.	2014-07-27 19:14:40 +02:00
Firecage	ac978dc8e4	Metroid-be-gone	2014-07-27 19:02:49 +02:00
MrPerson	a08053e0e5	Make holocarp not constantly take damage ... Someone got min and max mixed up!	2014-07-26 16:39:50 -07:00
Alex	45c33db77d	Merge pull request #4020 from caelaislinn/bugfix ... Various bugfixes	2014-07-26 17:59:07 +01:00
Firecage	ef1cce3c9d	Fixes bookcase menu	2014-07-26 17:44:17 +02:00
Firecage	c31bf9e223	Removed object verb from Chameleon jumpsuit.	2014-07-26 17:00:55 +02:00
Alex	90c97375e3	Merge pull request #4193 from A-t48/PrisonButton ... Fix #4164: Non-functional admin prison button	2014-07-25 09:25:05 +01:00
Alex	6da164fa57	Merge pull request #4194 from A-t48/AdminMeteorConfirm ... Fix #3738 Admin spawned meteors has no announcement confirmation	2014-07-25 09:24:46 +01:00
Alex	80b1e03c91	Merge pull request #4216 from Firecage/Foodstuffssss ... Making food code less bloated and messy.	2014-07-25 09:24:11 +01:00
Alex	3ecf0fcc04	Merge pull request #4203 from MrPerson/track_bugs ... AI Tracking bugfixes	2014-07-25 09:23:54 +01:00
Firecage	77d15a6c5b	Moar restructuring	2014-07-23 06:10:21 +02:00
Cheridan	1e7a737a06	Merge pull request #4145 from Ergovisavi/faction_check ... Changes faction to list	2014-07-22 19:10:53 -05:00
Kyle Franz	93a76deb27	Clean up prison button code a bit ... Add nicer confirmation message Change access restriction from FUN to admins Remove paralyzation\sleep	2014-07-22 12:43:32 -07:00
Firecage	05662a1f23	Also some dividing shit. Fuck centcom	2014-07-22 17:31:26 +02:00
Firecage	4f2dbf2868	Making food code less bloated and messy.	2014-07-22 16:47:06 +02:00
Alex	1410641259	Merge pull request #4152 from paprka/fugfix ... Fixes security 'preview' sprites in setup	2014-07-22 15:17:05 +01:00
Alex	172322c0ad	Merge pull request #4192 from paprka/sleepyfix ... Fixes miauw's parapen laziness	2014-07-22 15:16:46 +01:00
Alex	51e46ef80a	Merge pull request #4211 from Firecage/AIcode ... Fixes AI code a bit >.>	2014-07-22 15:16:27 +01:00
Cheridan	792ada6990	Merge pull request #4123 from Rolan7/Issue_4045 ... Glowshroom and irrigation fix	2014-07-21 08:40:38 -05:00
Cheridan	f6b9fef747	Merge pull request #4184 from paprka/xtraperiods ... Removes extra periods from (ban) [reason]	2014-07-21 08:34:50 -05:00
Firecage	c0c9702c13	Fuck fucking spaces	2014-07-21 14:56:23 +02:00