459 Commits

Author	SHA1	Message	Date
Ccomp5950	975433f898	Merge branch 'master' of github.com:Baystation12/Baystation12 into dev-freeze ... Conflicts: icons/mob/back.dmi icons/mob/mask.dmi	2014-01-30 12:14:44 -06:00
Zuhayr	2f36fb79bc	Fixes #4078	2014-01-30 23:31:50 +10:30
Zuhayr	eed21f3f5b	Fixes #4355	2014-01-30 21:27:44 +10:30
Ccomp5950	c028db481e	Merge branch 'master' of https://github.com/Baystation12/Baystation12 into dev-freeze ... Conflicts: code/modules/mob/living/carbon/monkey/diona.dm code/modules/reagents/Chemistry-Machinery.dm	2014-01-23 00:05:53 -06:00
Loganbacca	5827e5a022	Fixes #4296	2014-01-14 15:59:58 +13:00
Mloc	efa5a600e3	Merge pull request #4252 from RKF45/ears ... Tiny objects on ears	2014-01-10 13:47:10 -08:00
RKF45	16cc421e34	Tiny objects on ears	2014-01-09 23:45:08 +01:00
Bobylein	91fa949c3a	Allows Labcoats to store Bottles, Beakers, Pills, Pill Bottles and Papers in their suit slot. ... Conflicts: code/modules/clothing/suits/labcoat.dm	2014-01-08 19:35:34 +00:00
Zuhayr	2c492d8289	Using DNA2 files from master.	2014-01-03 11:19:40 +10:30
Zuhayr	1cddbeb180	Fix for ninja being unable to wear full-sized oxytanks.	2014-01-01 22:10:25 +10:30
Chinsky	bca1aa5bd4	Merge pull request #4096 from fauxki/dev ... RD Closet Changes	2013-12-23 04:39:46 -08:00
fauxki	a2f6d7919a	Removes RD dress from here, it's to be moved as a subsection of the RD unifrom.	2013-12-22 04:16:56 -08:00
fauxki	08758cfd6a	Adds in new alt RD uniform, as well as moves the RD Dress from the dress section to a subsection of RD uniform.	2013-12-22 04:16:24 -08:00
Chinsky	3604986aff	Merge pull request #4081 from fauxki/dev ... Gentleman's Outfit for wizard.	2013-12-21 19:45:38 -08:00
fauxki	ad41957f9d	Puts in a gray flatcap for the wizard. ... Adds in a fancy long jacket for him too.	2013-12-20 16:59:24 -08:00
fauxki	7c695eb9ba	Adds in the gentleman's suit for the gentlemanly wizard.	2013-12-20 16:58:34 -08:00
Zuhayr	bb602139b0	Merge pull request #4074 from fauxki/dev ... Centcom Update + Minor Updates	2013-12-20 10:35:57 -08:00
fauxki	6784e8e668	The dress is white, not orange.	2013-12-20 01:27:11 -08:00
Zuhayr	b0b038873f	Medical HUDs will now only show brainworms if the worm is controlling the host.	2013-12-19 11:00:21 +10:30
Zuhayr	c5849aaa96	Added cortical borers to the various HUDs.	2013-12-18 14:03:04 +10:30
DJSnapshot	a8eebd17d0	Grammar fix and fix to c45 being declared twice in boxes.dm	2013-12-08 12:25:00 -08:00
Chinsky	83d1924b83	Commiting SueTheCake's detective things. ... -New set of clothes spawning in the closet. -Replacement of revolver by semiauto gun, with update to autolathe recipies.	2013-11-27 04:10:06 +04:00
Mloc	d8683f2d39	Revert "Merge pull request #3965 from jack-fractal/dev" ... This reverts commit fa57b76f25, reversing changes made to 40ee2278ed. Signed-off-by: Mloc <colmohici@gmail.com>	2013-11-25 11:59:57 +00:00
jack-fractal	ce18d47778	Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into dev ... Conflicts: baystation12.int code/controllers/verbs.dm	2013-11-23 11:58:50 -05:00
Zuhayr	f359919623	Merge branch 'master' of https://github.com/Baystation12/Baystation12 into dev-freeze	2013-11-23 13:21:11 +10:30
jack-fractal	5df2797b86	Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into dev ... Conflicts: baystation12.int	2013-11-22 20:30:23 -05:00
Zuhayr	8400c73cc1	Nuke merge.	2013-11-23 00:44:19 +10:30
Zuhayr	507d4feb66	Reverting a half-fix that was put into master instead.	2013-11-23 00:41:25 +10:30
Zuhayr	c8c8e9d078	Removing species restriction on ninja gear.	2013-11-23 00:39:00 +10:30
Zuhayr	f11b964f6c	Fixes #3921	2013-11-22 23:10:06 +10:30
Zuhayr	ae0605db42	Merge branch 'master' of https://github.com/Baystation12/Baystation12 into dev-freeze	2013-11-22 22:18:44 +10:30
Ccomp5950	56a066ecfb	Bugfix(3937) Blindfolds cause permenent blindness ... Removed BLIND vision flag from the object as that is already handled in mob/living/carbon/human/life.dm Resolves #3937	2013-11-21 21:35:23 -06:00
Zuhayr	caee3a81e2	Adds sprites and skeleton definitions for species-specific Syndicate hardsuits.	2013-11-22 09:52:04 +10:30
ZekeSulastin	2a95cdd296	Scalpels also mangle gloves for nonhuman wear.	2013-11-20 17:07:05 -05:00
Iamgoofball	2be70afe8b	changed it so that only syndi-hardsuits only restrict vox	2013-11-19 23:12:41 -08:00
Iamgoofball	06719b5aa9	added a fuck ton of small changes	2013-11-19 23:00:07 -08:00
jack-fractal	cf5012ce1d	Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into dev	2013-11-17 16:30:42 -05:00
jack-fractal	b9f9e8a16f	Merge branch 'master' of https://github.com/Baystation12/Baystation12 into dev	2013-11-02 16:57:48 -04:00
DJSnapshot	6eedc4eb3f	Merge pull request #3832 from Nanai/dev ... Custom item fixes, Supermatter Crates.	2013-10-27 16:21:10 -07:00
Nanai	e4e1c66d4a	Added a supermatter crate and supermatter shard crate, with appropriate CE-only open access for cargo.	2013-10-27 19:17:45 -04:00
Kilakk	aee7286e6f	Merge remote-tracking branch 'upstream/master' into dev	2013-10-27 00:43:57 -04:00
jack-fractal	6764c54989	making a generic version of the AI's visibility code so that it can be reused by the Cult Spirits	2013-10-26 16:52:14 -04:00
Segrain	d8f0c43be1	Merge remote-tracking branch 'upstream/master' into dev-freeze	2013-10-24 19:02:56 +03:00
Segrain	5698addc75	Code cleanup.	2013-10-24 09:54:15 +03:00
Segrain	121b10b16c	Conflict fix.	2013-10-21 04:37:28 +03:00
DJSnapshot	4b8621bcef	Temporary patch so aliums can use magboots until the hardsuit rework gets merged.	2013-10-15 23:06:02 -07:00
Segrain	eb9a337d07	Merge remote-tracking branch 'upstream/master' into dev	2013-10-11 12:44:44 +03:00
Segrain	3d6791df81	Fix for pockets.	2013-10-11 10:22:58 +03:00
Chinsky	3c7c715e06	Merge pull request #3727 from fauxki/dev ... Dev - Lightswitches for Medbay / Beach Holodeck Update	2013-10-08 21:23:42 -07:00
Mloc-Argent	65f218ee63	Merge branch 'master' into dev-freeze ... Conflicts: code/ZAS/Fire.dm html/changelog.html maps/tgstation2.dmm Signed-off-by: Mloc-Argent <colmohici@gmail.com>	2013-10-08 22:01:16 +01:00