13651 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Segrain	fe0e1ecfb6	Conflict fix?	2013-07-25 09:55:35 +03:00
Segrain	cf4f9ba054	Typo fix, retractor step bugfix.	2013-07-25 03:06:06 +03:00
Segrain	a17e456a97	Defaulting LOOC to being toggled on.	2013-07-25 03:04:28 +03:00
Segrain	85f82219ba	Fix for #3345.	2013-07-25 03:03:14 +03:00
Zuhayr	4805c6b57c	Merge pull request #3346 from Mloc/zas-absolution ... Made most paths in ZAS absolute, for easier searching.	2013-07-24 14:47:30 -07:00
Mloc-Argent	2a825e6cca	Made most paths in ZAS absolute, for easier searching. ... Signed-off-by: Mloc-Argent <colmohici@gmail.com>	2013-07-24 21:13:48 +01:00
Mloc	6a0c74e47a	Merge pull request #3343 from RusskiSam/dev ... Tape rolls here and here...	2013-07-24 07:38:59 -07:00
RusskiSam	df8c6cdbcf	Added engineering tape roll to CE closet.	2013-07-24 07:27:06 -07:00
RusskiSam	74f951ed75	HoS and Warden's closets get police tape roll. ... Tape rolls are now available for all security jobs.	2013-07-24 07:20:31 -07:00
Zuhayr	523b7874e7	Merge pull request #3342 from RusskiSam/dev ... Adds police tape roll to Detective's Cabinet.	2013-07-23 17:45:23 -07:00
Zuhayr	6acf9681a7	Merge pull request #3341 from Kilakk/dev ... Added crew manfiest verb for ghosts.	2013-07-23 17:38:03 -07:00
RusskiSam	b3e5bbdc14	Adds police tape roll to Detective's Cabinet. ... Signed-off-by: RusskiSam	2013-07-24 04:28:03 +04:00
Kilakk	52ac0fdf31	Added crew manfiest verb for ghosts. ... Made the silicon crew manfiest monochrome, because why not?	2013-07-23 19:11:30 -04:00
Mloc	adc75dd423	Merge pull request #3340 from Mloc/master ... Nerfed snoring frequency.	2013-07-23 15:39:24 -07:00
Mloc-Argent	09db9f1ff0	Nerfed snoring frequency. ... Signed-off-by: Mloc-Argent <colmohici@gmail.com>	2013-07-23 23:38:49 +01:00
Zuhayr	580f7cf419	Merge pull request #3338 from Mloc/master ... Absoloutely massive (1 character) fix for virology. Pathogenic incubato...	2013-07-23 12:28:23 -07:00
Mloc-Argent	eaf4b7cf49	Absoloutely massive (1 character) fix for virology. Pathogenic incubator radiation now goes down as intended. ... Signed-off-by: Mloc-Argent <colmohici@gmail.com>	2013-07-23 19:48:56 +01:00
Chinsky	ac4a3c3ce9	Merge pull request #3336 from Kilakk/dev ... Made it so auto- and admin-ERT crosscheck each other	2013-07-22 14:06:16 -07:00
Kilakk	1ba49d17cb	Made it so auto- and admin-ERT crosscheck each other ... This avoids having an admin call an ERT and then having the auto call a second ERT on its own Also added a check to abort ERT if not enough people sign up (members_required is currently 1)	2013-07-22 16:53:48 -04:00
Mloc	098f0f60e2	Merge pull request #3335 from Kilakk/dev ... Changed medical records "physical status" list to something more fitting, and fixed an issue with taking your ID out of the medical computer	2013-07-22 12:54:41 -07:00
Kilakk	8766e4154d	Changed the list of p_stats available in medical records ... Made it so removing an ID card from the medical computer puts the ID into your hand rather than onto the computer List: Active, *SSD*, *Deceased*, Physically Unfit, Disabled	2013-07-22 15:10:25 -04:00
Jim "Apples"	2ce34fd024	Merge pull request #3334 from Mloc/beakers ... Beaker changes	2013-07-22 09:46:20 -07:00
Mloc-Argent	e7f38be3b4	Beakers and other glass containers now hide their contents, only showing the amount. ... Additionally, they can be labeled with a pen, up to a max of 10 characters. Signed-off-by: Mloc-Argent <colmohici@gmail.com>	2013-07-22 17:38:34 +01:00
Mloc-Argent	8421cd44df	Upped the capacity of Eleanor Stone/RKF's custom teapot item to 150 units, by request. ... Signed-off-by: Mloc-Argent <colmohici@gmail.com>	2013-07-22 17:37:39 +01:00
Jim "Apples"	7a438762ee	Merge pull request #3332 from Mloc/airflowsound ... Remove the sound played on airflow, due to intense lag and eight-and-a-h...	2013-07-22 08:19:27 -07:00
Mloc-Argent	c79a501a12	Remove the sound played on airflow, due to intense lag and eight-and-a-half million calls of playsound in an hour. ... Signed-off-by: Mloc-Argent <colmohici@gmail.com>	2013-07-22 16:13:39 +01:00
Mloc-Argent	bdaabaec46	Merge branch 'master' of github.com:Baystation12/Baystation12 into dev	2013-07-22 14:42:50 +01:00
Zuhayr	15f0853ea2	Merge pull request #3331 from BcTpe4HbIu/airalarm_fix ... Airalarm fix	2013-07-22 04:04:00 -07:00
Igor Golubkov	3889716dd6	Fix Issue #3327	2013-07-22 10:26:48 +04:00
Igor Golubkov	da14500268	Add error reporting on failed DB connection.	2013-07-22 09:19:19 +04:00
Chinsky	a344010db4	Merge pull request #3330 from Kilakk/master ... Compile fix (read: I'm an idiot)	2013-07-21 18:50:12 -07:00
Kilakk	d369b9ffff	Compile fix (read: I'm an idiot)	2013-07-21 19:49:30 -04:00
Chinsky	f9b6ef3593	Merge pull request #3328 from Mloc/master ... Bugfixes.	2013-07-21 16:42:29 -07:00
Mloc	09c17452e8	Merge pull request #3329 from Kilakk/master ... Small batch fix, voting cleanup, admin-ERT verb uncomment	2013-07-21 16:40:02 -07:00
Kilakk	e9483415d3	Fixes #3326 - uncommented admin-ERT verb	2013-07-21 19:38:32 -04:00
Kilakk	afeb753f8e	Cleaned up vote oocmute a tad	2013-07-21 19:26:05 -04:00
Kilakk	95e9cdde8d	Fixed a really stupid batch mistake	2013-07-21 19:25:18 -04:00
Mloc-Argent	f0e0951c1c	Fixes #3230. ... Signed-off-by: Mloc-Argent <colmohici@gmail.com>	2013-07-22 00:18:24 +01:00
Mloc-Argent	c135d19b66	Partial fix for #2284. ... Signed-off-by: Mloc-Argent <colmohici@gmail.com>	2013-07-21 17:05:10 +01:00
Mloc-Argent	e4b67a3466	Fixes #3104. ... Signed-off-by: Mloc-Argent <colmohici@gmail.com>	2013-07-21 16:55:30 +01:00
Mloc-Argent	eef12bf252	Fixes #3324. ... Signed-off-by: Mloc-Argent <colmohici@gmail.com>	2013-07-21 15:03:49 +01:00
Mloc-Argent	8575b7a286	And once again, did that the wrong way around. Whoops. ... Fully reverts #3316. Signed-off-by: Mloc-Argent <colmohici@gmail.com>	2013-07-20 18:41:50 +01:00
Mloc-Argent	adc3c14779	Revert #3316 from BEF due to compile errors and (assumed) missing files. ... Signed-off-by: Mloc-Argent <colmohici@gmail.com>	2013-07-20 18:38:00 +01:00
Mloc-Argent	f29cd5946f	Merge branch 'master' into bleeding-edge-freeze	2013-07-19 14:48:40 +01:00
Mloc	2288dc8abf	Merge pull request #3318 from SkyMarshal/airfixes ... Hypothetically fixed two issues, both the airlock issue and ZAS not detecting the runtime that was occuring.	2013-07-14 16:12:53 -07:00
SkyMarshal	46f808edf4	Hypothetically fixed two issues, both the airlock issue and ZAS not detecting the runtime that was occuring. Should still be verified on the live server before considered resolved.	2013-07-14 16:09:30 -07:00
Mloc	c616d2b1c1	Merge pull request #3316 from LordBraindead/bleeding-edge-freeze ... fire update	2013-07-14 15:13:46 -07:00
LordBraindead	5d63943d07	Update mineral.dm ... removed sheettpye = "plastic" again because it snuck back in after being removed already	2013-07-14 21:50:48 +02:00
LordBraindead	f172e085b1	Update changelog.html ... underped the changelog too	2013-07-14 21:40:32 +02:00
LordBraindead	53c73f6b85	Update power_cells.dm ... derped a debug message into the commit	2013-07-14 21:22:09 +02:00