cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-09 16:12:17 +00:00
Code Issues Packages Projects Releases Wiki Activity
66,285 Commits 10 Branches 0 Tags
c7a71bc5996fe35236c6910c1893aae66b1a2460
Commit Graph

178 Commits

Author SHA1 Message Date
Aronai Sieyes
27d66c9e19 Merge pull request #10975 from VOREStation/Fixes/10966 
Fixes #10966
 2021-07-08 06:48:37 +00:00
Nadyr
1212755f9c Merge pull request #2455 from CHOMPStationBot/upstream-merge-10953 
[MIRROR] Fix security cameras showing weird space thing
 2021-07-07 23:59:57 -04:00
Aronai Sieyes
378fd085fc Merge pull request #10953 from VOREStation/Arokha/seccamera 
Fix security cameras showing weird space thing
 2021-07-07 21:15:05 +00:00
Chompstation Bot
1513fbe0cb SSInput and Diagonal Movement 2021-07-07 18:35:44 +00:00
Aronai Sieyes
c2df539965 Merge pull request #10864 from VOREStation/Arokha/erpking 
Change chat message boxes to resizable tgui
 2021-07-04 05:17:41 +00:00
Chompstation Bot
ecfa52682c Add discord button to top 2021-07-03 21:20:55 +00:00
Chompstation Bot
b6e1989a01 The One Where I Port Modals 2021-06-30 19:29:34 +00:00
Chompstation Bot
4476e4104d Ports Runechat 2021-05-30 22:51:20 +00:00
Novacat
5cfc6d95bd Merge pull request #10294 from VOREStation/upstream-merge-8062 
[MIRROR] B to Resist!
 2021-05-11 13:05:31 +00:00
Novacat
a084a1855e Merge pull request #10255 from Novacat/nova-ert 
B to Resist
 2021-05-05 18:45:45 +00:00
Verkister
2e68ca894d Merge pull request #9265 from Detective-Google/pixel-shift 
Ports Pixel shifting.
 2020-10-31 19:37:42 +00:00
Chompstation Bot
77c15811a2 Datum Component System (/tg/ port) 2020-10-19 10:36:26 +00:00
Cadyn
07775449d7 Fixing conflicts 2020-10-05 18:10:53 -07:00
Atermonera
9ebf133137 Merge pull request #7688 from ShadowLarkens/rest-hotkey 
Add U as hotkey to rest
 2020-09-26 16:58:30 -04:00
Razgriz
54e632ebf2 September 2020 Upstream Merge 2020-09-25 23:07:08 -07:00
izac112
5c02633707 Merge branch 'izac' of https://github.com/Yawn-Wider/YWPolarisVore; branch 'release' of https://github.com/VOREStation/VOREStation into izac 2020-08-13 20:01:22 +02:00
Rykka
f6105bc3b5 Fix Asset Cache Verification - TGUI Bugfix 
BYOND is injecting html to load js shims into json files returned by xhr. this will get fixed in a later byond release, but this disables the functionality for the asset cache skin control today.

Fix to be removed once the HTML injection is removed from asset cache (pending a BYOND change).
 2020-08-13 04:02:22 -04:00
Razgriz
f00fdebbb9 Merge branch 'master' of https://github.com/Yawn-Wider/YWPolarisVore into August2020UpstreamPull 
August2020UpstreamPull
 2020-08-09 02:58:18 -07:00
Atermonera
2e8c085927 Merge pull request #7381 from Verkister/patch-43 
Adds a preference dropdown for window scaling
 2020-08-01 23:59:02 -04:00
izac112
c6075d1216 Voreupdate (small) 2020-07-30 00:17:26 +02:00
Verkister
ea500e8cc4 Reverts the forced sharp scaling on map window. 
A bandaid fix that'll hopefully be replaced with an actual preference toggle button rather than the upstream fetish of hardcoding and forcing client preferences without access buttons to them.
Basically fixes map window having turned to sharp scaling, meaning that using the "stretch to fit" mode will mangle the entire screen if someone needs a little bit of a tweak. Most screens aren't big enough to blur the map window noticeably and if you're on a 4k screen, set your icon mode to 96 or 128 for fuck's sake.
 2020-07-27 17:13:00 +03: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