Commit Graph

16365 Commits

Author SHA1 Message Date
Arokha Sieyes
6bc464be7c Beepsky+Baton=Win 2017-03-28 16:16:38 -04:00
Arokha Sieyes
8df21e989c Merge pull request #1264 from VOREStation/aro-syncshuttles
Polaris Sync
2017-03-28 13:19:32 -04:00
Arokha Sieyes
b0abf36361 Merge pull request #1258 from JoanRisu/Fluff_Items_worshop
Fluff items worshop: Fixing things
2017-03-28 13:19:12 -04:00
Arokha Sieyes
1ba87bea73 Merge polaris sync 2017-03-28 12:24:46 -04:00
Anewbe
b5696a9c6f Merge pull request #3155 from Schnayy/flower_crowns2
Flower crowns with fixed conflict? Maybe? Please?
2017-03-27 23:32:47 -05:00
Anewbe
6e7aa75835 Merge pull request #3141 from VOREStation/shuttlebetter
Dynamic Shuttle Walls/Landings
2017-03-27 23:26:35 -05:00
Leshana
7e8f701448 Add a verb to the Preferences panel to toggle jukebox music.
* This should be easier for people to find and use than the character setup page.
2017-03-27 20:31:15 -04:00
Schnayy
0f98eedab4 Fixed indentation 2017-03-27 17:16:06 -05:00
Neerti
d2078e86d6 Merge pull request #3149 from Anewbe/jackets
Reworks how some jackets open
2017-03-27 16:44:43 -04:00
Spades
40fa57830d Merge pull request #1254 from Cameron653/master
Disables Random Ian storms
2017-03-27 11:12:51 -04:00
JoanRisu
bd9d9c5078 Fixes typo for dune buggy in code and adds fluff boxes to the quick create menu. 2017-03-27 01:58:49 -07:00
JoanRisu
284460593c Resolves #1129. Adds custom_onmob_vr.dmi for onmob sprites for glasses, masks, and shoes. 2017-03-27 01:54:55 -07:00
JoanRisu
729168790a Merge branch 'master' of https://github.com/VOREStation/VOREStation into Fluff_Items_worshop 2017-03-26 22:43:18 -07:00
Schnayy
971eb97399 Fixed conflict? Maybe? Please? 2017-03-27 00:42:39 -05:00
JoanRisu
8d6377f4b4 adds vehicles to the cargo lists and makes changes to a few things. 2017-03-26 22:39:54 -07:00
Cameron653
d9b923c450 Disables Ian storms
They happened every single shift for some reason. This just flat out disables ian storms.
2017-03-26 23:45:56 -04:00
Arokha Sieyes
b88c04f96c Merge pull request #1252 from VOREStation/aro-vwag
One more vwag tweak
2017-03-26 22:05:27 -04:00
Arokha Sieyes
12d8d9f570 One more vwag tweak 2017-03-26 21:08:53 -04:00
Arokha Sieyes
5e8d8e082f Merge pull request #1251 from VOREStation/aro-sync2
Polaris Sync
2017-03-26 20:45:00 -04:00
Arokha Sieyes
60d541037c Fix compile error from merge 2017-03-26 20:32:33 -04:00
Arokha Sieyes
9edf3a6629 Polaris Merge Sync 2017-03-26 20:12:34 -04:00
Arokha Sieyes
32017be265 Fix unsupported tail spam
For vwag stuff.
2017-03-26 19:55:47 -04:00
Anewbe
d665a0dee2 Makes translators more expensive 2017-03-26 17:36:36 -05:00
Neerti
565fea9648 Merge pull request #3144 from Anewbe/uniforms
Makes space in the uniforms.dmi file
2017-03-26 18:14:06 -04:00
Anewbe
9fedcf7d1e Merge pull request #3145 from Cerebulon/medical_handsprites
Added hand sprites to most medical items.
2017-03-26 17:06:10 -05:00
Anewbe
2e5e77997a Reworks how some jackets open 2017-03-26 16:58:27 -05:00
Anewbe
22ae87c376 Fixes a bug with meatbrain FBPs. 2017-03-26 16:34:47 -05:00
Anewbe
511f8ce708 Fixed the things 2017-03-26 11:44:50 -05:00
Arokha Sieyes
4302d2373b Adds 4 waggable tails, *vwag emote, other fixes
Using the *vwag emote you can toggle the vorestation specific tails to wag. Tails marked with (vwag) in the tail selection support this.
New tails are: a new vulp tail (does not replace current one, selectable as a custom tail), a tiger tail, a short tail, and a curl tail (husky or doge). All four support vwag.

Also fixed the mouse tail. It said "mouse, grey" when what it meant was "pink" and then it also said "colorable" mouse tail but that was a lie because it was not colorable at all. Not really. Not in any reasonable way.

Also added fully colorable mouse ears without the pink inner part as an option.
2017-03-26 02:10:17 -04:00
Cerebulon
3c17d1b33f Added in-hand sprites to most item lacking them from the Medical department.
(Full list: Body bag, Advanced Mass Spectrometer, Rescue Suit Control Module, Stethoscope, Stasis bag, Defibrillator, Blood Packs, Advanced Trauma/Burn Kits, Hypospray, Biopsy Scanner, Surgical Drill, Fixovein, Retractor, Bone-Gel, Bone Setter, Cautery, Hemostat, Inflatable Wall Box.
2017-03-26 07:04:01 +01:00
Anewbe
6b0500dd27 Makes space in the uniforms.dmi file 2017-03-26 00:59:14 -05:00
Leshana
d1000f0864 Fixed random Z-Levels to account for simple_animal path changes 2017-03-25 21:58:49 -04:00
Arokha Sieyes
1300ef333d Dynamic Shuttles - Code and Icon Changes 2017-03-25 21:00:08 -04:00
Neerti
629a044761 Merge pull request #3137 from Anewbe/robot_skintone
Adds skintone to FBPs
2017-03-25 20:57:01 -04:00
Schnayy
ade40d627e Added 3 clothing sprites w/ appropriate ground/held sprites. (#3134)
* Added 3 clothing sprites w/ appropriate ground/held sprites.

1, white yoga pants, intended to be any color.

2, white kimono, intended to be any color.

3, red and black jacket.

All intended to be in the loadout.

* Put coding in. Jacket has pockets, same cold resistance as a hoodie. Kimono and yoga pants have color selectors. All are in the loadout.

* Removed cold protection from jacket & fixed missing mob sprites. Don't know what happened with the latter, was definitely there when I tested it.
2017-03-25 17:44:04 -05:00
Schnayy
8bb5924481 Adds greyscale sprites for heels worn/held/on the ground. (#3133)
* Adds greyscale sprites for heels worn/held/on the ground. Still needs coding. First commit, hope I do it right!

* Fixed capitalization, added coding.

* Rennamed heelsheld to heels, as per anewbe's request.
2017-03-25 16:48:39 -05:00
Anewbe
f316fd2dca Merge pull request #3136 from Belsima/master
Updates drone respawn time.
2017-03-25 16:37:08 -05:00
Belsima
50bc49ff86 Five minutes instead. 2017-03-25 17:29:37 -04:00
Anewbe
d90699998b Adds skintone to FBPs 2017-03-25 13:55:49 -05:00
nachomeep
9c86db2669 dron respawn time change 2017-03-25 14:37:06 -04:00
Neerti
eb73ee4b44 Merge pull request #3120 from Anewbe/alien_tweaks
Xeno race tweaks
2017-03-25 11:27:22 -04:00
Leshana
b2a8f5b3b3 Tweak events to reduce frequency of Ian storms and such. 2017-03-25 00:07:56 -04:00
Anewbe
14b9f7ce79 Adds bench presets 2017-03-24 22:46:43 -05:00
Leshana
471f724e38 Merge pull request #1235 from VOREStation/mediamanager
Media Manager - HTML5 Antilag Jukebox
2017-03-24 20:42:50 -04:00
Anewbe
3c1d897fc4 Actually gets the HI name right 2017-03-24 15:27:55 -05:00
Leshana
519252b787 Merge pull request #1234 from VOREStation/polaris-sync-and-simple-animal
Polaris sync and simple animals
2017-03-24 01:03:20 -04:00
Leshana
c63c68c9a8 Implements browser streaming media jukeboxes
Ports media code from vgstation, updates it for this codebase and modernizes it.
* Changes jukeboxes to load songs using an embedded browser instead of sending over BYOND's sound channels.  This means they load out of band without lagging the server.  Also songs can be resumed mid-song, so leaving and returning to an area doesn't start the music over.
* The old WMP and VLC player modes from /vg are still supported, but adds a new default mode using HTML5 audio to play the music.
  * WMP - The oldest, still works on IE on windows, but only there, and Microsoft could break it any second.
  * VLC - Works on all platforms, but requires user to have VLC pre-installed on their computer.  Uses a scary plugin.
  * HTML5 - New default, It is cross platform but doesn't require you to have VLC installed to work.  Also caches songs locally even between rounds.
* Changed jukebox.txt to be jukebox.json, now can include artist information as well.  Must include the duration of songs as well.
* For HTML5 audio compatibility, use only MP3 files, its the only format supported on all browsers.
* Jukebox itself is also upgraded, instead of just repeating the same song over and over it can actually advance to the next song when one is done playing.  Has a few modes including random, next, and single song.
* Jukeboxes have a UI improvement, and have a volume control.
* Three new settings are added to global settings in character setup
  * Jukebox music on/off toggles jukebox music independently of normal station ambience.  Now you can hear ambience but not music. (or vice versa if you wanted...)
  * Jukebox music volume.  Control the relative volume of jukebox music.   Actual volume is player's configured volume * jukebox's configured volume.
  * Media player type.  Choose between WMP, VLC, and HTML5
* Fixes a few bugs in the /vg code.
2017-03-23 21:10:11 -04:00
MagmaRam
e3a87c1c78 Merge pull request #2985 from Anewbe/more_pdas
Adds rugged style PDAs
2017-03-22 19:42:19 -05:00
MagmaRam
d603394226 Merge pull request #3121 from Anewbe/borg_zap
Borg stun arm should work now
2017-03-22 19:42:01 -05:00
Leshana
f93141d7d3 Merge remote-tracking branch 'polaris/master'
# Conflicts:
#	code/modules/mob/living/carbon/human/species/station/prometheans.dm
#	code/modules/mob/living/simple_animal/animals/cat.dm
#	code/modules/mob/living/simple_animal/simple_animal.dm
#	vorestation.dme
2017-03-22 20:08:29 -04:00