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
64,396 Commits 8 Branches 0 Tags
ac00965e68d6494489afd5baa8518466a4c66b7f
Commit Graph

77 Commits

Author SHA1 Message Date
Chompstation Bot
20e3b0a2d3 [MIRROR] Linter Introduction + Cleanup 2021-05-27 16:31:50 +00:00
Nadyr
e170a6b716 Merge pull request #1377 from CHOMPStationBot/upstream-merge-9763 
[MIRROR] [MIRROR] Fixes VChat HTML export text colours.
 2021-02-28 07:21:54 -05:00
Novacat
1bd2c1fc8f Merge pull request #9763 from VOREStation/upstream-merge-7900 
[MIRROR] Fixes VChat HTML export text colours.
 2021-02-20 07:32:01 +00:00
Novacat
95fbbf13aa Merge pull request #9753 from VOREStation/upstream-merge-7887 
[MIRROR] Sinta'unathi language color change
 2021-02-19 23:09:14 +00:00
Novacat
2de1f5aef0 Merge pull request #9628 from Cyantime/patch-5 
Includes subtles in Local Chat vchat filter
 2021-01-31 15:53:40 +00:00
Chompstation Bot
6ddd2efb7b [MIRROR] Blob Genesis 2021-01-13 00:22:31 +00:00
Razgriz
4ad7c79c7f Update ss13styles.css 2020-12-07 21:27:12 -07:00
Chompstation Bot
38bccdbfbd Fixes Spacer language color 2020-12-02 20:41:27 +00:00
Cadyn
0c96b58f3f Fixing conflict and allowing export chatlog 2020-10-21 13:28:59 -07:00
Chompstation Bot
19517fcede 13x Performance for Export chatlog, update rust_g to 0.4.6-vorestation 2020-10-20 03:19:38 +00:00
Razgriz
5aa396d998 Merge pull request #559 from cadyn/tempbsfix 
Disable Export chatlog again
 2020-10-06 01:11:53 -06:00
Cadyn
9f5befec5d Chompedit reee 2020-10-05 20:09:02 -07:00
Razgriz
54e632ebf2 September 2020 Upstream Merge 2020-09-25 23:07:08 -07:00
cadyn
b0404c7a4d Disable Export chatlog again 2020-09-24 20:05:54 -07:00
izac112
4b051c23fc Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac 2020-09-13 15:05:53 +02:00
Atermonera
3669657656 Fixes Runtime in vchat_client.dm,85: Cannot execute null.is preference enabled (#7557) 2020-08-25 00:32:25 -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
izac112
601a155b30 Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac 2020-07-25 15:22:42 +02:00
Novacat
8b7d087259 Merge pull request #8437 from Tenryumi/dragon-stuff 
Adds dragon-y language and "*gao" emote
 2020-07-21 18:12:43 -04:00
Amy
ebaa88764d Brightens D'Rudak'Ar language color 2020-07-20 16:02:39 -05:00
Amy
51d2c98e33 Adds dragon language, gao emote w/ sound 2020-07-20 00:49:05 -05:00
Atermonera
a26d43c7f9 Merge pull request #7353 from Shadow-Quill/CheckExportTick 
[SEMI-URGENT] Fixes hanging/crashing server when using the Export-Chatlog verb in OOC
 2020-07-19 23:38:46 -04:00
Shadow Quill
c6668c85ea Scree 2020-07-19 16:19:50 -05:00
Shadow Quill
e1ec137e2a Checks the Ticks 2020-07-19 16:13:31 -05:00
Shadow Quill
f0a66971eb Checktick 2020-07-19 16:03:52 -05:00
izac112
c4e58b4f28 Disables export chat logs until we can get it fixed 2020-07-19 14:18:45 +02:00
Shadow-Quill
dbeae44531 A 2020-07-19 04:18:42 -05:00
Shadow-Quill
6205737639 Temporary moratorium on vchat exports. 2020-07-19 03:12:46 -05:00
izac112
d1ce4db947 Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac 2020-05-28 23:53:36 +02:00
izac112
e807b80281 Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac 2020-05-27 20:10:55 +02:00
Leshana
c6f29c3525 Fix loading of history on connect. 
The for loop that used to do it loaded the wrong messages.
New method calculates correctly and also doesn't spend time loading from database if we're going to throw it away.
 2020-05-26 15:50:50 -04:00
Leshana
ac8922bdf5 Check vchat loaded flag before attempting to call putmessage 2020-05-25 16:02:58 -04:00
Atermonera
f0bf4efcca Adds vchat export chatlog verb (#7214) 2020-05-24 17:24:24 -04:00
izac112
a964a3a1bc Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac-voreupdate 2020-05-16 23:26:52 +02:00
Atermonera
b6c8d31829 cleans up advanced_who output (#7148) 
* cleans up advanced_who output

* Missing tag
 2020-05-15 16:37:35 -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
9e3c04b7e1 Fix missing dash breaking numbers in URL ends 2020-05-11 17:58:45 -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
bd298810f2 Redo examining in general and tweak getFlatIcon 2020-05-06 18:37:46 -04:00
izac112
e28994b7be Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac-voreupdate 
All conflicts resolved

Signed-off-by: izac112 <izac10@live.com>
 2020-05-06 21:53:03 +02:00
Atermonera
23e72aa709 Merge pull request #7043 from MisterLayne/prommie-lang 
Promethean Language
 2020-05-03 03:14:21 -04:00
Atermonera
7e50177049 Merge pull request #7056 from the-og-gear/vchatlinks 
Adds some hyperlink functionality
 2020-05-01 15:53:46 -04:00
Arokha Sieyes
92a0f94b60 World.time can't possibly be null, and yet... 2020-04-27 01:21:35 -04:00
Atermonera
7bf77736c2 Adds empty filter classes to send messages to particular vchat filters. 2020-04-20 03:28:57 -04:00
Repede
e44e346352 Release Update 
Merge branch 'release' of https://github.com/VOREStation/VOREStation into voreupdate

# Conflicts:
#	code/__defines/machinery.dm
#	code/controllers/configuration.dm
#	code/game/jobs/jobs.dm
#	code/game/machinery/doors/blast_door.dm
#	code/game/machinery/pipe/pipe_recipes.dm
#	code/game/objects/items/devices/radio/radio_vr.dm
#	code/modules/client/preferences_vr.dm
#	code/modules/clothing/glasses/hud_vr.dm
#	code/modules/clothing/under/accessories/accessory_vr.dm
#	code/modules/events/event_container_vr.dm
#	code/modules/gamemaster/actions/planet_weather_change.dm
#	code/modules/projectiles/guns/energy/netgun_vr.dm
#	code/modules/projectiles/guns/energy/protector_vr.dm
#	code/modules/vore/appearance/sprite_accessories_taur_vr.dm
#	code/modules/vore/appearance/sprite_accessories_vr.dm
#	code/modules/vore/fluffstuff/custom_guns_vr.dm
#	icons/obj/power.dmi
#	vorestation.dme
 2020-04-16 21:07:33 -04:00
izac112
98fe37368e Update vchat.js 2020-04-14 16:02:49 +02:00
izac112
da7a07ad47 Almost forgot 
Works fine without but probably should stay consistant.
 2020-04-14 15:58:41 +02:00
izac112
b8b65eca61 Removes forced looc and adds forced admin pm. 
You can mute looc anyways and it makes sense for admin pms to appear in all windows so you cant say you did not notice it.
 2020-04-14 15:36:17 +02:00
Atermonera
83c1a512e2 Adds pref to toggle vchat without 60s wait for linux users (#6980) 2020-04-12 00:51:57 -04: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