4632 Commits

Author	SHA1	Message	Date
Chinsky	bad385e1d1	Merge pull request #6791 from Zuhayr/dev ... Removes references to the Syndicate and renames nuclear emergency mode.	2014-10-21 01:13:17 +04:00
GinjaNinja32	c5bba7f3a5	Re-move resource update	2014-10-20 17:26:55 +01:00
mwerezak	9afd8fe3c5	Fixes radio code conflict with galactic common	2014-10-19 21:52:04 -04:00
Chinsky	3796c034f3	Merge branch 'master' of https://github.com/Baystation12/Baystation12 into master-dev ... Conflicts: icons/mob/head.dmi icons/obj/clothing/hats.dmi maps/tgstation2.dmm	2014-10-20 04:52:45 +04:00
Chinsky	61e50ab72a	Merge pull request #6790 from mwerezak/robot-radio ... Fixes robot radio component not using power	2014-10-20 03:53:10 +04:00
Chinsky	f0413bd9f6	Merge pull request #6787 from mwerezak/robot-camera ... Alternate fix to #6705	2014-10-20 03:52:32 +04:00
Chinsky	b6df8111eb	Merge pull request #6798 from PsiOmegaDelta/pAI ... pAI inquirer fix	2014-10-20 03:50:52 +04:00
Chinsky	f1f730894c	Merge pull request #6789 from mwerezak/binary-talk ... Allows properly keyed radios to broadcast in robot talk and/or hivemind + some cleanup	2014-10-20 03:50:12 +04:00
PsiOmega	ff90d835d4	pAI inquirer fix ... pAI inquirer was never set, leading to a slightly grammatically incorrect request message.	2014-10-19 18:09:45 +02:00
Zuhayr	99ff852e46	Removes references to the Syndicate and renames nuclear emergency mode.	2014-10-19 16:05:40 +10:30
mwerezak	9424d892ba	Fixes robot radio component not using power ... Also shifts power usage so binary talk uses less power while radio uses more.	2014-10-19 00:50:13 -04:00
mwerezak	b508098ba9	Fixes robot camera deactivation not kicking viewers	2014-10-18 23:07:36 -04:00
Zuhayr	bb0aa868f7	Amends a previous commit.	2014-10-18 08:42:28 +10:30
Zuhayr	678b278b12	Fixes #6683	2014-10-18 08:40:24 +10:30
Zuhayr	bce2059422	Fixes #6689	2014-10-18 08:37:23 +10:30
Zuhayr	96be563434	Fixes #6740	2014-10-18 08:03:46 +10:30
Zuhayr	08ca8e192a	Fixes #6764	2014-10-18 07:38:33 +10:30
Zuhayr	9eb2809afb	Fixes #6765	2014-10-18 07:34:46 +10:30
Hubblenaut	5cf2281db6	Hotfix for broken damage reading	2014-10-17 21:04:08 +02:00
PsiOmega	c4a9293727	HUD overlay improvements ... Reduces code duplication, increases code robustness, adds science googles overlay.	2014-10-17 20:27:40 +02:00
DJSnapshot	92ed4e5609	xenos need to hiss too	2014-10-16 22:09:48 -07:00
DJSnapshot	7ddd61b45c	sanity check on facehuggers.	2014-10-16 21:56:43 -07:00
DJSnapshot	fc45762f18	removing world debug message.	2014-10-16 21:19:01 -07:00
Zuhayr	70dd21ab4c	Fixes #6704	2014-10-16 15:04:47 +10:30
Zuhayr	9563a54c7d	Fixes #6725	2014-10-16 14:38:51 +10:30
Zuhayr	87e0d89e58	Fixes #6726	2014-10-16 14:06:30 +10:30
Zuhayr	ca68281371	Fixes #6727	2014-10-16 14:06:16 +10:30
Zuhayr	adb58be3b0	Fixes #6728	2014-10-16 14:02:10 +10:30
Zuhayr	ff9bd99ee7	Fixes #6731	2014-10-16 13:51:25 +10:30
Zuhayr	b611d6515a	Fixes #6732	2014-10-16 13:48:26 +10:30
Mloc	be7d30630d	Merge pull request #6697 from Zuhayr/dev-freeze ... Xenos fixes, dev freeze fixes.	2014-10-13 22:25:22 +01:00
Miniature	894ae39f7f	Fix for everyone dying if they don't eat	2014-10-14 05:36:47 +10:30
Zuhayr	01ddc9af6d	Added binary to the AI.	2014-10-13 17:39:00 +10:30
Zuhayr	4c070bad02	Bunch of xeno fixes, details in PR.	2014-10-13 17:32:13 +10:30
Zuhayr	c5e2fa74e6	Fixes #6689	2014-10-13 17:16:23 +10:30
Zuhayr	06ad91f417	Fixes #6695	2014-10-13 17:00:26 +10:30
Zuhayr	45d6d6a610	Added Galactic Common to the AI.	2014-10-13 16:45:58 +10:30
Snapshot	9a706864b3	Merge pull request #6688 from Zuhayr/dev-freeze ... Dev freeze fixes	2014-10-12 18:07:34 -07:00
Zuhayr	fa51820244	Fixes #6684	2014-10-13 11:19:12 +10:30
Zuhayr	9c39936640	Fixes #6682	2014-10-13 11:10:46 +10:30
DJSnapshot	b53a89e608	disable typing indicator.	2014-10-12 17:22:30 -07:00
Zuhayr	413af81b80	Fixes humans being able to shred everything with their teeth.	2014-10-12 13:28:46 +10:30
Zuhayr	c9e948095c	Thought I had done these before, turned out I did. Single-linebreak conflicts woo.	2014-10-12 11:55:33 +10:30
Zuhayr	5989a0c625	Alien attack_hand() conflicts out the wazoo. I thought I already did these but that may have been on an unmerged branch. Burn that bridge when I come to it.	2014-10-12 11:48:54 +10:30
Zuhayr	72924e80a5	Merge pull request #6666 from GinjaNinja32/nanoui ... Move NanoUI cache update to client/New()	2014-10-12 04:40:34 +10:30
Gamerofthegame	be8c62de7b	Merge	2014-10-11 13:58:16 -04:00
GinjaNinja32	08b967c9e0	Move NanoUI cache update to client/New()	2014-10-11 18:40:09 +01:00
Chinsky	513df67d5f	Merge pull request #6650 from mwerezak/grab ... Fixes #6647	2014-10-11 02:44:59 +04:00
Zuhayr	9b23315359	Fixes #6644	2014-10-11 07:44:48 +10:30
Zuhayr	92c92753fb	Manual icon file merge.	2014-10-11 06:40:36 +10:30