Commit Graph
24842 Commits
Author SHA1 Message Date
davipatury 3a10ee852a Crazylemon's suggestion. 2017-03-04 14:17:57 -03:00
davipatury bf45dd3cad Updates holder ui when pulsed/cut. 2017-02-26 15:23:56 -03:00
davipatury a3a1775696 Wires nano-ui. 2017-02-25 21:51:28 -03:00
Fox McCloudandGitHub 1e44336a3a Merge pull request #6555 from KasparoVy/vox-plasmaman-reagent-bsns
Reagent Oxygen is Toxic to Vox, Reagent Plasma Heals Plasmamen, Plasmaman Suit Autoextinguish & Plasmaman Exposure Burn Fixes
2017-02-25 17:11:08 -05:00
Fox McCloudandGitHub 616a0ff8d1 Merge pull request #6446 from Kyep/terrorspiders-PR3
Terror Spiders 3 - Awaymission & AI
2017-02-25 17:04:30 -05:00
Fox McCloudandGitHub ec30a8b629 Merge pull request #6580 from Draconic-saint/spartan_fluff
Spartan fluff
2017-02-25 16:50:28 -05:00
Kyep 6fac5bcc98 Tiger changes 2017-02-25 06:06:51 -08:00
Fox McCloudandGitHub 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 McCloudandGitHub 1044b2b84d Merge pull request #6515 from Crazylemon64/fast_servermonitor
Telecomms monitor is speedier now
2017-02-24 23:25:47 -05:00
Crazy LemonandGitHub 9173611f69 Merge pull request #6503 from davipatury/skills_ui
Employment Records Nano-UI-ification
2017-02-24 18:54:28 -08:00
Crazy LemonandGitHub e81592c3db Merge pull request #6499 from davipatury/med_data-ui
Medical Records Nano-UI-ification
2017-02-24 18:53:33 -08:00
Crazy LemonandGitHub 9bc203d32f Merge pull request #6482 from davipatury/eftpos-ui
EFTPOS Nano-UI-ification
2017-02-24 18:53:19 -08:00
Crazy LemonandGitHub 1bc176ee8c Merge pull request #6498 from Markolie/firedoorchange
Makes firelocks more lethal
2017-02-24 18:23:11 -08:00
Crazy LemonandGitHub 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 LemonandGitHub 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 LemonandGitHub 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 McCloudandGitHub 7acb0c1474 Merge pull request #6576 from Kyep/blob_fix
Fixes #6572 - double prompt on blob
2017-02-24 15:00:09 -05:00
Fox McCloudandGitHub 45c9a3e550 Merge pull request #6573 from Markolie/zefix
Fixes
2017-02-24 14:57:38 -05:00
Fox McCloudandGitHub 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
KasparoVy 3c24f6e255 Dumbs Down Plasmaman Suit Reloading & Amends Plasmaman Suitless Ignition
Plasmaman suits no longer have an in-depth system by which their
autoextinguisher can be replenished, but a simple one.

Plasmamen now combust in the same circumstances regular gasous plasma
will as defined in LINDA code.
2017-02-24 02:37:20 -05:00
Joris 83a009cd1d Fixes the bad thing, and adds item_state. 2017-02-24 03:07:47 +01:00
Joris 750e8ff630 Adds in fluff gas mask 2017-02-24 02:27:07 +01:00
KasparoVy 4bb1c57d7e Conflict resolution
Unironically conflicting with another one of my PRs
2017-02-23 17:26:22 -05:00
Fox McCloudandGitHub 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 LemonandGitHub df8d1475ba Merge pull request #6568 from Krausus/GhostByDefault
Reduces Accidental Ghosts and Ghostly Volunteers
2017-02-23 03:20:55 -08:00
Crazy LemonandGitHub 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 McCloudandGitHub 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
KasparoVy 61670a24a0 Plasmaman Plasma Reagent Healing Proc Change 2017-02-22 06:37:42 -05: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
KasparoVy 864260efde Removes Snowflake Name-checks and Amends Plasmen Suit Extinguish Messages
Removes a bunch of bodyflags from Armalis that they really shouldn've
had as well.
2017-02-22 01:44:15 -05:00
Kyep b0a6ad2241 Removes "src." 2017-02-21 22:06:06 -08:00