Commit Graph

253 Commits

Author SHA1 Message Date
Chompstation Bot 69e712d103 The clime offices 2021-02-08 00:36:14 +00:00
Chompstation Bot 6ddd2efb7b [MIRROR] Blob Genesis 2021-01-13 00:22:31 +00:00
Sharkmare 21463cd69b Changing shadekin to RESTRICTED from WHITELISTED
This makes it so shadekin is never a selectable language but rather has to be assigned by the game automatically, similar to how root talk on diona behaves. 

This may break carbon shadekin from selecting this language if they dont assign it the same way diona do.
Howevcer we don't plan to use Shadekin carbons soooooo, yeah.
2021-01-03 22:23:52 +01:00
Chompstation Bot 6d02d61e54 Adds Spacer Language 2020-10-19 10:40:15 +00:00
izac112 4b051c23fc Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac 2020-09-13 15:05:53 +02:00
David Winters 42f2b58b25 Moved name change to define, removes legacy entries from alienwhitelist 2020-08-23 23:31:31 -04:00
David Winters 770cd596d9 Unwhitelist 2020-08-23 07:20:12 -04:00
izac112 601a155b30 Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac 2020-07-25 15:22:42 +02:00
Amy 51d2c98e33 Adds dragon language, gao emote w/ sound 2020-07-20 00:49:05 -05:00
izac112 e684df5236 Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac-voreupdate 2020-05-21 21:17:58 +02:00
Aronai Sieyes 50e09c0ee7 Fix a few talking issues
Posibrain talking without a language, give speech bubbles to things inside things, especially posibrains, give gibberish a chance instead of using null languages
2020-05-20 13:52:08 -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
Unknown 9a156b4570 Travis fix 2020-05-03 09:40:35 -04:00
Atermonera 23e72aa709 Merge pull request #7043 from MisterLayne/prommie-lang
Promethean Language
2020-05-03 03:14:21 -04:00
ShadowLarkens 139d5cd3c3 Saycode Overhaul -- Multilingualism 2020-04-20 04:12:53 -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
Runa Dacino 99b7377c5e Unwhitelists solcom
Shouldn't be a whitelisted language, for some reason it was removed from vr exceptions. Readded.
2020-03-22 05:36:54 +01:00
Unknown a0d1e784c7 More duplicates 2020-03-17 01:25:43 -04:00
Unknown 62e6874e9b Fixes duplicate language keys 2020-03-17 01:12:31 -04:00
Atermonera e3a67b3050 Makes language keys case sensitive, adds unit tests for language conflicts, fixes some language conflicts 2020-03-17 00:22:05 -04:00
Spades 8526f8582c Update station_vr.dm 2020-03-06 22:23:32 -05:00
Spades 04143d01a8 Update station_vr.dm 2020-03-06 19:32:10 -05:00
Spades 8be12afc21 Attempts to fix Panslavic, again.
I noticed panslavic wasn't formatted like other languages and tried to fix it. I have no fucking idea if this works in the slightest as I cannot test it.
2020-02-24 09:55:02 -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
Arokha Sieyes 47ccc655db Deprecate the stream operator 2020-02-12 19:38:43 -05:00
SplinterGP 894058cb04 Makes psionic communiation grey restricted
No more species other than grey can get them (tested)
2020-02-09 13:08:13 -03:00
SplinterGP 7c0796668d Adds grey, sprites for items, (jumpsuit etc.) for them, add them to rigsuit list, and also adds their language that they use and telepathy 2020-02-05 19:43:55 -03:00
Hawk_v3 20596d9787 Merge remote-tracking branch 'upstream/master' 2020-01-13 00:01:47 +00:00
Mithrandalf 79557cba8f flicked the 1 to a 0 for machine_understands 2020-01-08 17:02:15 +00:00
Mithrandalf 1e8a54b736 mouse 2020-01-08 15:32:07 +00:00
Hawk_v3 6b935d64ec Merge remote-tracking branch 'upstream/master' 2019-12-21 21:57:49 +00:00
Atermonera 3b7a737c08 Change various global species lists to GLOB versions, adds 2 more event subspecies. 2019-12-16 00:52:29 -05:00
Unknown 5ec5ac6e78 Chat fix by Aronai
Fixes #6299
2019-12-13 15:56:01 -05:00
Hawk_v3 5b13642c12 Merge remote-tracking branch 'upstream/master' 2019-12-08 18:15:35 +00:00
Mechoid 99bc3dcdbc Security / PseudoCargo Expansion 2019-11-24 17:23:48 -05:00
Hawk_v3 a5c7909ed7 Merge remote-tracking branch 'upstream/master' 2019-11-17 12:42:55 +00:00
Unknown 9d7c9714f3 Merge remote-tracking branch 'VOREStation/master' into making-of-shadekin 2019-11-15 12:12:55 -05:00
Hawk_v3 f976948ce3 Merge remote-tracking branch 'upstream/master' 2019-11-07 19:54:10 +00:00
Atermonera a45472b446 Update Chat System to use to_chat(src, "") instead of src << "" 2019-11-05 19:22:38 -05:00
Heroman3003 a3fb3e3950 Merge branch 'master' of https://github.com/VOREStation/VOREStation into making-of-shadekin 2019-10-29 09:33:48 +10:00
Hawk_v3 3c8cd11eac Reupdated Station 1 map 2019-10-24 21:57:58 +01:00
Novacat 54aeb32617 Merge pull request #6091 from Novacat/nova-ert
Uplink additions
2019-10-21 21:01:06 -04:00
Novacat 6e5acef9f0 Update station_vr.dm 2019-10-21 19:01:05 -04:00
Unknown 7dd592aa05 Uplink additions
Adds a few tools and medicines to uplinks. Also includes some polaris-side radio tweaks since I forgot I had it on this branch.
2019-10-21 18:57:44 -04:00
Mechoid 169d8acedd Medical Expansion 2019-10-19 23:28:38 -04:00
Hawk_v3 b22f2284fe Merge remote-tracking branch 'upstream/master' 2019-09-23 20:55:18 +01:00
Unknown 10f290106c Ports pan-slavic from Baystation 2019-09-18 15:57:30 -04:00
Hawk_v3 bc7ea8379a Merge remote-tracking branch 'upstream/master' 2019-07-02 17:54:29 +01:00
Novacat 960df85343 Update generic.dm 2019-06-24 16:11:46 -04:00
Atermonera 2064228917 Blindly adds partial cross-language intelligibility 2019-06-24 15:22:06 -04:00