Commit Graph

15408 Commits

Author SHA1 Message Date
Fox McCloud
21941f4547 Merge pull request #6566 from Kyep/aiupload_zlevel_restrict
Stops AI & Borg upload consoles working on other zlevels
2017-02-26 12:35:17 -05:00
Fox McCloud
116d852d60 Merge pull request #6587 from Crazylemon64/immovable_rod_is_finite
Immovable rods no longer loop forever
2017-02-26 12:08:28 -05:00
Crazylemon64
923b5b160b Should prevent false-alarm rod events 2017-02-26 07:26:07 -08:00
Kyep
c4e7d346bd Crazy request 2017-02-26 04:59:04 -08:00
Crazy Lemon
21eaf98684 Merge pull request #6481 from davipatury/atm-ui
ATM Nano-UI-ification
2017-02-25 22:43:36 -08:00
Crazy Lemon
3f36c99bad Merge pull request #6606 from Kyep/mentor_verb_bugfix
Fixes spam when mentors check playtime/playerage
2017-02-25 22:38:13 -08:00
Kyep
92e21bffcc Fixes spam when mentors check playtime/playerage 2017-02-25 18:47:02 -08:00
Crazy Lemon
186edb14e7 Merge pull request #6468 from tigercat2000/job_refactor_tg
Ported /tg/'s outfit datums, refactored job controller to support them
2017-02-25 17:54:01 -08:00
Crazy Lemon
992fae8cf5 Merge pull request #6500 from davipatury/secure_data-ui
Security Records Nano-UI-ification
2017-02-25 16:59:59 -08:00
Fox McCloud
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 McCloud
616a0ff8d1 Merge pull request #6446 from Kyep/terrorspiders-PR3
Terror Spiders 3 - Awaymission & AI
2017-02-25 17:04:30 -05:00
Fox McCloud
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
Tigercat2000
fe5fb2c0f8 Merge remote-tracking branch 'upstream/master' into job_refactor_tg 2017-02-25 05:42:47 -08: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
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
Crazylemon64
369bf483b5 Immovable rods no longer loop forever 2017-02-24 15:09:04 -08: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
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
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
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
Kyep
8ca28e4349 Fox requests 2017-02-23 01:15:53 -08:00
Kyep
2aa2272553 Changes to same zlevel check 2017-02-22 22:50:23 -08: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
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
KasparoVy
61670a24a0 Plasmaman Plasma Reagent Healing Proc Change 2017-02-22 06:37:42 -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
7d64003b02 Also, borgs 2017-02-21 22:53:44 -08:00
Kyep
5d5938cc91 Prevents AI upload use off-station 2017-02-21 22:52:31 -08: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
KasparoVy
9dad350329 Desnowflakes the Special Reagent Handling & Amends+Completes Autoextinguish & Fixes Plasmaman Immolation Immunity Bug
- Moved Vox and Plasmamen special reagent handling to the Species datum
to avoid snowflaking in reagent code
- Removed the AUTOEXTINGUISH flag and turned it into a var to conserve
flags
- Adds Plasmaman EVA suit auto-extinguisher reloading. Eject the
depleted cartridges with an action button and fill them as you would a
fire extinguisher, then just slot them back into the suit.
- Fixes a bug where having NOBREATHE cured a Plasmaman of burning when
exposed to atmosphere.
- Fixes a bug where Plasmamen would burn in space or in totally-Plasma
environments. Inspired by /vg/station.
2017-02-22 00:12:01 -05:00