6569 Commits

Author	SHA1	Message	Date
Ccomp5950	dc7e32a646	Merge pull request #4271 from Loganbacca/master ... Plasma glass stacking fix	2014-01-11 19:39:22 -08:00
Zuhayr	2dd2ce8ed1	Merge pull request #4262 from Ccomp5950/mouse_runtime ... Runtime fix for people that jump back in their body before hitting respawn	2014-01-11 07:53:51 -08:00
Loganbacca	909928f3f9	Plasma glass stacking fix	2014-01-11 18:14:51 +13:00
Ccomp5950	3d34567d56	Merge pull request #4269 from LightningIron/master ... Bugfixes	2014-01-10 19:28:23 -08:00
LightningIron	cbd3f280af	Forgot to include the /spray/ part of the chemsprayer path.	2014-01-10 20:43:27 -06:00
LightningIron	5119882536	Fixes #4286.	2014-01-10 20:36:20 -06:00
Ccomp5950	bc6561b9e4	Runtime fix for people that jump back in their body before hitting respawn or just stay in their body for 30 minutes. ... Who does that? People that cause runtimes, that's who! (Jerks)	2014-01-10 15:59:40 -06:00
DJSnapshot	e524d2112f	Merge pull request #4244 from LightningIron/master ... Ninja bugfixes/minor code cleaning/energy cost changes	2014-01-10 13:42:42 -08:00
Ccomp5950	2b57605738	Merge pull request #4253 from SkyMarshal/mining ... Fix for mining.	2014-01-09 17:22:12 -08:00
SkyMarshal	8885ad630e	Fix for mining. ... Fixes #4249	2014-01-09 17:26:13 -07:00
RKF45	c47be94b42	Removes braindeath as IC term	2014-01-09 21:49:21 +01:00
LightningIron	8c26c23157	Merge remote-tracking branch 'upstream/master'	2014-01-09 11:15:26 -06:00
Zuhayr	70fe0e02cd	Merge pull request #4245 from SkyMarshal/airfixes ... Lots of bugfixes.	2014-01-09 02:47:20 -08:00
SkyMarshal	f79ffa598e	Tradeband and Gutterspeak now have a different font than Tradeband. ... Fixes #4143	2014-01-08 22:15:47 -07:00
SkyMarshal	2308e71157	Mining fixes as it was annoying as fuck. Also a random object with nothing in it removed.	2014-01-08 21:33:17 -07:00
LightningIron	756214fbc7	Reverted lockbox removal which was on my master branch. Should be merged with next dev.	2014-01-08 21:13:55 -06:00
LightningIron	8ae2266526	Added captured variable to mobs, non-chair equivalent to being buckled into a chair	2014-01-08 20:49:45 -06:00
Zuhayr	a039f05372	Merge pull request #4224 from Ccomp5950/bug_fixes ... Bug fixes	2014-01-07 02:36:51 -08:00
Ccomp5950	cd4ef7a1b7	Ghost chat unicode support...removed unneeded sanitize()	2014-01-05 19:30:52 -06:00
Fira	354b1978ea	Partial fix for pAI emotes (they still can't hear beyond one container ... level, will require a say/emote code hack)	2014-01-04 15:22:17 +01:00
Mloc	08678a9e3e	Merge pull request #4186 from Ccomp5950/kick_reason ... Admins can now put a reason for booting someone from the server.	2014-01-03 03:42:59 -08:00
Ccomp5950	ea32e235ab	Admins can now put a reason for booting someone from the server. ... Virgie requested feature.	2014-01-03 01:09:06 -06:00
Zuhayr	f679776a22	Made diona nymph evolution whitelisted.	2014-01-03 09:37:13 +10:30
Zuhayr	37d96ebc80	Nerfs abandoned crates to be less fucking moronic.	2014-01-02 00:42:11 +10:30
Zuhayr	1cddbeb180	Fix for ninja being unable to wear full-sized oxytanks.	2014-01-01 22:10:25 +10:30
Zuhayr	f638f1db96	Prevented the ability to open locked crates with random items.	2014-01-01 21:33:23 +10:30
Zuhayr	b6af4a1b4e	Removes mime and HONK carts from protolathe.	2014-01-01 21:26:19 +10:30
LightningIron	5007133848	Merge remote-tracking branch 'upstream/master'	2013-12-30 22:07:18 -06:00
DJSnapshot	7a7eca4393	Merge pull request #4146 from Baystation12/dev-freeze ... Dev-freeze --> Master staging [Going live!]	2013-12-30 13:52:21 -08:00
Zuhayr	20b6e6fecf	Merge branch 'master' of https://github.com/Baystation12/Baystation12	2013-12-27 17:48:41 +10:30
SkyMarshal	30970b7b56	Hypothetically adds proximity check to droppers. ... This code is awful, but it appears "flag" (who names this shit?) acts as a proximity check.	2013-12-26 21:22:00 -07:00
Zuhayr	183afc61bf	Reverts corgi dress-up due to being terrible and duplicating items.	2013-12-27 11:06:20 +10:30
Zuhayr	b638388bdd	Uncommented ninja block in Check Antags.	2013-12-27 10:48:37 +10:30
Zuhayr	661593718f	Using dev-freeze map.	2013-12-27 10:42:13 +10:30
Zuhayr	4746a3ada9	Merge pull request #4120 from Miniature/master ... Added leaving prints on APCs when using item on them	2013-12-25 03:52:04 -08:00
Miniature	3d6f8ee4b2	Added leaving prints on APCs when using item on them ... (fix issue #4109)	2013-12-25 22:11:13 +10:30
Chinsky	0c94d2892d	Fixes #4071 ... Emote needed "me" action first, using custom_emote instead.	2013-12-25 14:44:50 +04:00
Chinsky	5071ea57ad	Fix for #3583 ... Hostile mobs now check adjacency before applying damage.	2013-12-25 14:20:56 +04:00
Chinsky	c45f10f02b	Merge branch 'dev-freeze' of https://github.com/comma/Baystation12 into dev-freeze	2013-12-25 00:36:35 +04:00
Chinsky	ee6a18d94d	Adds White UI to selectable UIs	2013-12-24 23:05:41 +03:00
Chinsky	6630a046c9	Merge pull request #4095 from DJSnapshot/dev-freeze ... Misc Fixes to guns	2013-12-23 04:38:44 -08:00
Zuhayr	bda1297472	Merge branch 'master' of https://github.com/Zuhayr/Baystation12	2013-12-22 23:13:22 +10:30
Zuhayr	b9fcd34df3	Merged config and changelog.	2013-12-22 23:11:29 +10:30
DJSnapshot	1324be7189	Fix for guns eating empty magazines.	2013-12-21 23:15:36 -08:00
DJSnapshot	2f0b5e31f4	Fix so magazines read correctly on the Colt M1911. ... Also notice for when the clip falls out.	2013-12-21 22:58:24 -08:00
Chinsky	19c83de6af	Applying Minifix to Yinaderp ... ID of resulting chemical was not set, so reagents just disappeared	2013-12-22 07:55:03 +04:00
LightningIron	81df1a1307	Removes lockboxes.	2013-12-21 17:53:19 -06:00
alex-gh	a48100da74	Reattaching a mindless head no longer results in a runtime error	2013-12-21 22:50:13 +01:00
RavingManiac	b26492e66d	Simplified the monkey pulling check as per Giacom's suggestion.	2013-12-21 13:51:06 +08:00
Zuhayr	dfeb32ce79	Merge pull request #4070 from RavingManiac/master ... Crouching monkey, hidden mousetrap	2013-12-20 03:43:34 -08:00