diff --git a/_maps/map_files/BoxStation/BoxStation.dmm b/_maps/map_files/BoxStation/BoxStation.dmm index f256c747..70097fbf 100644 --- a/_maps/map_files/BoxStation/BoxStation.dmm +++ b/_maps/map_files/BoxStation/BoxStation.dmm @@ -2674,7 +2674,7 @@ "aZv" = (/turf/closed/wall/r_wall,/area/bridge/meeting_room) "aZw" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/turf/closed/wall/r_wall,/area/bridge/meeting_room) "aZx" = (/obj/machinery/door/airlock/command{name = "Conference Room"; req_access_txt = "19"},/obj/structure/cable{icon_state = "1-2"},/obj/machinery/atmospherics/pipe/simple/supply/hidden,/turf/open/floor/wood,/area/bridge/meeting_room) -"aZy" = (/obj/effect/turf_decal/tile/brown{dir = 4},/obj/effect/turf_decal/tile/brown{dir = 1},/obj/machinery/atm{pixel_y = 30},/obj/machinery/computer/card/minor/qm{dir = 4},/obj/effect/turf_decal/tile/brown{dir = 8},/turf/open/floor/plasteel/dark,/area/quartermaster/qm) +"aZy" = (/obj/effect/turf_decal/tile/brown{dir = 4},/obj/effect/turf_decal/tile/brown{dir = 1},/obj/machinery/atm{pixel_y = 30},/obj/effect/turf_decal/tile/brown{dir = 8},/turf/open/floor/plasteel/dark,/area/quartermaster/qm) "aZz" = (/obj/machinery/porta_turret/ai{dir = 4},/turf/open/floor/plasteel/dark,/area/ai_monitored/turret_protected/ai_upload) "aZA" = (/turf/open/floor/circuit,/area/ai_monitored/turret_protected/ai_upload) "aZB" = (/obj/effect/landmark/start/captain,/obj/machinery/atmospherics/pipe/simple/supply/hidden,/obj/structure/cable{icon_state = "4-8"},/obj/structure/chair/comfy/blue{dir = 4},/turf/open/floor/carpet/royalblue,/area/crew_quarters/heads/captain) @@ -3434,7 +3434,6 @@ "bob" = (/turf/closed/wall/r_wall,/area/crew_quarters/heads/hop) "boc" = (/turf/closed/wall/r_wall,/area/storage/tech) "bod" = (/obj/effect/spawner/structure/window/reinforced,/obj/structure/cable,/obj/structure/cable{icon_state = "0-2"},/obj/structure/cable{icon_state = "0-4"},/turf/open/floor/plating,/area/engine/gravity_generator) -"boe" = (/turf/closed/wall/r_wall,/area/space) "bof" = (/obj/effect/mapping_helpers/airlock/cyclelink_helper{dir = 8},/obj/machinery/door/airlock/external{name = "Escape Airlock"},/obj/effect/turf_decal/delivery,/turf/open/floor/plasteel/dark,/area/hallway/secondary/exit) "bog" = (/obj/structure/cable{icon_state = "4-8"},/turf/open/floor/plasteel/white,/area/science/lab) "boh" = (/obj/item/stack/sheet/glass,/obj/structure/table/glass,/obj/item/stack/sheet/glass,/obj/item/stack/sheet/glass,/obj/item/stock_parts/matter_bin,/obj/item/stock_parts/matter_bin,/obj/machinery/light{dir = 4},/obj/item/stock_parts/scanning_module{pixel_x = 2; pixel_y = 3},/obj/item/stock_parts/scanning_module,/obj/machinery/power/apc{areastring = "/area/science/lab"; dir = 4; name = "Research Lab APC"; pixel_x = 26},/obj/structure/cable{icon_state = "0-8"},/turf/open/floor/plasteel/white,/area/science/lab) @@ -3462,7 +3461,7 @@ "boD" = (/obj/structure/disposalpipe/segment{dir = 4},/obj/structure/cable{icon_state = "4-8"},/obj/machinery/light_switch{pixel_y = -25},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/open/floor/plasteel/dark,/area/medical/morgue) "boE" = (/obj/structure/disposalpipe/segment{dir = 4},/obj/structure/cable{icon_state = "4-8"},/obj/machinery/light/small,/obj/machinery/atmospherics/pipe/manifold/supply/hidden,/turf/open/floor/plasteel/dark,/area/medical/morgue) "boF" = (/obj/effect/landmark/event_spawn,/turf/open/floor/wood,/area/library) -"boG" = (/obj/effect/spawner/structure/window/reinforced/indestructable,/obj/machinery/door/poddoor/preopen{id = "cargoshut2"; name = "shutters"},/turf/open/floor/plating,/area/quartermaster/qm) +"boG" = (/obj/machinery/door/poddoor/preopen{id = "cargoshut2"; name = "shutters"},/obj/effect/spawner/structure/window/reinforced,/turf/open/floor/plating,/area/quartermaster/qm) "boH" = (/obj/structure/disposalpipe/segment{dir = 4},/obj/structure/cable{icon_state = "4-8"},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/open/floor/plasteel/dark,/area/medical/morgue) "boI" = (/obj/structure/disposalpipe/segment{dir = 4},/obj/machinery/door/airlock/maintenance{dir = 4; name = "Morgue Maintenance"; req_access_txt = "6"},/obj/structure/cable{icon_state = "4-8"},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/open/floor/plating,/area/medical/morgue) "boJ" = (/obj/structure/disposalpipe/segment{dir = 4},/obj/structure/cable{icon_state = "4-8"},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/open/floor/plating,/area/maintenance/department/medical/morgue) @@ -4204,7 +4203,7 @@ "bCT" = (/obj/structure/table/reinforced,/obj/machinery/cell_charger{pixel_y = 5},/obj/item/stock_parts/cell/high,/obj/item/stock_parts/cell/high,/obj/item/stock_parts/cell/high,/obj/item/stock_parts/cell/high,/obj/item/stock_parts/cell/high,/obj/item/stock_parts/cell/high,/turf/open/floor/plasteel/white,/area/science/circuit) "bCU" = (/obj/machinery/atmospherics/pipe/manifold/general/visible{dir = 8},/obj/structure/cable{icon_state = "1-2"},/turf/open/floor/plating,/area/maintenance/starboard) "bCV" = (/obj/machinery/atmospherics/components/unary/thermomachine/heater{dir = 8},/turf/open/floor/plating,/area/maintenance/starboard) -"bCW" = (/obj/machinery/requests_console{department = "Cargo Bay"; departmentType = 2; pixel_x = -30},/obj/effect/turf_decal/tile/brown{dir = 1},/obj/effect/turf_decal/tile/brown{dir = 4},/obj/effect/turf_decal/tile/brown{dir = 8},/obj/machinery/keycard_auth{pixel_y = 25},/obj/machinery/light{dir = 8},/turf/open/floor/plasteel/dark,/area/quartermaster/qm) +"bCW" = (/obj/machinery/requests_console{department = "Cargo Bay"; departmentType = 2; pixel_x = -30},/obj/effect/turf_decal/tile/brown{dir = 1},/obj/effect/turf_decal/tile/brown{dir = 4},/obj/effect/turf_decal/tile/brown{dir = 8},/obj/machinery/keycard_auth{pixel_y = 25},/obj/machinery/light{dir = 8},/obj/machinery/computer/card/minor/qm{dir = 4},/turf/open/floor/plasteel/dark,/area/quartermaster/qm) "bCX" = (/obj/machinery/power/apc{areastring = "/area/quartermaster/qm"; dir = 1; name = "Quartermaster APC"; pixel_y = 24},/obj/structure/cable{icon_state = "0-2"},/obj/effect/turf_decal/tile/brown{dir = 1},/obj/effect/turf_decal/tile/brown{dir = 4},/turf/open/floor/plasteel/dark,/area/quartermaster/qm) "bCY" = (/obj/machinery/conveyor{dir = 4; id = "garbage"},/obj/machinery/light/small{dir = 1},/obj/item/book/lorebooks/welcome_to_kinaris,/turf/open/floor/plating,/area/maintenance/disposal) "bCZ" = (/obj/effect/turf_decal/tile/brown{dir = 1},/obj/effect/turf_decal/tile/brown{dir = 4},/turf/open/floor/plasteel/dark,/area/quartermaster/qm) @@ -7362,7 +7361,7 @@ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaatJatJatJjXDatJjXDjXDatJjXDaaaaaaaaaaaaaaaaaaaaabqFbnFbnFbnFbhYbzpbzpbzpbzpbzpbtVbmibmibwEbxUbDebhYbzsbztbzubtWbxWbxXbxXbxXbxWbxWbLdcGsaRmaTBaTBbobbobbobbobbobbzBbobcFXcFYcFZaTBcGZcGScHaaTBbjmbiUbsFbsHbsHbsHbsHbsHbsHbsHbsHbsHcGtaTScGubxabxabzHbzIbxabxabxabzJbyubDFbyubzLbzMbzNbzObzPbzQbzLbhcbyCbvVbzRbzSbzTbzUbzVbzWbzXbzUbzUbzYbzZbAabAbbAcbAcbAcbAcbAdbAcbAcbAcbAebAebAfbAgbAhbAhbtrbAibtsbxybHIbsbbsAbAmbAnbAobScbtybtzbAqbtAbAqbApbArbScbxFbhIbAsbzmbAtblYaadaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaatJaaaaaajXDaaaaaaaaaaaajXDaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaadbzpcIdbqObMlbzpbtXbAvbmibIjbQwbQwwzybAAbABbACbADbxXbvxbwLbwMbwNbxWcGwbpAaIPaLPbAIbAJbAKaLPbiFbEWbAMbKObXBbXBbXBcHbbAPbAQcGTcHcaIPaLPaIPaLPbAKaLPbiFaNKaLPaLPbAJaLPbAVaIPbAWbxabAXbAYbAZbBabBbbxabBcbyubBdbyubzLbzMbzMbBebBfbBgbzLbhcbBhbvVbuBbBibBjbBkbBlbBmbBnbBobBpbrGbrGbBqbBrbAcbBsbBtbBubBvbBwbBxbAcbwObygbyhbzvbzCbAhbtrbAibBDbBEbsBbsVbtPbBIbBJbBKbScbBLbTkbTlbTmbTlbTkbTnbScbxFbhIbBMbBNbBOblYaadaadaadaadaadaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaoBaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaajXDaaaaaaaaaaaajXDaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaadbzpfpLbMklOVbzpbzpbzpbBRbDcbDcbzpbzpbBWbBXbBYbBZbCabzDbAubAEbAFbxWbjibCeaIPaIPaIPaIPaIPaIPbCfaIPbpAaIPaIPaIPaIPaIPbCgbChbCiaIPaIPaIPaIPaIPaIPaIPaLzaIPaIPaIPaIPaNhbAVbCjbjDbxabCkbClbCmbCnbCobxabCpbyubyvbCqbxabCrbCsbCtbCubCvbxabhcbyCbvVbvVbvVbvVbvVbrGbrGbrGbrGbrGbrGbCwbCxbCybAcbCzbCAbCBbCCbCDbCEbAcbAGbAHbBybBzbBAbAhbtrbCKbCLbCMbtQbyybyybyZbzabzbbScbUtbUubCSbCTbCSbUvbUtbScbxFbhIbCUbzmbCVblYaadaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa -aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaajXDaaaaaaaaaaaajXDaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaboebzpbzpdfsbzpbzpbCWbCXbIYbCZbDabDbbDcuifbGKbDfbDdbDgbBBbBCbCbbCcbxWbQCbDmbDnaKlbDnbDobDnbDnbDpbDnbDqbfQbDrbDsbfQbDtcoqcovcowcqibDybDzbDAbDAbDBbDAbDCbDDbDAbDEbRgbDGbDHbfQbDIbxabDJbDKbDLbxbbxbbxabxbbDMbxbbxabxabxabxabxabxabxabxabhcbhcbDNbDObDPbwZbDQbDRbAjbAkbAlbBFbDRbDWbDXbDYbAcbBsbDZbEabEbbEcbEdbAcbCdbCFbCGbCHbCIbAhbtrbEjbEkbxzbBGbBHbCNbCObCPbCQbScbUwbVxbVybErbVybVxbVzbScbEsbEtbEubzmbznblYaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaadaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa +aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaajXDaaaaaaaaaaaajXDaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabsebzpbzpdfsbzpbzpbCWbCXbIYbCZbDabDbbDcuifbGKbDfbDdbDgbBBbBCbCbbCcbxWbQCbDmbDnaKlbDnbDobDnbDnbDpbDnbDqbfQbDrbDsbfQbDtcoqcovcowcqibDybDzbDAbDAbDBbDAbDCbDDbDAbDEbRgbDGbDHbfQbDIbxabDJbDKbDLbxbbxbbxabxbbDMbxbbxabxabxabxabxabxabxabxabhcbhcbDNbDObDPbwZbDQbDRbAjbAkbAlbBFbDRbDWbDXbDYbAcbBsbDZbEabEbbEcbEdbAcbCdbCFbCGbCHbCIbAhbtrbEjbEkbxzbBGbBHbCNbCObCPbCQbScbUwbVxbVybErbVybVxbVzbScbEsbEtbEubzmbznblYaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaadaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaajXDatJjXDjXDatJjXDatJcrbjXDjXDjXDcrbatJatJatJatJatJatJbDcaZybIYpOzdwndALbWhpNVhmyrdArQznTcbEvbEwqhLaTRbxWbCJbDhbDibDjbxWbExbEyaITaITaITaITbEzbEzbEzbEzbEzbEzbEzbEzbEzbEzbEAaHpbEBbECbECbECbECbECbEDbECbECbECbECbEEbEFbEEaIUaKfbEGbxabEHbEIbEJbEKbELbxabEMbyubENbEObEPbEQbERbESbETbEUbEOblDbhcbhcbhcbhcbhcbsWbEVbCRbDSbCRbDTbDRbEZbCxbFabFabFabFabFabFabFabFabFabFbbFbbFbbFbbFbbFbbFcbFdbFebxzbxzbxzbxzbxzbxzbxzbScbScbScbScbScbScbScbScbScbxFbhIbFfbFgblYblYaadaadaadaaeaaeaaeaaeaaeaaeaaeaaeaadaadaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaadaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaatJaaaaaaaaaaaaatJaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaboGbpFhZpfNzbFhsoPjSqdEdfMfwaouQIwmybFibFjbFkbFlbFpbFpbFpbFpbFpbFqbFrbEyaaaaaaaadaaabEzbFsbFtbFubFvbMybFxbFybNNbEzbFAbFBbFCbECbFDbFEbFFbFGbFHbFIbFJbFKbFLbFMbFNbEEbEEbEEbEEbxabFObFPbFQbFRbFSbFTbFUbFVbFWbFXbFVbFVbFVbFYbyubFZbGabGbbGcbGcbGdbGebGfbGgbEVbIZbDVbElbEmbDRbEZbCxbFabGlbGlbGlbGmbGlbGlbGlbFabGnbGnbGobGnbGnbFbbGpbGqbGrbGsbGtbGubGvbGwbGxbGybGzbGAbGBbGCbGDbGEbGFbGGbGGbGHbGIbGtbGtblYaadaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaadaadaadaadaadaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaatJaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaboGbpVsaookwbzpbzpbDcbDcbDcbDcbzpbzpbGJbGKbGLbGMcFsbtYbGPlQqbGPcGrbGRbGSaadbGTbGUbGVbGWbGXbFzbGYbFzbGZbFzbFzbFzbEzbHabHbbHcbECbHdbHebHfbHgbHhbHibHjbECbECbHkbHlbHmbHnbHobHpbHqbHrbHsbHtbHubHvbHwbHxbHybHzbHAbHBbHCbyubyubyubHDbjEbjEbjEbjEbjEbHEbHFbwYbEVbEnbEobCRbEpbDRbEZbCxbFabGlbGlbGlbGlbGlbGlbGlbFabHJbHKbHLbHMbHNbHObHPbHQbGrbHRbHSbHTbHTbHTbHTbHTbHTbHUbHVbHWbGDblYbHXbHYbHZbHZbIabIbbIcbGtatJaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaadaadbIdbIebIdaadaadaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa diff --git a/code/datums/traits/good.dm b/code/datums/traits/good.dm index 077772cb..0db5deb4 100644 --- a/code/datums/traits/good.dm +++ b/code/datums/traits/good.dm @@ -295,3 +295,33 @@ /datum/quirk/slimespeaker/remove() var/mob/living/M = quirk_holder M.remove_language(/datum/language/slime) + +/datum/quirk/tajaspeaker + name = "Siik Tajr speaker" + desc = "Due to your time spent around Tajaran, you can speak their native tongue!" + value = 1 + gain_text = "You feel sensitive to mrowls and your tongue curls comfortably." + lose_text = "You forget how to speak Siik'Tajr!" + +/datum/quirk/tajaspeaker/add() + var/mob/living/M = quirk_holder + M.grant_language(/datum/language/tajara) + +/datum/quirk/tajaspeaker/remove() + var/mob/living/M = quirk_holder + M.remove_language(/datum/language/tajara) + +/datum/quirk/russianspeaker + name = "Neo-Russkiya speaker" + desc = "Due to your time spent around space russians, you can speak Neo-Russkiya!" + value = 1 + gain_text = "You feel sensitive to the motherland, blyat!" + lose_text = "You forget how to speak Neo-Russkiya!" + +/datum/quirk/russianspeaker/add() + var/mob/living/M = quirk_holder + M.grant_language(/datum/language/spacerussian) + +/datum/quirk/russianspeaker/remove() + var/mob/living/M = quirk_holder + M.remove_language(/datum/language/spacerussian) diff --git a/code/modules/language/mushroom.dm b/code/modules/language/mushroom.dm deleted file mode 100644 index 97287ea5..00000000 --- a/code/modules/language/mushroom.dm +++ /dev/null @@ -1,12 +0,0 @@ -/datum/language/mushroom - name = "Mushroom" - desc = "A language that consists of the sound of periodic gusts of spore-filled air being released." - speech_verb = "puffs" - ask_verb = "puffs inquisitively" - exclaim_verb = "poofs loudly" - whisper_verb = "puffs quietly" - sing_verb = "puffs musically" - key = "y" - sentence_chance = 0 - default_priority = 80 - syllables = list("poof", "pff", "pFfF", "piff", "puff", "pooof", "pfffff", "piffpiff", "puffpuff", "poofpoof", "pifpafpofpuf") diff --git a/code/modules/language/spacerussian.dm b/code/modules/language/spacerussian.dm new file mode 100644 index 00000000..33a2f4ec --- /dev/null +++ b/code/modules/language/spacerussian.dm @@ -0,0 +1,23 @@ +/datum/language/spacerussian + name = "Neo-Russkiya" + desc = "Neo-Russkiya, a bastard mix of Galactic Common and old Russian. The official language of the USSP. It has started to see use outside of the fringe in hobby circles and protest groups." + speech_verb = "articulates" + ask_verb = "questions" + exclaim_verb = "exaggerates" + whisper_verb = "mutters" + sing_verb = "articulates musically" + key = "?" + flags = TONGUELESS_SPEECH + sentence_chance = 0 + default_priority = 80 + syllables = list("dyen","bar","bota","vyek","tvo","slov","slav","syen","doup","vah","laz","gloz","yet", + "nyet","da","sky","glav","glaz","netz","doomat","zat","moch","boz", + "comy","vrad","vrade","tay","bli","ay","nov","livn","tolv","glaz","gliz", + "ouy","zet","yevt","dat","botat","nev","novy","vzy","nov","sho","obsh","dasky", + "key","skey","ovsky","skaya","bib","kiev","studen","var","bul","vyan", + "tzion","vaya","myak","gino","volo","olam","miti","nino","menov","perov", + "odasky","trov","niki","ivano","dostov","sokol","oupa","pervom","schel", + "tizan","chka","tagan","dobry","okt","boda","veta","idi","cyk","blyt","hui","na", + "udi","litchki","casa","linka","toly","anatov","vich","vech","vuch","toi","ka","vod") + + icon_state = "spacerussia" \ No newline at end of file diff --git a/code/modules/language/tajara.dm b/code/modules/language/tajara.dm new file mode 100644 index 00000000..e5e95646 --- /dev/null +++ b/code/modules/language/tajara.dm @@ -0,0 +1,18 @@ +/datum/language/tajara + name = "Siik'Tajr" + desc = "The traditionally employed tongue of Ahdomai, composed of expressive yowls and chirps. Native to the Tajaran." + speech_verb = "mrowls" + ask_verb = "mrowls inquisitively" + exclaim_verb = "yowls loudly" + whisper_verb = "mrowls quietly" + sing_verb = "mrowls musically" + key = "j" + flags = TONGUELESS_SPEECH + sentence_chance = 0 + default_priority = 80 + syllables = list("rr","rr","tajr","kir","raj","kii","mir","kra","ahk","nal","vah","khaz","jri","ran","darr", + "mi","jri","dynh","manq","rhe","zar","rrhaz","kal","chur","eech","thaa","dra","jurl","mah","sanu","dra","ii'r", + "ka","aasi","far","wa","baq","ara","qara","zir","sam","mak","hrar","nja","rir","khan","jun","dar","rik","kah", + "hal","ket","jurl","mah","tul","cresh","azu","ragh") + + icon_state = "taja" \ No newline at end of file diff --git a/code/modules/mob/living/carbon/human/species_types/mushpeople.dm b/code/modules/mob/living/carbon/human/species_types/mushpeople.dm index 228661e1..e8b46105 100644 --- a/code/modules/mob/living/carbon/human/species_types/mushpeople.dm +++ b/code/modules/mob/living/carbon/human/species_types/mushpeople.dm @@ -26,9 +26,6 @@ use_skintones = FALSE var/datum/martial_art/mushpunch/mush -/datum/species/mush/after_equip_job(datum/job/J, mob/living/carbon/human/H) - H.grant_language(/datum/language/mushroom) //pomf pomf - /datum/species/mush/on_species_gain(mob/living/carbon/C, datum/species/old_species) . = ..() if(ishuman(C)) diff --git a/code/modules/surgery/organs/tongue.dm b/code/modules/surgery/organs/tongue.dm index f6894fb8..558b8459 100644 --- a/code/modules/surgery/organs/tongue.dm +++ b/code/modules/surgery/organs/tongue.dm @@ -24,6 +24,8 @@ /datum/language/slime, /datum/language/xenocommon, /datum/language/vampiric, + /datum/language/tajara, + /datum/language/spacerussian, )) healing_factor = STANDARD_ORGAN_HEALING*5 //Fast!! decay_factor = STANDARD_ORGAN_DECAY/2 diff --git a/icons/misc/language.dmi b/icons/misc/language.dmi index 6f6f2546..39ed689f 100644 Binary files a/icons/misc/language.dmi and b/icons/misc/language.dmi differ diff --git a/tgstation.dme b/tgstation.dme index 8d4bd1f0..5158277d 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -1945,11 +1945,12 @@ #include "code\modules\language\language_menu.dm" #include "code\modules\language\machine.dm" #include "code\modules\language\monkey.dm" -#include "code\modules\language\mushroom.dm" #include "code\modules\language\narsian.dm" #include "code\modules\language\ratvarian.dm" #include "code\modules\language\slime.dm" +#include "code\modules\language\spacerussian.dm" #include "code\modules\language\swarmer.dm" +#include "code\modules\language\tajara.dm" #include "code\modules\language\vampiric.dm" #include "code\modules\language\xenocommon.dm" #include "code\modules\library\lib_codex_gigas.dm"