9862 Commits

Author	SHA1	Message	Date
Chinsky	71e47fcd1c	Added Local OOC verb. ... Visible to those in view and all admins.	2013-06-15 15:36:55 +04:00
Jim "Apples"	6d1d50ed69	Merge pull request #3067 from NicholasDV/enhancementsAndFeatures ... Adds in the Kida	2013-06-14 10:33:23 -07:00
Chinsky	d0eaeb89b9	Merge pull request #3070 from Baystation12/master ... Updating BEF with master	2013-06-14 03:17:39 -07:00
Chinsky	5993ce4be5	Merge pull request #3068 from SkyMarshal/airfixes ... Fixes a runtime involving ZAS zones lose their air datum. (I have no fucking idea why that happens)	2013-06-14 02:59:29 -07:00
Jamini	89766706fe	Alien Monkeys - Farwa, Stok, Aenera ... Signed-off-by: Jamini <mobiousjami@gmail.com>	2013-06-14 02:22:27 -04:00
NicholasDV	9139a70d8c	Adds in the icon files for Kidan and fixes issue ... SkyMarshal caught a small issue, and I realized that I never did include the kidan icon files. This is the fix!	2013-06-14 00:06:45 -04:00
SkyMarshal	1f886448b6	Fixes a runtime involving ZAS zones lose their air datum. (I have no fucking idea why that happens) ... Fixes #3059	2013-06-13 18:20:42 -07:00
NicholasDV	a2fddc0fc1	Adds in the Kida ... Adds in the Kida Race to all parts.	2013-06-13 18:22:05 -04:00
Asanadas	7479fd272c	Added Malsquando's colored suit to the hop's wardrobe locker. ... Everything should be working correctly.	2013-06-13 09:41:52 -04:00
Zuhayr	1b230504f5	Runtime fix.	2013-06-13 15:57:41 -07:00
Zuhayr	4aa577bef3	Powered crossbows, sprites, ammo.	2013-06-13 15:31:47 -07:00
Zuhayr	4928f56030	Merge branch 'master' of https://github.com/Baystation12/Baystation12	2013-06-13 12:03:58 -07:00
meyar	4098cd9410	Fixes the player requirements, forgot to revert them from testing.	2013-06-12 20:52:49 -04:00
meyar	d965c23bd9	Removes the syndicate nuke agent last name system.	2013-06-12 20:46:59 -04:00
meyar	3769ceff4f	Fixes a conflict with auto-ERT	2013-06-12 19:37:57 -04:00
meyar	90e477ebfb	Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12	2013-06-12 17:24:54 -04:00
meyar	e259deba7c	Actually calls the ERT proc on red alert now. Hurr.	2013-06-12 17:23:39 -04:00
Mordeth221	91bd0d453b	Cyborg Medical Hypo Changing Doctors Delight to Tricordrazine ... Changing because they have the same effect, yet Doctors Delight causes people to get drunk/slurr words.	2013-06-12 21:55:07 +02:00
Chinsky	bb26c5a7cb	Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12 into newstuff ... Conflicts: code/game/objects/structures/crates_lockers/closets/secure/security.dm	2013-06-12 23:11:28 +04:00
Vetinari	3c0a424bb3	Medbay Remap post-ERT ... Medbay Overhaul, mapping post-ERT changes, recommit of previous files due to computer derp.	2013-06-12 23:27:36 +10:00
Zuhayr	91008c4d38	Amending a previous fix due to new ERT code from bef.	2013-06-12 20:47:04 -07:00
Zuhayr	1c65f32828	Compile fix.	2013-06-12 20:37:45 -07:00
Zuhayr	b9be0158c7	Merge branch 'master' of https://github.com/Baystation12/Baystation12	2013-06-12 20:31:52 -07:00
Zuhayr	fa79834e1b	Merge resolution.	2013-06-12 20:31:29 -07:00
Zuhayr	48aa2bb8f9	Internal damage from yanking out things, damage from moving with shrapnel and things inside your body.	2013-06-12 14:17:05 -07:00
Zuhayr	6bd685bcb2	Compilation fix for ERT code.	2013-06-12 12:30:28 -07:00
Zuhayr	7cd54ac387	Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12	2013-06-12 11:41:08 -07:00
Chinsky	8c23dc60f7	Merge pull request #3046 from meyar/bleeding-edge-freeze ... Emergency Response Team Mega Update! Weee	2013-06-12 03:21:42 -07:00
Zuhayr	19748b1217	Added verbs for ripping items out of yourself, added examine proc, altered hatchets w_class.	2013-06-12 03:20:23 -07:00
Segrain	81852bea51	Fix-O-Vein steps bugfix.	2013-06-12 14:00:48 +03:00
Zuhayr	b859a494e6	Minor surgery fix.	2013-06-12 01:57:01 -07:00
Zuhayr	7db6cd4108	Added shrapnel from projectile wounds and altered scanner readout.	2013-06-12 01:45:07 -07:00
Zuhayr	0a220db976	Added embedded weapons and adjusted implant removal surgery to work with non-implants in organs.	2013-06-12 00:28:12 -07:00
Kilakk	bde37882ce	Fixed a small spelling error in job prefs	2013-06-11 21:36:40 -04:00
meyar	811fae38fd	Missed a line	2013-06-11 16:58:48 -04:00
meyar	494887a9b5	Typo fix	2013-06-11 16:58:32 -04:00
meyar	1203a32bbe	Typo fix	2013-06-11 16:58:13 -04:00
meyar	7256c9d39f	Changes 'Emergency Rescue Team' to its proper 'Emergency Rescue Team'	2013-06-11 16:52:36 -04:00
Kilakk	6c8423aed0	Merge remote-tracking branch 'upstream/bleeding-edge-freeze' into bleeding-edge-freeze	2013-06-11 16:25:42 -04:00
Zuhayr	d0e15b3608	Harpoon, harpoon sprites, removed pneumatic cannon sprites from human.dmi.	2013-06-11 13:15:33 -07:00
Chinsky	fa2b46ce9c	Merge pull request #3035 from CIB/feature ... New configuration option: external resource download	2013-06-11 12:33:16 -07:00
Chinsky	3c56e6dacb	Merge pull request #3043 from Baystation12/master ... Fix for pods	2013-06-11 12:32:47 -07:00
Chinsky	e638540b4c	Merge pull request #3041 from meyar/master ... Emergency map fix: Security escape pod	2013-06-11 12:29:41 -07:00
cib	13b16bcd69	Added extra message when downloading external resources.	2013-06-11 21:28:59 +02:00
cib	4e0c68b88a	Added a configuration option that allows putting the .rsc on external servers.	2013-06-11 21:28:59 +02:00
meyar	f03f8c9b66	Disables debug(poorly made debug) verb for ERT. This -may- be behind my BEF fix, but I suck at git and can't exclude this because I am dumb :c	2013-06-11 15:25:59 -04:00
Chinsky	bd3879da2e	Merge pull request #3040 from Baystation12/master ... hurka durka master update	2013-06-11 12:25:56 -07:00
Chinsky	09d0bb7f8e	Merge pull request #3039 from Furlucis/master ... Typo fixes	2013-06-11 12:21:16 -07:00
Zuhayr	c57f2bb137	Polished off some pneumatic cannon bugs. All done.	2013-06-11 12:19:20 -07:00
Spamcat	076f4c9d9a	Figured I should finally commit it, since exams are over now~ ... Radios start off by default. Should decrease the amount of tcomm lag.	2013-06-11 23:09:44 +04:00