Commit Graph

1913 Commits

Author SHA1 Message Date
Yoshax
ba7cad162d Revert "Makes space in the uniforms.dmi file"
This reverts commit 6b0500dd27.
2017-03-27 03:34:12 +01: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
52130160db Adds Body Markings
So you can customize your character with tattoos or fur colors for Taj or whatever. I'll let Anewbe work out what he wants to whitelist other than what I did already.

The icons are sliced up with the HumanScissors program I wrote, so they are per-organ. So, lop off a limb, put it on someone else, they have the tattoos and whatnot. It's part of DNA so it comes with when cloning.

They are defined in the normal sprite_accessories file and the icons are all in markings.dm in the format of "markingname-organtag" so if you have a marking that spans both arms and torso you need "thatone-torso", "thatone-l_arm", "thatone-r_arm" icon states.
2017-03-26 19:36:34 -04:00
Anewbe
d665a0dee2 Makes translators more expensive 2017-03-26 17:36:36 -05:00
Anewbe
6b0500dd27 Makes space in the uniforms.dmi file 2017-03-26 00:59:14 -05: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
nachomeep
fda29e2bc0 big sprite update for skrell 2017-03-25 10:08:03 -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
Arokha Sieyes
805b473976 Polaris Sync Merge
Fixed Polaris merge conflicts
* Space controller merge conflict
2017-03-18 00:58:12 -04:00
Neerti
e08b8edbd3 Merge pull request #3077 from Anewbe/translator
Ports the translator
2017-03-14 21:23:13 -04:00
Anewbe
ab1812d9ff Adds the ear translator 2017-03-13 20:03:45 -05:00
Arokha Sieyes
6e8667e948 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into aro-newpolsync
# Conflicts:
#	code/game/objects/items/weapons/tanks/tank_types.dm
#	code/modules/events/canister_leak.dm
#	code/modules/gamemaster/actions/canister_leak.dm
2017-03-13 01:29:01 -04:00
Neerti
11b1185005 Adds Two QOL Say/Emote Features 2017-03-12 09:30:48 -04:00
Anewbe
f4dd443b01 Ports the translator 2017-03-10 21:46:57 -06:00
Leshana
f53dfde515 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into sync-2017-03-06
# Conflicts:
#	code/game/objects/items/blueprints.dm
#	vorestation.dme
2017-03-06 20:58:38 -05:00
Arokha Sieyes
c7857a5bf3 Improves AR glasses, makes them available
Now you can start with them in loadout. They are no longer SUNglasses though, so they won't protect you from flashes.

There are several models, the loadout ones are the civilian ones.

- Civilian: Displays job ID icon based on the person's ID, and shows a health bar only if they are injured.
- Medical: Same as civlian, but displays advanced status (virus, borer, etc) along with backup implant status, and allows medical records access.
- Security: Same as civilian, but displays warrant and arrest status, and will automatically darken (electrochromic) in response to flashes, making the wearer immune, plus security records access.
- Engineering: Same as civilian, but will automatically darken to protect one's eyes during welding.
- Research: Same as civilian, but has a trendy goggle form factor for SCIENCE reasons.
- Omni: Has the combined features of all of the above. The only pair available spawns in the CD's office. (CC officers also)
2017-03-05 20:58:59 -05:00
Poojawa
ec3056466c Merge remote-tracking branch 'refs/remotes/VOREStation/master' into ds9-uniforms 2017-03-05 03:53:57 -06:00
Poojawa
5fdbaceb44 ds9 overcoats 2017-03-05 03:53:55 -06:00
Arokha Sieyes
ffac4f72ba KIN -> KHI Renames
They don't have a Navy, I dunno why I put that. Also checks the file that SOMEONE keeps forgetting to check.
2017-03-04 22:14:45 -05:00
Arokha Sieyes
755bc0d7d1 Adds Serdy's Robobutt
Also adds a general cyberlimb whitelisting system since that's apparently needed now.

App: http://forum.vore-station.net/viewtopic.php?f=45&t=875
2017-03-04 17:25:17 -05:00
Arokha Sieyes
97ca5c2542 Merge pull request #1062 from VOREStation/aro-030217sync
Polaris Sync
2017-03-03 14:29:40 -05:00
JoanRisu
7653763fc4 Merge pull request #1059 from Poojawa/trekuniforms
trek uniforms + loadout listing
2017-03-03 01:05:53 -08:00
Poojawa
7891bf2b52 Trek Uniforms 2017-03-03 02:51:05 -06:00
Arokha Sieyes
387f429e5e Merge large polaris changes 2017-03-02 22:44:17 -05:00
Anewbe
25b925f04c Merge branch 'master' of https://github.com/PolarisSS13/Polaris into boots
# Conflicts:
#	maps/northern_star/polaris-1.dmm
#	maps/northern_star/polaris-2.dmm
2017-03-02 16:53:29 -06:00
Anewbe
bb2adf1290 Merge pull request #3021 from Neerti/2/23/2017_porting_map_datum_system
Ports a large chunk of the map datum system that europa/bay uses.
2017-03-02 16:32:02 -06:00
Poojawa
c062a0cfe1 trek uniforms + loadout listing 2017-03-02 12:00:19 -06:00
Yoshax
94294f0a3f Colorable loadout items 2017-03-02 12:56:09 +00:00
Neerti
12abb2d6f2 Ports a large chunk of the map datum system that europa/bay uses.
Links many map-specific details such as the station name, z-level information, and allowed jobs from global vars to map datum vars, which should help us maintain multiple maps at once in the future, which will be needed for the future Southern Cross.
Note that a config change will be needed to change GENERATE_ASTEROID to GENERATE_MAP, otherwise no changes should be required to continue normal map usage.
To change to a different map, it's suggested to tick the file that ticks all the other needed files, which for the Northern Star is called northern_star.dm.
2017-02-27 07:36:41 -05:00
Yoshax
ead56a1776 Fixes a loadout issue 2017-02-26 14:28:44 +00:00
Arokha Sieyes
cfd0db5a97 Merge pull request #999 from Yoshax/voxvoxvox
Fixes loadout stuff
2017-02-21 21:02:43 -05:00
Yoshax
a07033fd15 Fixes loadout stuff 2017-02-22 01:08:58 +00:00
Anewbe
2de037fbbf Ports a bunch of fluff stuff 2017-02-21 13:50:14 -06:00
Arokha Sieyes
d08071ab7e Merge pull request #996 from VOREStation/reslvfix
Further fixes
2017-02-21 14:25:19 -05:00
Arokha Sieyes
dd733371bc Further fixes
Apparently the weight prefs were accidentally removed (this also fixes size prefs when spawning), fixes size when resleeving, renames char setup options to be more explanatory
2017-02-21 14:15:59 -05:00
Yoshax
c31100f134 Adds Vox loadout stuff 2017-02-21 14:54:16 +00:00
Arokha Sieyes
5b257f55e3 Make OOC notes persistant
Even when logged out, or body swapped, or new bodies are printed.
2017-02-19 17:48:17 -05:00
Leshana
978b982fa2 Added options for starting with scan or resleeving lock to the player setup panel. 2017-02-19 16:26:59 -05:00
Arokha Sieyes
74018ebd34 Basically replaced biological cloning so far 2017-02-19 00:01:14 -05:00
Arokha Sieyes
e4557b0724 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into sync 2017-02-14 20:29:57 -05:00
Anewbe
7417bef794 Boots are now a subtype of shoes 2017-02-05 16:17:41 -06:00
Anewbe
79390b6177 Adds rugged style PDAs 2017-02-04 22:42:06 -06:00
nachomeep
c2ed062b3f Fixes custom loadout and slot system. 2017-02-02 15:37:27 -05:00
nachomeep
c81b18b40a adds fannypacks
To custom loadout as well.
2017-02-01 18:31:49 -05:00
killer653
3f1e5c80f2 Polaris sync 2017-02-01 15:08:45 -05:00
OrbisAnima
16a44b75bd Swimsuits for All! Fluff items for some
-Added swimsuits to be picked in the loadout, since I created a special
container for them, they wont replace the uniform you spawn with. They
can be found in uniforms and suits!

-Added Xsdew departamental selection of swimsuits! (Security, Medbay,
Science and Engineering)

-Added Xsdew Fluff swimsuit!
2017-01-29 11:10:00 -03:00
Anewbe
09ce761931 Adds Medical and Meson Aviators 2017-01-26 22:25:37 -06:00