24818 Commits

Author	SHA1	Message	Date
Tigercat2000	fe5fb2c0f8	Merge remote-tracking branch 'upstream/master' into job_refactor_tg	2017-02-25 05:42:47 -08:00
Fox McCloud	fbed82b080	Merge pull request #6570 from SamHPurp/no-ghost-spin ... Refactors the Chair Rotate verb	2017-02-25 06:51:57 -05:00
Sam	83e616d8d8	Removes a superfluous return ... Hopefully the final change..	2017-02-25 09:08:41 +00:00
Fox McCloud	1044b2b84d	Merge pull request #6515 from Crazylemon64/fast_servermonitor ... Telecomms monitor is speedier now	2017-02-24 23:25:47 -05:00
Crazy Lemon	9173611f69	Merge pull request #6503 from davipatury/skills_ui ... Employment Records Nano-UI-ification	2017-02-24 18:54:28 -08:00
Crazy Lemon	e81592c3db	Merge pull request #6499 from davipatury/med_data-ui ... Medical Records Nano-UI-ification	2017-02-24 18:53:33 -08:00
Crazy Lemon	9bc203d32f	Merge pull request #6482 from davipatury/eftpos-ui ... EFTPOS Nano-UI-ification	2017-02-24 18:53:19 -08:00
Crazy Lemon	1bc176ee8c	Merge pull request #6498 from Markolie/firedoorchange ... Makes firelocks more lethal	2017-02-24 18:23:11 -08:00
Crazy Lemon	4c88191fb9	Merge pull request #6504 from Twinmold93/bloodpack_labeling ... BloodPack Tagging/Pen Labeling	2017-02-24 18:20:46 -08:00
Crazylemon64	2f8feff402	Refactors tcomms stuff a little	2017-02-24 18:10:08 -08:00
Sam	e1abe58da7	Fixes indentation	2017-02-24 20:09:17 +00:00
Crazy Lemon	4c14385b67	Merge pull request #6534 from Kyep/bless_smite_logging ... Adds logging to admin use of Smite/Bless	2017-02-24 12:06:09 -08:00
Sam	79d5d7dc0c	Removes an unnecessary 'else' statement ... Tidies the code up a bit more	2017-02-24 20:05:59 +00:00
Crazy Lemon	9382db1767	Merge pull request #6430 from FalseIncarnate/botany2 ... Botany adjustments/re-addition/fixes/whatever (RE-UPLOAD)	2017-02-24 12:03:07 -08:00
Fox McCloud	7acb0c1474	Merge pull request #6576 from Kyep/blob_fix ... Fixes #6572 - double prompt on blob	2017-02-24 15:00:09 -05:00
Fox McCloud	45c9a3e550	Merge pull request #6573 from Markolie/zefix ... Fixes	2017-02-24 14:57:38 -05:00
Fox McCloud	8b1a53b2d0	Merge pull request #6536 from SamHPurp/dethroning ... Moves crown to cargo crate	2017-02-24 14:54:12 -05:00
Markolie	f54ade7f46	Fix nuke ops victory declaration	2017-02-24 16:14:17 +01:00
Markolie	01c7c6eb43	Fix chef preview hat	2017-02-24 12:56:09 +01:00
Kyep	cfaeb7aef6	Krausus requests 2	2017-02-24 00:42:00 -08:00
Kyep	88cf2db34b	Krausus	2017-02-23 23:39:08 -08:00
Fox McCloud	e343a01063	Merge pull request #6574 from Krausus/IncalculableIsNotASymptom ... Fixes Disease Symptom Math Runtimes	2017-02-23 12:45:59 -05:00
Kyep	2a028974ac	Fixes #6572	2017-02-23 04:12:46 -08:00
Crazy Lemon	df8d1475ba	Merge pull request #6568 from Krausus/GhostByDefault ... Reduces Accidental Ghosts and Ghostly Volunteers	2017-02-23 03:20:55 -08:00
Crazy Lemon	bc3e785586	Merge pull request #6564 from Markolie/fixxxxx ... Fix station goals runtime and increase meteor shield satellite goal tenfold	2017-02-23 03:20:37 -08:00
Krausus	3a5ef1baea	Makes disease square roots bottom out at 0	2017-02-23 05:43:21 -05:00
Fox McCloud	8475b843ff	Merge pull request #6520 from KasparoVy/voxhelmets ... Adds some Vox Helmet Sprites, Small Sprite Tweaks, Gladiator Helmet Toggling & Moves Species-specific Icons into Appropriate Files	2017-02-22 22:59:27 -05:00
Sam	d376c1a5da	Now uses setDir ... Tested, and didn't break anything.	2017-02-22 23:38:43 +00:00
Sam	cde421e0eb	Refactoring of the Rotate verb ... removes a few unnecessary checks. Still not using setDir yet, as I have yet to work out how it works. To come!	2017-02-22 23:07:18 +00:00
Markolie	c56fbcf312	No need to block movement	2017-02-22 20:13:36 +01:00
Markolie	fb53271664	Band aid fix for ambulance teleporting	2017-02-22 20:08:33 +01:00
Markolie	707b926881	Fax fix	2017-02-22 18:48:50 +01:00
Markolie	8432113c59	Add eject ID card to fax machine	2017-02-22 18:36:10 +01:00
Markolie	c5b897a951	Fix fax machine logout issue, fix card eject telekinesis interaction, fix death alarm follow link, fix flavor text not hiding when unknown, fix spacepod mining lasers	2017-02-22 18:24:43 +01:00
Sam	5bc8c45e82	Stops ghosts from interacting with chairs ... Removes the ability for ghosts to spin chairs.	2017-02-22 13:41:29 +00:00
Krausus	297b8e0cb8	Swaps yes/no choices in candidate polling ... "No" is now the choice that's selected by default	2017-02-22 02:59:06 -05:00
Krausus	ef1859b877	Swaps choices in pre-ghosting warning ... "Stay in body" is now the choice that's selected by default	2017-02-22 02:21:23 -05:00
Kyep	b0a6ad2241	Removes "src."	2017-02-21 22:06:06 -08:00
Markolie	9cde629caf	Fix station goals runtime and increase goal tenfold	2017-02-21 22:52:16 +01:00
Fox McCloud	b0eecc1a01	Merge pull request #6544 from Markolie/fixxxxx ... Fixes	2017-02-21 15:48:36 -05:00
Fox McCloud	a232cd973a	Merge pull request #6495 from Twinmold93/biogen_holster ... Changes Biogenerator Belt Holster to Accessory Holster	2017-02-21 15:44:02 -05:00
FalseIncarnate	c3a2a2878e	Fixes Rice Grinding	2017-02-21 15:19:56 -05:00
Markolie	5c5889db74	Prevent cult from soul stoning manifested ghosts	2017-02-21 21:14:05 +01:00
Fox McCloud	3b88d59e36	Merge pull request #6528 from Krausus/LightingTweaks ... Lighting Performance and Profiling Tweaks	2017-02-21 15:03:18 -05:00
Fox McCloud	dc44a3415a	Merge pull request #6470 from Kyep/move_blob_start ... Makes blobs less cheesable	2017-02-21 15:02:28 -05:00
Crazy Lemon	dc590ac8ec	Merge pull request #6522 from Kyep/playtime_runtime_fix ... Adds checks to prevent runtime in playtime list if mob has no mind	2017-02-21 11:56:55 -08:00
Fox McCloud	e677041a3c	Merge pull request #6554 from Crazylemon64/dna_runtime_fix ... Fixes runtime when non-dna'd mobs step on a rad mine	2017-02-21 13:50:44 -05:00
davipatury	8eb4b486c7	Double fixed.	2017-02-21 10:22:33 -03:00
Crazylemon64	6b26ac0471	Fixes runtime when non-dna'd mobs step on a rad mine	2017-02-21 04:39:58 -08:00
Crazylemon64	69ece3d12e	Makes autolathe hacking work again	2017-02-21 02:19:00 -08:00