cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-10 18:22:39 +00:00
Code Issues Packages Projects Releases Wiki Activity
68,171 Commits 8 Branches 0 Tags
15f43a90e1bf5a6d55e7145d8bc2a79d48ed5b5f
Commit Graph

224 Commits

Author SHA1 Message Date
Chompstation Bot
15cafbe65b Optimize a couple things 2021-07-20 21:30:20 +00:00
Chompstation Bot
b6e1989a01 The One Where I Port Modals 2021-06-30 19:29:34 +00:00
Chompstation Bot
fb343cec6c [MIRROR] Linter diagnostics + bans non-var relative pathing 2021-06-22 22:17:02 +00:00
Aronai Sieyes
6d37b26e57 Merge pull request #10452 from VOREStation/Arokha/langsani 
Fix language sani on relogins
 2021-05-28 00:47:56 +00:00
Chompstation Bot
ad57e1ad13 [MIRROR] Sideports a couple of init unit tests from Neb. 2021-02-27 18:45:36 +00:00
Cadyn
00bc513e6e Implementing TGSQL security 2021-01-27 10:51:12 -08:00
Cadyn
76ed115e37 Porting TG's SQL 2021-01-25 23:37:49 -08:00
Novacat
d9c7aba53d Merge pull request #9544 from VOREStation/upstream-merge-7803 
[MIRROR] Fixes dark click catcher
 2021-01-24 06:57:14 +00:00
Razgriz
f00fdebbb9 Merge branch 'master' of https://github.com/Yawn-Wider/YWPolarisVore into August2020UpstreamPull 
August2020UpstreamPull
 2020-08-09 02:58:18 -07:00
izac112
601a155b30 Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac 2020-07-25 15:22:42 +02:00
ShadowLarkens
126cc6b5da Update asset_cache to modern /tg/, and make TGUI compatible with it. CDN support, etc. 2020-07-19 20:46:12 -07:00
izac112
c4e58b4f28 Disables export chat logs until we can get it fixed 2020-07-19 14:18:45 +02:00
ShadowLarkens
2992efb823 TGUI v4.0 2020-07-17 22:09:26 -07:00
Razgriz
02421b075e Merge branch 'master' of https://github.com/Yawn-Wider/YWPolarisVore into July2020UpstreamPull 2020-07-12 16:14:45 -07:00
izac112
d9af2a4cca updates client procs.dm 2020-07-06 15:38:55 +02:00
izac112
4864ad384d Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac 2020-06-17 04:30:06 +02:00
Arokha Sieyes
f1854f89b9 Add more safety around the hours query 2020-06-13 23:07:12 -04:00
izac112
0d1fe7d706 Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac 2020-05-30 16:01:43 +02:00
Aronai Sieyes
ad820c6bc5 Make being disconnected painfully obvious 2020-05-28 12:56:00 -04:00
izac112
e807b80281 Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac 2020-05-27 20:10:55 +02:00
Atermonera
f0bf4efcca Adds vchat export chatlog verb (#7214) 2020-05-24 17:24:24 -04:00
Leshana
8a21fc2e6c Add code to enable communication with VGS 
VGS provides a subset of TGS functionality, mostly just the discord bot.  It extends TGS datums and adds a little bit.
Right now its done in parallel to TGS's code to minimize impact of not having the rest of DMAPI v5 impemented.
 2020-05-24 02:11:16 -04:00
Aronai Sieyes
f535ee89f3 Warn VPN connectors better 2020-05-22 20:11:02 -04:00
izac112
e684df5236 Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac-voreupdate 2020-05-21 21:17:58 +02:00
Razgriz
3dabdca3f3 Merge branch 'master' of https://github.com/Yawn-Wider/YWPolarisVore into May2020UpstreamPull2-2 2020-05-21 03:20:13 -07:00
Aronai Sieyes
ffe7b9496d Remove stat() sleeping 2020-05-19 16:25:56 -04:00
izac112
c14d144d45 Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac-voreupdate 2020-05-18 16:05:36 +02:00
Leshana
4b29c1118e Fixed a couple issues and added columns to schema file. 2020-05-17 22:16:00 -04:00
Aronai Sieyes
e585a6dc47 Semi-automate discord ID registration 2020-05-17 21:14:18 -04:00
izac112
bba0a05f5f Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac-voreupdate 2020-05-13 10:21:49 +02:00
Aronai Sieyes
d4cfdcfb3a Switch to using GLOB.admins instead of admins 2020-05-12 11:16:54 -04:00
izac112
2b3fc9a740 Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac-voreupdate 2020-05-11 18:20:43 +02:00
Aronai Sieyes
ea8a068025 Add department playtime requirement config, code 2020-05-08 17:57:56 -04: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
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
Hawk_v3
f2b8f92b63 Merge remote-tracking branch 'upstream/master' into releaseupdate 2020-03-02 17:55:11 +00:00
Aronai Sieyes
6af54bfec2 NanoUI Subsystem Fixes 
Don't do this, the asset subsystem does this for you
 2020-03-01 14:14:52 -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
Novacat
b44f8e0911 Merge pull request #6592 from VOREStation/vchat-rebase 
VChat: Redone chat output in Vue.js
 2020-03-01 10:51:29 -05:00
Atermonera
fbe42c39ef Merge pull request #6733 from VOREStation/pol-aitweaks 
Readd some AI features and improve AI buildmode
 2020-02-26 20:16:06 -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
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
Erik
11268a3ff4 Merge branch 'master' of https://github.com/Yawn-Wider/YWPolarisVore into MyUpstreamMerge 2020-02-13 20:36:32 -08:00
Aronai Sieyes
641ed43b23 This one should be WRITE_LOG 2020-02-13 12:21:03 -05:00
Arokha Sieyes
47ccc655db Deprecate the stream operator 2020-02-12 19:38:43 -05:00
izac112
933385020f Merge branch 'master' of https://github.com/VOREStation/VOREStation into izac-update 
# Conflicts:
#	code/modules/mining/machine_stacking.dm
#       Resolved
#	code/modules/mob/living/silicon/robot/robot_modules/station_vr.dm #       Resolved mostly besides line 717 "plasteel: undefined var"
#       even though the only change in this line is removing the comment
#	icons/mob/widerobot_vr.dmi
#       Resolved
#	maps/tether/tether-07-station3.dmm
#       Resolved
 2020-01-31 18:23:50 +01:00
Novacat
b0b60d051e Update client procs.dm 2020-01-21 18:56:54 -05:00
Atermonera
44d334a37c IP reputation checking 2020-01-21 18:11:29 -05:00