18591 Commits

Author	SHA1	Message	Date
Zuhayr	83570a1a9e	Merge branch 'materials' of https://github.com/Zuhayr/Baystation12 into dev	2015-05-16 23:35:05 +09:30
Zuhayr	150b24023e	Renamed kitchen utensils.	2015-05-16 21:24:36 +09:30
PsiOmegaDelta	65151ade35	Merge pull request #9298 from Kelenius/ofInflatablesAndDeflate ... Inflatables now lose deflate verb when it's used	2015-05-16 13:51:16 +02:00
PsiOmegaDelta	98fce1fa1e	Merge pull request #9301 from Kelenius/ofChemAndRuntime ... Fixes #9294	2015-05-16 13:47:05 +02:00
Zuhayr	f4923e2a20	Renamed twohanded weapons, collapsed bats.	2015-05-16 21:12:54 +09:30
Zuhayr	a32179a062	Renamed knives.	2015-05-16 20:54:34 +09:30
Zuhayr	8aa24b86bb	Renamed shards, katanas, claymores.	2015-05-16 20:36:33 +09:30
Zuhayr	0fb27e83b0	Preliminary file for material weapon system.	2015-05-16 20:14:35 +09:30
Zuhayr	f27ddd548f	Restructuring a bunch of files in prep for widespread path changes.	2015-05-16 20:09:28 +09:30
Zuhayr	966d797e07	Converts bat to use the material system.	2015-05-16 19:59:21 +09:30
Zuhayr	1de493c272	Fixes #9021	2015-05-16 18:45:31 +09:30
Kelenius	b4bfe917eb	Fixes #9294	2015-05-16 12:05:14 +03:00
Zuhayr	36acf64f18	Partial fix for #8825	2015-05-16 18:33:03 +09:30
Kelenius	af14ec1855	Inflatables now lose deflate verb when it's used	2015-05-16 11:43:30 +03:00
Zuhayr	edb1d501d6	Fixes #9217	2015-05-16 17:56:28 +09:30
Zuhayr	00855d636f	Fixes #8389	2015-05-16 17:54:21 +09:30
Zuhayr	e1a14e3c41	Removes xenoarch reconstitutors entirely. "Fixes" #5413	2015-05-16 17:40:49 +09:30
Zuhayr	7e14930209	Merge pull request #9249 from GinjaNinja32/new_tables ... Table rewrite	2015-05-16 17:32:47 +09:30
Zuhayr	5d51d0e423	Merge pull request #9267 from Hubblenaut/cameras ... Camera Rebalance	2015-05-16 17:28:29 +09:30
GinjaNinja32	76654321e4	Merge remote-tracking branch 'upstream/dev' into new_tables ... Conflicts: code/setup.dm	2015-05-16 08:53:33 +01:00
PsiOmegaDelta	38eb1ad7b9	Merge pull request #9263 from Hubblenaut/dev ... Cleans up access and map artifacts	2015-05-16 09:33:11 +02:00
Ccomp5950	10a8c56c5d	Merge pull request #9286 from Zuhayr/dev ... Fixes, clothes stripping refactor.	2015-05-16 00:53:14 -04:00
Zuhayr	f021467f8b	Merges two redundant procs.	2015-05-16 01:55:19 +09:30
Zuhayr	890693b839	Allowed accessories to function as custom items using icon_override	2015-05-16 01:37:04 +09:30
Zuhayr	8611499e87	Fixes #8842	2015-05-15 23:53:59 +09:30
Zuhayr	7535e027b9	Fixes #9192	2015-05-15 23:53:38 +09:30
Zuhayr	f65c4e95f6	Fixes #9060	2015-05-15 23:38:01 +09:30
Zuhayr	325bd42c66	Fixes #9233	2015-05-15 23:37:52 +09:30
Zuhayr	256c057608	Fixes #8376	2015-05-15 23:27:33 +09:30
Zuhayr	5b9eefdebf	Merge with dev.	2015-05-15 23:22:48 +09:30
Zuhayr	1e1471a601	Removes equip_e effect. Rewrites stripping, refactors cuffing. Fixes #8173.	2015-05-15 23:19:57 +09:30
Hubblenaut	4e3e5581f3	Extends janitor access	2015-05-15 15:36:51 +02:00
Hubblenaut	f9cbf1a1fd	Cleans up access and map artifacts	2015-05-15 15:36:48 +02:00
Zuhayr	624ffcff4c	Fixes #9239	2015-05-15 18:40:32 +09:30
Zuhayr	f3bd251f95	Fixes #9259	2015-05-15 18:29:44 +09:30
Zuhayr	624a6b0bca	Fixes #9250	2015-05-15 18:26:53 +09:30
Zuhayr	cb73d5b6e9	Fixes #9256	2015-05-15 18:23:00 +09:30
Kelenius	10915eae24	Merge branch 'dev' into ofChemistryAndStuff ... Conflicts: code/game/objects/effects/chem/chemsmoke.dm code/modules/customitems/item_defines.dm code/modules/projectiles/guns/launcher/syringe_gun.dm code/modules/reagents/Chemistry-Holder.dm code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Toxins.dm code/modules/reagents/reagent_containers/food/drinks.dm code/modules/reagents/reagent_containers/pill.dm maps/exodus-1.dmm	2015-05-15 11:28:05 +03:00
PsiOmegaDelta	68d85556d0	Merge pull request #9282 from Zuhayr/dev ... Fixes	2015-05-15 08:25:04 +02:00
PsiOmegaDelta	b963e807f6	Merge pull request #9273 from GinjaNinja32/grab_del ... Fixes grabs runtiming on qdel()	2015-05-15 08:22:52 +02:00
Zuhayr	fe3f169959	Fixes #9234	2015-05-15 13:53:01 +09:30
Zuhayr	30cda10bb3	Fixes #9226	2015-05-15 13:43:28 +09:30
Zuhayr	95ea7c110c	Fixes several wall issues.	2015-05-15 13:43:00 +09:30
GinjaNinja32	354859b889	Generalises shards, makes tables possibly create shards when falling apart, make tablesmash potentially give someone a faceful of broken glass if the table breaks	2015-05-15 04:47:18 +01:00
GinjaNinja32	21394e78c4	Merge remote-tracking branch 'upstream/dev' into new_tables	2015-05-15 00:12:40 +01:00
GinjaNinja32	363ce0a925	Fixes grabs runtiming on qdel()	2015-05-15 00:07:45 +01:00
GinjaNinja32	a3662a9088	Fixes, improvements, suggestions.	2015-05-15 00:06:47 +01:00
PsiOmegaDelta	4f40e92a95	Merge pull request #9272 from Mloc/nanoui ... better nanoui caching + fixes	2015-05-14 23:48:15 +02:00
Mloc	cfb51cf198	better nanoui caching + fixes ... Signed-off-by: Mloc <colmohici@gmail.com>	2015-05-14 22:35:50 +01:00
GinjaNinja32	63f28ee0e0	Fixes ... - Material comparisons done by name rather than reference equality - get_material_by_name proc that ensures the material list is initialised, initialising it if neccessary - holographic materials moved into main material list - table frames are not a source of infinite metal, and can be deconstructed correctly - gambling table icons are no longer E-W flipped	2015-05-14 22:26:19 +01:00