Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into changelogs-tgui

code/game/objects/structures/watercloset.dm

@@ -669,7 +669,7 @@
 			icon_state = "well_3"
 			return TRUE
 		else
-			to_chat(user, "<span class='warning'>You need at least tweenty-five pieces of sandstone!</span>")
+			to_chat(user, "<span class='warning'>You need at least twenty-five pieces of sandstone!</span>")
 			return
 	if(steps == 3 && S.tool_behaviour == TOOL_SHOVEL)
 		S.use_tool(src, user, 80, volume=100)

code/modules/language/arachnid.dm

@@ -5,7 +5,7 @@
 	speech_verb = "chitter"
 	ask_verb = "chitter"
 	exclaim_verb = "chitter"
-	key = "r"
+	key = "c"
 	flags = NO_STUTTER | LANGUAGE_HIDE_ICON_IF_NOT_UNDERSTOOD
 
 	icon_state = "arachnid"

code/modules/language/neokanji.dm

@@ -5,7 +5,7 @@
 	ask_verb = "queries"
 	exclaim_verb = "declares"
 	whisper_verb = "hushes"
-	key = "k"
+	key = "j"
 	space_chance = 40
 	default_priority = 94
 	flags = TONGUELESS_SPEECH

code/modules/surgery/organs/tongue.dm

@@ -27,6 +27,7 @@
 		/datum/language/dwarf,
 		/datum/language/signlanguage,
 		/datum/language/neokanji,
+		/datum/language/sylvan,
 	))
 	healing_factor = STANDARD_ORGAN_HEALING*5 //Fast!!
 	decay_factor = STANDARD_ORGAN_DECAY/2

html/changelogs/AutoChangeLog-pr-15488.yml

@@ -0,0 +1,7 @@
+author: "BlueWildrose"
+delete-after: True
+changes: 
+  - bugfix: "Sylvan should actually be speakable for those who have taken that language as roundstart now, and for plantpeople who naturally start with it."
+  - bugfix: "The langauge Neo-kanji's shortcut was overlapping with the slime language, and has been relocated from k to j."
+  - bugfix: "The langauge Dwarvish's shortcut was potentially overlapping with drones, and has been relocated from D to w."
+  - bugfix: "The language Rachnidian's shortcut was getting in the way of the Ratvarian language, so it's been moved from r to c."

modular_citadel/code/modules/client/loadout/__donator.dm

@@ -572,3 +572,10 @@
 	path = SLOT_WEAR_SUIT
 	path = /obj/item/clothing/suit/spacehoodie
 	ckeywhitelist = list("bidlink2")
+
+/datum/gear/donator/pokerchips
+	name = "pokerchip set"
+	slot = SLOT_IN_BACKPACK
+	path = /obj/item/storage/box/pockerchips
+	ckeywhitelist = list("greed2323")
+

modular_citadel/code/modules/custom_loadout/custom_items.dm

@@ -627,3 +627,49 @@
 	icon = 'icons/obj/custom.dmi'
 	mob_overlay_icon = 'icons/mob/clothing/custom_w.dmi'
 	mutantrace_variation = NONE
+
+/obj/item/coin/red
+	name = "red pokerchip"
+	desc = "A red pokerchip."
+	icon_state = "c_red"
+	item_state = "c_red"
+	icon = 'icons/obj/custom.dmi'
+
+/obj/item/coin/blue
+	name = "blue pokerchip"
+	desc = "A blue pokerchip."
+	icon_state = "c_nlue"
+	item_state = "c_blue"
+	icon = 'icons/obj/custom.dmi'
+
+/obj/item/coin/green
+	name = "green pokerchip"
+	desc = "A green pokerchip."
+	icon_state = "c_green"
+	item_state = "c_green"
+	icon = 'icons/obj/custom.dmi'
+
+/obj/item/coin/black
+	name = "black pokerchip"
+	desc = "A black pokerchip."
+	icon_state = "c_black"
+	item_state = "c_black"
+	icon = 'icons/obj/custom.dmi'
+
+/obj/item/storage/box/pockerchips
+	name = "tray of pocker chips"
+	desc = "A tray of green, red, blue, and black pocker chips."
+	icon_state = "c_holder"
+	icon = 'icons/obj/custom.dmi'
+	illustration=null
+
+/obj/item/storage/box/pokerchips/PopulateContents()
+	for(var/i in 1 to 5)
+		new /obj/item/coin/red(src)
+	for(var/i in 1 to 10)
+		new /obj/item/coin/blue(src)
+	for(var/i in 1 to 15)
+		new /obj/item/coin/black(src)
+	for(var/i in 1 to 20)
+		new /obj/item/coin/green(src)
+