Commit Graph

15367 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
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
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
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
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
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
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
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
Kyep
dd66a3a3e4 Blob now spawns with an overmind 2017-02-21 00:41:57 -08:00
Crazy Lemon
9979fda3c0 Merge pull request #6525 from tigercat2000/4ucking4urries
Nerfs sentient AI in our code
2017-02-20 20:03:38 -08:00
Crazy Lemon
67bbf4363d Merge pull request #6514 from davipatury/shuttle-ui
Shuttle Console Nano-UI-ification
2017-02-20 19:55:29 -08:00
Kyep
cae061dcf0 Tigercat request 2017-02-20 17:54:43 -08:00
Kyep
5a5a8b6c36 [M] -> [key_name_admin(M)] 2017-02-20 17:03:37 -08:00
Fox McCloud
36a90e7623 Merge pull request #6483 from tigercat2000/ai_open
Add [OPEN] option for AI in radio messages
2017-02-20 09:48:01 -05:00
KasparoVy
11d759550c Moves Species-Specific Object Icons into their own Files, Fixes Armalis Equipment Bug
All species-specific clothing icons (obj and worn) are now in their own files instead of cluttering up the main ones. I didn't do the Skrell helmets/whatevers because Humans can wear them too.

Fixes a bug where the 'select equipment' debug verb wouldn't correctly equip Armalis if you selected the 'Vox' option. Also corrects an issue where it gave the Armalis two uniforms. Adds a placeholder invisible uniform icon state for the Armalis so Admins can use 'em for events and do uniform-related things without having to deal with terribly awkward icons.
2017-02-20 07:08:19 -05:00
Kyep
c562e4304c Adds logging to admin use of SMITE/BLESS
Admin usage of smite/bless is now logged. All other admins (plus
adminlog) can see it.
2017-02-20 03:35:21 -08:00
Krausus
471d1d9c98 Lighting performance/profiling tweaks
- Lighting process now yields at 10% of a tick and defers at 80% of a
tick
- There is no longer a limit to how many sources/corners/overlays will
update in a single work run
- Source/corner/overlay totals are now simple counts instead of lists
- Lighting update stats now show updates over each of the previous 5
seconds
- Space turfs now remove their starlight when changing to a different
turf, fixing a runtime
2017-02-19 23:37:54 -05:00
KasparoVy
006cff12be Moves Vox/Armalis/Plasmaman/Unathi Helmets, Suit and Boot Icons from Main Files into Species-specific Files
Because feet.dmi, head.dmi, suit.dmi and uniform.dmi are getting pretty
big.
2017-02-19 19:55:20 -05:00
Tigercat2000
c62930568e ~~Removes~~ Nerfs sentient AI in our code
- Added Wheatly core
2017-02-19 15:37:23 -08:00
KasparoVy
30749142e8 Adds some Vox Helmet Sprites and Other Small Tweaks
Slightly tweaks Vox knight armour sprites (templar untouched).

Adds toggling of face-shield on gladiator helmet.
Adds the following helmet sprites for Vox:
- Justice 1 & 2
- NVG Helmet
- Sci-goggle Helmet
- Materials-goggle Helmet
- Meson-goggle Helmet
- Syndicate Helmet
- Thermal-goggle Helmet
- Riot Helmet
- Thunderdome Helmet
- Roman Helmets (regular & legionnaire)
- Gladiator Helmet
- Red/Blue Lasertag Helmets
- Blob Hat
- Knight Helmets (Templar, Grey & RGBY)
2017-02-19 01:42:40 -05:00
davipatury
d4338bed12 Some changes! 2017-02-18 22:18:01 -02:00
davipatury
f1ae2e3f3a Shuttle Console nano-ui. 2017-02-18 20:49:38 -02:00
Twinmold
c7eda9d78d BloodPack Tagging/Pen Labeling
With this, you can now use a pen on a bloodpack and add a label to it,
giving the ability to tag a bloodpack with the type of blood from
donations. Bloodpacks will now switch between "empty" and notso in
naming, depending on if there is reagent/blood inside or not.

:cl:Twinmold
Add: Ability to label bloodpacks with a pen, so you can now label a
bloodpack from donations without a handlabeler.
Add: Bloodpacks will now change name to say if they are empty or not.
/🆑
2017-02-18 13:11:51 -06:00
davipatury
ba193fdd10 Medical Records nano-ui. 2017-02-18 14:36:37 -02:00
Fox McCloud
66b4e64250 Merge pull request #6369 from Markolie/admin_interact
Admin interaction update
2017-02-18 11:11:02 -05:00
Fox McCloud
cff15468ba Merge pull request #6478 from FlattestGuitar/lasers
New laser carbine icons
2017-02-18 11:07:56 -05:00
Markolie
df15e35012 Make firelocks more lethal (autoclose, takes time to open with hand). Also fixes atmospherics remote control. 2017-02-18 17:00:50 +01:00
Markolie
9a69922a86 Fix slicing disposal pipes not showing a progress bar 2017-02-18 15:58:38 +01:00