Commit Graph

16690 Commits

Author SHA1 Message Date
Anewbe
81d401c7e0 Removes the testing code 2017-03-25 10:54:55 -05:00
Neerti
eb73ee4b44 Merge pull request #3120 from Anewbe/alien_tweaks
Xeno race tweaks
2017-03-25 11:27:22 -04:00
nachomeep
fda29e2bc0 big sprite update for skrell 2017-03-25 10:08:03 -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
3816d634ed Merge branch 'master' of https://github.com/PolarisSS13/Polaris into armor_soak
# Conflicts:
#	code/modules/mob/living/simple_animal/animals/bear.dm
#	code/modules/mob/living/simple_animal/animals/parrot.dm
2017-03-24 16:35:31 -05: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
Arokha Sieyes
52a73cae25 Merge pull request #1229 from VOREStation/aro-rangedvore
Prevent ranged vore
2017-03-22 19:59:34 -04:00
Leshana
f0270451a7 Added vore capabilies to the new simple_animal system.
* Added happy friend time mechanics working properly for fox and cat.
* Added vore mechanics and vore overrides
* No longer enable vore on simple animals by creating a "/vore" subtype.  Instead we simply enable vore on the main type.  Consensus being we don't need a type for non-vore versions of stuff.
  * This allowed us to revert many path references throughout the codebase to the original non-vorestation back to their original values.  In these cases the "Vorestation Edit" comment is removed.
* Moved the vore overrides for upstream simple animals into its own file zz_vore_overrides.dm
2017-03-22 19:32:19 -04:00
Arokha Sieyes
3857cb92b2 Arokha SA Rework (VOREStation) 2017-03-22 19:32:19 -04:00
Arokha Sieyes
88b5756977 Arokha SA Rework (Polaris) 2017-03-22 19:32:19 -04:00
Anewbe
980c982996 Fixes the conflicts in the original branch 2017-03-22 17:51:04 -05:00
Arokha Sieyes
fbb73e1ed8 Merge branch 'master' into robot 2017-03-22 18:45:25 -04:00
Anewbe
2c9c3e208e Merge branch 'master' of https://github.com/PolarisSS13/Polaris into heart_damage_2
# Conflicts:
#	code/modules/mob/living/simple_animal/hostile/giant_spider.dm
#	code/modules/organs/blood.dm
#	code/modules/organs/internal/lungs.dm
#	code/modules/organs/organ.dm
#	code/modules/organs/organ_external.dm
2017-03-22 17:29:01 -05:00
Anewbe
538f91c202 Borg stun arm should work now. 2017-03-22 17:06:16 -05:00
Anewbe
38598f3aae Merge pull request #3118 from Neerti/3/6/2017_surface_map
Continues work on the surface map
2017-03-22 16:33:40 -05:00
Arokha Sieyes
be36363a23 Ports several Paradise sound emotes (#3039)
* Ports several Paradise sound emotes

* Comment out scream MORE.

* Remove goonsounds, references
2017-03-22 16:11:55 -05:00
Arokha Sieyes
ae68468861 Allow AI to use custom holograms (#3114)
* Compound icon generator proc

Why didn't this exist before? Am I missing something? I need manipulatable icons of existing atoms including their overlays. Is there some easier way to get them than this...?

* Polaris Portion of AI Upgrade
2017-03-22 16:09:04 -05:00
Arokha Sieyes
9660186dfd Not So Simple Animals (#3103)
* Merge two not-really conflicts

Thanks git, that whitespace conflict was super important?

* DME merge

* Added defines for mobs used by simple animals.

* Lost a slime along the way

* Disable debug settings

* HONK!!!

* Remove redundant hostile decls

* Replace loc= with forceMove in old SA code

I guess I should think of the children.
2017-03-22 14:30:07 -05:00
Anewbe
68a335b0c5 Xeno race tweaks 2017-03-21 23:31:10 -05:00
Arokha Sieyes
452ee7e80f Prevent ranged vore
:[
2017-03-21 21:01:18 -04:00
Anewbe
560af2d61d Merge pull request #3116 from VOREStation/spawn
Makes the 'Spawn Character' verb include custom items
2017-03-21 18:38:23 -05:00
Anewbe
f16c6e22a7 Merge pull request #3115 from Atermonera/Emotes_don't_autohiss
Emotes, sign language, and EAL no longer activate autohiss
2017-03-21 18:38:04 -05:00
Neerti
b571ed9c66 Continues work on the surface map 2017-03-21 16:11:13 -04:00
Yoshax
7cf4a81bae Fixes an issue with suits and sprites 2017-03-21 19:14:42 +00:00
Arokha Sieyes
e6098840ec Fix runtime while eating
Don't divide by zero. If it has no flavors, this stays 0, then you try to divide by it.
2017-03-21 13:08:08 -04:00
Arokha Sieyes
be9bcf81f0 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into aro-sync 2017-03-21 11:22:29 -04:00
Arokha Sieyes
b19b119405 Merge pull request #1222 from VOREStation/aro-aistuff
AI Upgrades
2017-03-21 11:16:33 -04:00
Arokha Sieyes
17bd2d341a Makes the 'Spawn Character' verb include custom items
Only really works if you pick the option to put them in the mob, because the proc that spawns custom items is based on that, and I don't really want to rework the custom items system for such a small fix.
2017-03-21 09:48:55 -04:00
Arokha Sieyes
25a84af366 Makes the 'Spawn Character' verb include custom items
Only really works if you pick the option to put them in the mob, because the proc that spawns custom items is based on that, and I don't really want to rework the custom items system for such a small fix.
2017-03-21 09:44:02 -04:00
Atermonera
78c1b51f81 Languages with NO_STUTTER won't use autohiss anymore 2017-03-21 00:13:33 -07:00
Arokha Sieyes
60791e3645 VOREStation Portion of AI Upgrade 2017-03-21 03:02:31 -04:00
Arokha Sieyes
5ddf8c8185 Polaris Portion of AI Upgrade 2017-03-21 03:02:15 -04:00
Neerti
7f14550a9a Merge pull request #3010 from Anewbe/cargo_heph
Readds HI prosthetics, corrects naming
2017-03-21 00:27:00 -04:00
Leshana
3a4bc3d897 Fix signularity_pull leaving ghost item in your inventory slot
* It called u_equip()  Nothing should call u_equip(), bad!
* Also replaced magic numbers with defined constants while I was checking singularity code.
2017-03-20 21:31:52 -04:00
Anewbe
4779baf872 Spelling 2017-03-20 20:14:48 -05:00
Arokha Sieyes
d565ef3dae Merge pull request #1216 from Cameron653/master
Adds KiwiDaNinja's custom item
2017-03-20 10:11:43 -04:00
Arokha Sieyes
ebfa18aeea Fixed stupid rogue lines 2017-03-20 02:18:27 -04:00
Arokha Sieyes
a7b1e3f03b Cleaned up comments 2017-03-20 02:17:45 -04:00
Poojawa
557579fca1 Adds feedback to vendor uprising 2017-03-20 00:49:11 -05:00
killer653
761ff80f55 Adds KiwiDaNinja's custom item
Solves #1200
2017-03-20 01:45:52 -04:00
Anewbe
59a4f62668 Merge pull request #3078 from Leshana/vplk-atmos-leak
New Event: Atmos Leak
2017-03-19 20:22:42 -05:00
Atermonera
2d2763fdb0 Merge pull request #2 from PolarisSS13/master
There should probably be a way to do this automagically
2017-03-19 17:09:02 -07:00
Atermonera
530593508a Gives surgeonborgs the full medical hud, because why don't they already have it? 2017-03-19 16:58:53 -07:00