Commit Graph

159 Commits

Author SHA1 Message Date
Razgriz f00fdebbb9 Merge branch 'master' of https://github.com/Yawn-Wider/YWPolarisVore into August2020UpstreamPull
August2020UpstreamPull
2020-08-09 02:58:18 -07:00
izac112 c6075d1216 Voreupdate (small) 2020-07-30 00:17:26 +02:00
Killian b4998c1de9 Merge remote-tracking branch 'upstream/master' into kk-fixes 2020-07-26 02:07:45 +01:00
Killian c46395750d Update skin.dmf 2020-07-26 02:07:38 +01:00
izac112 601a155b30 Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac 2020-07-25 15:22:42 +02:00
Atermonera e5265d43d9 Merge pull request #7335 from Cerebulon/blurSprites
Attempts to fix blurry icon scaling
2020-07-15 14:36:02 -04:00
Razgriz 02421b075e Merge branch 'master' of https://github.com/Yawn-Wider/YWPolarisVore into July2020UpstreamPull 2020-07-12 16:14:45 -07:00
izac112 e807b80281 Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac 2020-05-27 20:10:55 +02:00
Aronai Sieyes 67a5ead927 Click background in character preview to change it 2020-05-22 11:07:43 -04:00
Leshana fb532ac920 Refactor Character Setup to use MAP
- Instead of using expensive getFlatIcon() calls, character previews are now shown using screen objects in a second map window.
- Edited skin to add a named window for preferences setup that contains a browser plus a new map window to show the previews.
- Mannequins are still generated the same way, but now a MA is applied to four screen objects which are shown in the second map window.
- The screen objects are deleted on close of the preferences window.  So we do make sure to close it when spawning.
2020-05-21 19:04:56 -04:00
Razgriz 77519764ef Update skin.dmf 2020-05-15 14:32:33 -07:00
Razgriz d7c790941d Fix main window chomp logo 2020-04-16 21:09:29 -07:00
Erik eb9c3cd387 Merge branch 'master' of https://github.com/Yawn-Wider/YWPolarisVore into UpstreamMergeApril2020 2020-04-11 16:53:35 -07:00
Repede 7f1a6d6cc7 Fuck this shit
Merge branch 'release' of https://github.com/VOREStation/VOREStation

# Conflicts:
#	code/controllers/autotransfer.dm
#	code/controllers/subsystems/inactivity.dm
#	code/game/area/Away Mission areas.dm
#	code/game/area/Space Station 13 areas.dm
#	code/game/jobs/job/captain.dm
#	code/game/jobs/job/civilian.dm
#	code/game/jobs/job/security.dm
#	code/game/jobs/jobs.dm
#	code/game/machinery/air_alarm.dm
#	code/game/machinery/suit_storage_unit.dm
#	code/game/machinery/suit_storage_unit_vr.dm
#	code/game/mecha/combat/gorilla.dm
#	code/game/turfs/simulated/dungeon/wall.dm
#	code/game/turfs/simulated/wall_types.dm
#	code/modules/client/preference_setup/loadout/loadout_utility_vr.dm
#	code/modules/clothing/glasses/glasses.dm
#	code/modules/clothing/spacesuits/rig/rig_pieces_vr.dm
#	code/modules/clothing/spacesuits/void/void_vr.dm
#	code/modules/clothing/under/accessories/holster.dm
#	code/modules/mob/language/station_vr.dm
#	code/modules/mob/living/carbon/human/emote_vr.dm
#	code/modules/mob/living/carbon/human/species/station/station_vr.dm
#	code/modules/mob/living/carbon/human/species/station/traits_vr/positive.dm
#	code/modules/mob/new_player/sprite_accessories_vr.dm
#	code/modules/power/apc.dm
#	code/modules/power/lighting.dm
#	code/modules/resleeving/machines.dm
#	config/jobwhitelist.txt
#	icons/mob/species/seromi/head.dmi
#	icons/mob/species/seromi/suit.dmi
#	icons/mob/species/vulpkanin/helmet.dmi
#	icons/mob/species/vulpkanin/suit.dmi
#	maps/tether/submaps/_tether_submaps.dm
#	maps/tether/tether_areas2.dm
#	maps/tether/tether_defines.dm
#	maps/tether/tether_shuttles.dm
#	nano/templates/apc.tmpl
#	vorestation.dme
2020-04-04 14:37:55 -04:00
Aronai Sieyes b2605300f2 Mergey Merge Polaris VChat 2020-03-29 15:37:43 -04:00
Aronai Sieyes 8a33afaff6 VChat: Redone chat output done in Vue.js 2020-03-27 17:08:14 -04:00
Aronai Sieyes dafd19c708 Some VChat Tweaks
- Chat remains between client reconnects if your client didn't close (so things like using the reconnect button, or autoreconnects at round end when that feels like working)
- The client doesn't send pings to the server, the server sends pings to the client. This fixes AFK measurements for AFK kick purposes.
- Turn latency indicator into a green/red indicator to show if you're connected, and when clicked will perform a one-time ping (and block doing it again for 10 seconds). It will display '?ms' if it never got a reply, or '999ms' if it did, but it was over 1s.
2020-03-04 20:53:35 -05:00
Repede c45d7c2196 Merge branch 'release' of https://github.com/VOREStation/VOREStation
# Conflicts:
#	code/_helpers/unsorted.dm
#	code/modules/events/event_container_vr.dm
#	icons/misc/title_vr.dmi
#	interface/skin.dmf
#	vorestation.dme
2020-03-01 12:35:52 -05:00
Repede 4cf7f71be6 Merge branch 'release' of https://github.com/VOREStation/VOREStation
# Conflicts:
#	code/game/area/Away Mission areas.dm
#	code/game/objects/items/weapons/stunbaton.dm
#	code/game/objects/items/weapons/teleportation.dm
#	code/modules/clothing/glasses/glasses.dm
#	code/modules/events/event_container_vr.dm
#	code/modules/mining/ore_box.dm
#	code/modules/paperwork/paper.dm
#	code/modules/rogueminer_vr/zone_console.dm
#	config/custom_items.txt
#	icons/mob/items/lefthand_suits.dmi
#	icons/mob/items/righthand_suits.dmi
#	icons/mob/species/vulpkanin/helmet.dmi
#	icons/mob/species/vulpkanin/suit.dmi
#	icons/mob/suit.dmi
#	icons/obj/clothing/suits.dmi
#	maps/tether/tether_defines.dm
2020-02-22 12:38:04 -05:00
Leshana ca5937eaa0 VS: Hide the media player control 2020-02-19 19:55:01 -05:00
ShadowLarkens 22c85075f4 Ported tg asset cache 2020-02-19 19:55:01 -05:00
Arokha Sieyes d5b820fc58 VChat: Redone chat output in Vue.js
Co-authored-by: Leshana <Leshana@users.noreply.github.com>
2020-02-19 19:55:01 -05:00
Killian dcd691245c feex title 2020-02-17 10:35:55 +00:00
Arokha Sieyes 47ccc655db Deprecate the stream operator 2020-02-12 19:38:43 -05:00
TheFurryFeline c10fbfaa83 Chompers Icon 2019-12-26 13:02:22 -05:00
TheFurryFeline e0e419fac0 Fixes Window Title
On the tin.

Changelog Note: Reverts overwritten change to skin.dmf.
2019-12-25 19:41:45 -05:00
Razgriz ebd36b503b Dark Theme 2019-12-25 04:14:00 -07:00
TheFurryFeline 724ca28fc0 We Are Chompers!
Changelog Notes:

- Fixes welcome image, its displayed name on the bottom.

- Fixes window title name.

- Comments out unneeded stuff about YW and Virgo in global.dm.
2019-12-24 14:00:43 -05:00
Atermonera a45472b446 Update Chat System to use to_chat(src, "") instead of src << "" 2019-11-05 19:22:38 -05:00
Atermonera 9d4d24a80e Merge pull request #6187 from chaoko99/reconnect
Adds the clientside ping and reconnect commands to the skin, under file.
2019-06-04 13:12:33 -04:00
Neerti 16b3b58259 [REVIEW] Ports Modular Computers from Baystation 2019-04-28 22:06:40 -04:00
Anewbe e4660c5838 Admin ticket system (for real this time) 2018-10-09 16:31:01 -04:00
Arokha Sieyes b099ac6e4c Merge branch 'master' of https://github.com/VOREStation/Polaris into sync-09272018
# Conflicts:
#	code/__defines/holomap.dm
#	code/__defines/mobs.dm
#	code/_helpers/icons.dm
#	code/_helpers/unsorted.dm
#	code/_onclick/hud/hud.dm
#	code/_onclick/item_attack.dm
#	code/controllers/Processes/supply.dm
#	code/controllers/subsystems/planets.dm
#	code/datums/supplypacks/munitions.dm
#	code/datums/supplypacks/science.dm
#	code/datums/supplypacks/security.dm
#	code/datums/supplypacks/supply.dm
#	code/game/area/Space Station 13 areas.dm
#	code/game/atoms_movable.dm
#	code/game/machinery/autolathe.dm
#	code/game/machinery/doors/door.dm
#	code/game/machinery/jukebox.dm
#	code/game/machinery/recharger.dm
#	code/game/machinery/vending.dm
#	code/game/mecha/equipment/tools/medical_tools.dm
#	code/game/mecha/equipment/weapons/weapons.dm
#	code/game/objects/items/devices/PDA/PDA.dm
#	code/game/objects/items/devices/megaphone.dm
#	code/game/objects/items/poi_items.dm
#	code/game/objects/items/weapons/implants/implantlanguage.dm
#	code/game/objects/items/weapons/storage/firstaid.dm
#	code/game/objects/items/weapons/tools/weldingtool.dm
#	code/game/objects/structures/flora/trees.dm
#	code/game/objects/structures/plasticflaps.dm
#	code/game/supplyshuttle.dm
#	code/game/turfs/simulated/wall_attacks.dm
#	code/modules/admin/admin_verbs.dm
#	code/modules/assembly/infrared.dm
#	code/modules/client/client procs.dm
#	code/modules/client/preference_setup/loadout/loadout_utility.dm
#	code/modules/client/preferences.dm
#	code/modules/clothing/suits/miscellaneous.dm
#	code/modules/holomap/holomap_datum.dm
#	code/modules/holomap/station_holomap.dm
#	code/modules/integrated_electronics/core/printer.dm
#	code/modules/mining/machine_processing.dm
#	code/modules/mob/living/carbon/human/human_defense.dm
#	code/modules/mob/living/carbon/human/species/virtual_reality/avatar.dm
#	code/modules/mob/living/death.dm
#	code/modules/mob/living/silicon/ai/ai.dm
#	code/modules/mob/living/silicon/pai/pai.dm
#	code/modules/mob/living/silicon/robot/robot.dm
#	code/modules/mob/living/simple_animal/animals/parrot.dm
#	code/modules/mob/mob_movement.dm
#	code/modules/organs/organ_external.dm
#	code/modules/organs/organ_icon.dm
#	code/modules/organs/subtypes/standard.dm
#	code/modules/planet/weather.dm
#	code/modules/power/cable.dm
#	code/modules/power/fusion/core/core_control.dm
#	code/modules/power/fusion/fuel_assembly/fuel_control.dm
#	code/modules/power/fusion/gyrotron/gyrotron_control.dm
#	code/modules/projectiles/gun.dm
#	code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm
#	config/names/first_name_skrell.txt
#	config/names/last_name_skrell.txt
#	icons/mob/head.dmi
#	icons/mob/robots.dmi
#	icons/mob/species/tajaran/helmet.dmi
#	icons/obj/ammo.dmi
#	icons/obj/gun.dmi
#	icons/obj/mining.dmi
#	icons/obj/projectiles.dmi
#	icons/obj/rig_modules.dmi
#	icons/obj/surgery.dmi
#	icons/turf/walls.dmi
#	maps/southern_cross/southern_cross-1.dmm
#	maps/southern_cross/southern_cross-3.dmm
#	maps/southern_cross/southern_cross-6.dmm
#	maps/southern_cross/southern_cross-8.dmm
#	maps/submaps/surface_submaps/mountains/backup/IceCave1.dmm
#	maps/submaps/surface_submaps/mountains/backup/IceCave1A.dmm
#	maps/submaps/surface_submaps/mountains/backup/IceCave1B.dmm
#	maps/submaps/surface_submaps/mountains/backup/IceCave1C.dmm
#	maps/submaps/surface_submaps/mountains/crashedcontainmentshuttle.dmm
#	maps/submaps/surface_submaps/mountains/deadspy.dmm
#	maps/submaps/surface_submaps/mountains/mountains_areas.dm
#	maps/submaps/surface_submaps/plains/Thiefc.dmm
#	maps/~map_system/maps.dm
#	vorestation.dme
2018-09-27 18:01:09 -04:00
Anewbe cff73a6ad8 May or may not make movement seem smoother 2018-08-11 23:15:06 -05:00
Arokha Sieyes ad937f4b73 Originalize window title and icon
Oo-rah.
2018-05-07 01:20:52 -04:00
Isaac ead166d8c8 originalize window title 2018-05-05 19:10:15 -05:00
Arokha Sieyes de6da4a86c POLARIS: Tooltip framework, and mob tooltips 2018-03-20 22:42:16 -04:00
Arokha Sieyes 428db6c271 POLARIS: Tooltip framework, and mob tooltips 2018-03-12 18:25:53 -04:00
Leshana 4ebbf1ce7a Merge branch 'master' of https://github.com/PolarisSS13/Polaris into polaris-sync-2018-02-24
# Conflicts:
#	maps/southern_cross/southern_cross-1.dmm
2018-02-24 13:19:10 -05:00
Leshana 1d11b0d6e1 Create client preference for if hotkey mode is enabled by default on login or not.
* Adds preference setting for wether hotkeys should default to enabled or disabled.
* Fixes bug for CTRL+NUMPAD8 using old verb name for toggling head.
2018-02-23 14:16:53 -05:00
Leshana 6bc422ff5e Ported VOREStation/VOREStation#461 - Allow greater customisation of wiki links 2018-01-17 16:46:48 -05:00
Neerti e1ee396501 Revert "Wiki Path Fix" 2018-01-16 07:34:51 -05:00
Leshana 28c193cbdb Merge remote-tracking branch 'refs/remotes/polaris-upstream/master' into polaris-sync-2018-01-04
# Conflicts:
#       code/game/objects/items/devices/communicator/communicator.dm
#       code/modules/client/preference_setup/occupation/occupation.dm
#       code/modules/mob/living/simple_animal/animals/cat.dm
#       code/modules/mob/mob_helpers.dm
#       code/unit_tests/zas_tests.dm
#       maps/southern_cross/southern_cross-1.dmm
#       maps/southern_cross/southern_cross-3.dmm
#       maps/southern_cross/southern_cross-6.dmm
#       vorestation.dme
2018-01-04 22:44:04 -05:00
Cyantime 157f61d738 Clarifies del hotkey 2018-01-02 23:22:03 -05:00
Cyantime 243ed81a3a Clarifies pull and examine hotkeys in help text 2018-01-02 22:53:35 -05:00
Leshana 2e59e24dca Merge branch 'master' of ../Polaris into polaris-sync 2017-04-16 20:58:40 -04:00
LorenLuke e60c552396 Adds ability to not just chat-mode. 2017-04-12 03:11:43 -07:00
LorenLuke cebbac32e8 Allows usage of ctrl+numpad for target zone selecting. 2017-04-11 00:25:29 -07: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
Arokha Sieyes 95a3c14925 This fixes a bunch of things so here's each file change and why:
global_lists_vr.dm - Removes generic 'suit' which included basically any outerwear, and the invisible magical storage/internal
storage/internal.dm - Don't name the storage inside suits the same as the suit. It causes weird name-alignment problems where if you delete the suit it might just delete the internal storage, or the other way around.
Dreaming.dm - Added some vorish stuff I made up.
belly_vr.dm - Fixes for digesting items and how that works, and how to prevent them from showing up on the HUD. Also fixes IDs falling onto the floor (among other things).
living_vr.dm - Just in case, adds null-entry cleanup to belly cleanup proc.
bellymodes_vr.dm - Removes previous null-item hotfix.
vorepanel_vr.dm - Adds zero-width space to make items in belly wrap and not look horrible.
skim.dmf - Adds Y hotkey for whisper, and 6 hotkey for subtle.

Closes #455
Closes #443
Closes #239
2016-10-20 16:34:34 -04:00