Merge branch 'master' into Drink-Expansion-and-Tweak

Citadel-Station-13 · Oct 18, 2023 · 2b7d575 · 2b7d575
2 parents a45ded8 + ca4ef53
commit 2b7d575
Show file tree

Hide file tree

Showing 28 changed files with 276 additions and 71 deletions.
diff --git a/citadel.dme b/citadel.dme
@@ -2936,12 +2936,12 @@
 #include "code\modules\language\languages\species\adherent.dm"
 #include "code\modules\language\languages\species\akula.dm"
 #include "code\modules\language\languages\species\alraune.dm"
-#include "code\modules\language\languages\species\altevian.dm"
 #include "code\modules\language\languages\species\birdsong.dm"
 #include "code\modules\language\languages\species\celestial.dm"
 #include "code\modules\language\languages\species\diona.dm"
 #include "code\modules\language\languages\species\human.dm"
 #include "code\modules\language\languages\species\keisani.dm"
+#include "code\modules\language\languages\species\krisitik.dm"
 #include "code\modules\language\languages\species\moth.dm"
 #include "code\modules\language\languages\species\naramadi.dm"
 #include "code\modules\language\languages\species\phoronoid.dm"
@@ -4446,6 +4446,7 @@
 #include "code\modules\species\station\standard\akula.dm"
 #include "code\modules\species\station\standard\human.dm"
 #include "code\modules\species\station\standard\human_subspecies.dm"
+#include "code\modules\species\station\standard\krisitik.dm"
 #include "code\modules\species\station\standard\moth.dm"
 #include "code\modules\species\station\standard\naramadi.dm"
 #include "code\modules\species\station\standard\nevrean.dm"

diff --git a/code/__DEFINES/inventory/bodytypes.dm b/code/__DEFINES/inventory/bodytypes.dm
@@ -60,6 +60,8 @@
 #define BODYTYPE_XENOHYBRID			"xenohybrid"
 /// digitigrade unathi
 #define BODYTYPE_UNATHI_DIGI        "unathi-digi"
+/// krisitik
+#define BODYTYPE_KRISITIK			"krisitik"
 
 //! keep this number (count) up to date
 #define BODYTYPES_TOTAL 19
@@ -112,6 +114,7 @@
 #define BODYTYPE_STRING_PHORONOID "phoronoid"
 #define BODYTYPE_STRING_WEREBEAST "werebeast"
 #define BODYTYPE_STRING_XENOHYBRID "xenohybrid"
+#define BODYTYPE_STRING_KRISITIK "krisitik" //Currently Unused until I can do Suit Sprites
 
 /proc/bodytype_to_string(bodytype)
 	// todo: assoc list lookup
@@ -154,5 +157,7 @@
 			return BODYTYPE_STRING_WEREBEAST
 		if(BODYTYPE_XENOHYBRID)
 			return BODYTYPE_STRING_XENOHYBRID
+		if(BODYTYPE_KRISITIK)
+			return BODYTYPE_STRING_VULPKANIN //Borrowing Vulp Sprites until I can sprite all the space suits.
 		else
 			CRASH("unknown bodytype: [bodytype]")
diff --git a/code/__DEFINES/inventory/carry_weight.dm b/code/__DEFINES/inventory/carry_weight.dm
@@ -131,8 +131,8 @@
 #define ITEM_ENCUMBRANCE_VOIDSUIT_ANOMALY 30
 #define ITEM_ENCUMBRANCE_VOIDSUIT_ANOMALY_HELMET 2.5
 
-#define ITEM_ENCUMBRANCE_LEGACY_RIG_LIGHT 25
-#define ITEM_ENCUMBRANCE_LEGACY_RIG 30
+#define ITEM_ENCUMBRANCE_LEGACY_RIG_LIGHT 17.5
+#define ITEM_ENCUMBRANCE_LEGACY_RIG 25
 #define ITEM_ENCUMBRANCE_LEGACY_RIG_HEAVY 35
 
 #define ITEM_ENCUMBRANCE_EMERGENCY_SOFTSUIT 30

diff --git a/code/__DEFINES/languages/ids.dm b/code/__DEFINES/languages/ids.dm
@@ -23,8 +23,6 @@
 #define LANGUAGE_ID_ADHERENT "adherent"
 /// akula
 #define LANGUAGE_ID_AKULA "akula"
-/// altevians
-#define LANGUAGE_ID_ALTEVIAN "altevian"
 /// ????????
 #define LANGUAGE_ID_BIRDSONG "birdsong"
 /// aurils
@@ -45,6 +43,8 @@
 #define LANGUAGE_ID_NARAMADI "naramadi"
 /// phoronoids
 #define LANGUAGE_ID_PHORONOID "phoronoid"
+/// krisitik
+#define LANGUAGE_ID_SQUEAKISH "squeakish"
 /// shadekin
 #define LANGUAGE_ID_SHADEKIN_HIVEMIND "shadekin_global"
 /// skrell

diff --git a/code/__DEFINES/species/species.dm b/code/__DEFINES/species/species.dm
@@ -18,6 +18,7 @@
 	#define SPECIES_ID_HUMAN_GRAV "human_grav"
 	#define SPECIES_ID_HUMAN_SPACE "human_space"
 	#define SPECIES_ID_HUMAN_VAT "human_vat"
+#define SPECIES_ID_KRISITIK "krisitik"
 #define SPECIES_ID_MONKEY "monkey"
 #define SPECIES_ID_MOTH "moth"
 	#define SPECIES_ID_MOTH_DARK "moth_dark"
@@ -95,6 +96,7 @@
 #define SPECIES_HUMAN_GRAV "grav-adapted Human"
 #define SPECIES_HUMAN_SPACER "space-adapted Human"
 #define SPECIES_HUMAN_VATBORN "Vatborn"
+#define SPECIES_KRISITIK "Krisitik"
 #define SPECIES_MONKEY "Monkey"
 #define SPECIES_MONKEY_AKULA "Sobaka"
 #define SPECIES_MONKEY_NEVREAN "Sparra"

diff --git a/code/game/machinery/suit_storage/suit_cycler.dm b/code/game/machinery/suit_storage/suit_cycler.dm
@@ -26,7 +26,7 @@
 	//Departments that the cycler can paint suits to look like.
 	var/list/departments = list("Engineering","Mining","Medical","Security","Atmos","HAZMAT","Construction","Biohazard","Emergency Medical Response","Crowd Control","Director","Head of Security", "No Change")
 	//Species that the suits can be configured to fit.
-	var/list/species = list(SPECIES_HUMAN, SPECIES_SKRELL, SPECIES_UNATHI, SPECIES_TAJ, SPECIES_TESHARI, SPECIES_AKULA, SPECIES_ALRAUNE, SPECIES_NEVREAN, SPECIES_RAPALA, SPECIES_SERGAL, SPECIES_VASILISSAN, SPECIES_VULPKANIN, SPECIES_XENOCHIMERA, SPECIES_XENOHYBRID, SPECIES_ZORREN_FLAT, SPECIES_ZORREN_HIGH, SPECIES_VOX, SPECIES_AURIL, SPECIES_DREMACHIR, SPECIES_APIDAEN)
+	var/list/species = list(SPECIES_HUMAN, SPECIES_SKRELL, SPECIES_UNATHI, SPECIES_TAJ, SPECIES_TESHARI, SPECIES_AKULA, SPECIES_ALRAUNE, SPECIES_NEVREAN, SPECIES_RAPALA, SPECIES_SERGAL, SPECIES_VASILISSAN, SPECIES_VULPKANIN, SPECIES_XENOCHIMERA, SPECIES_XENOHYBRID, SPECIES_ZORREN_FLAT, SPECIES_ZORREN_HIGH, SPECIES_VOX, SPECIES_AURIL, SPECIES_DREMACHIR, SPECIES_APIDAEN, SPECIES_KRISITIK)
 
 	var/target_department
 	var/target_species
@@ -252,7 +252,7 @@
 	//Clear the access reqs, disable the safeties, and open up all paintjobs.
 	to_chat(user, "<span class='danger'>You run the sequencer across the interface, corrupting the operating protocols.</span>")
 	departments = list("Engineering","Mining","Medical","Security","Atmos","HAZMAT","Construction","Biohazard","Crowd Control","Emergency Medical Response","^%###^%$", "Charring", "No Change")
-	species = list(SPECIES_HUMAN, SPECIES_SKRELL, SPECIES_UNATHI, SPECIES_TAJ, SPECIES_TESHARI, SPECIES_AKULA, SPECIES_ALRAUNE, SPECIES_NEVREAN, SPECIES_RAPALA, SPECIES_SERGAL, SPECIES_VASILISSAN, SPECIES_VULPKANIN, SPECIES_XENOCHIMERA, SPECIES_XENOHYBRID, SPECIES_ZORREN_FLAT, SPECIES_ZORREN_HIGH, SPECIES_VOX, SPECIES_AURIL, SPECIES_DREMACHIR, SPECIES_APIDAEN)
+	species = list(SPECIES_HUMAN, SPECIES_SKRELL, SPECIES_UNATHI, SPECIES_TAJ, SPECIES_TESHARI, SPECIES_AKULA, SPECIES_ALRAUNE, SPECIES_NEVREAN, SPECIES_RAPALA, SPECIES_SERGAL, SPECIES_VASILISSAN, SPECIES_VULPKANIN, SPECIES_XENOCHIMERA, SPECIES_XENOHYBRID, SPECIES_ZORREN_FLAT, SPECIES_ZORREN_HIGH, SPECIES_VOX, SPECIES_AURIL, SPECIES_DREMACHIR, SPECIES_APIDAEN, SPECIES_KRISITIK)
 
 	emagged = 1
 	safeties = 0

diff --git a/code/game/objects/items.dm b/code/game/objects/items.dm
@@ -275,7 +275,8 @@
 			. += "It's so unwieldly that it's a surprise you can hold it at all. You really won't be doing much running with it."
 	switch(get_weight())
 		if(-INFINITY to 0.1)
-			. += "It looks like it weighs practically nothing."
+			// todo: put this in when we actually get weight
+			// . += "It looks like it weighs practically nothing."
 		if(0.1 to 0.75)
 			. += "It looks like it weighs very little."
 		if(0.75 to 2)

diff --git a/code/game/objects/structures/low_wall.dm b/code/game/objects/structures/low_wall.dm
@@ -145,7 +145,7 @@ GLOBAL_LIST_INIT(wallframe_typecache, typecacheof(list(
 			return TRUE
 
 		//window placing
-		if(istype(I,/obj/item/stack/material/glass))
+		if(istype(I,/obj/item/stack/material/glass) && isnull(locate(/obj/structure/window) in loc))
 			var/obj/item/stack/material/ST = I
 			if(ST.material.opacity <= 0.7)
 				place_window(user, loc, ST, TRUE, TRUE)

diff --git a/code/modules/catalogue/catalogue_data.dm b/code/modules/catalogue/catalogue_data.dm
@@ -229,6 +229,24 @@ GLOBAL_DATUM_INIT(catalogue_data, /datum/category_collection/catalogue, new)
 	and as such many things about them have yet to be comprehensively studied."
 	value = CATALOGUER_REWARD_TRIVIAL
 
+/datum/category_item/catalogue/fauna/krisitik
+	name = "Sapients - Krisitik"
+	desc = "Krisitik are a species of subterranean mammals from the planet of Murith. \
+	Their unstable genetics mean the species has a varied appearance, though they \
+	can generally be described as murine. Their unstable genetics also mean \
+	they are prone to cancers and lethal mutations, which is aggravated by the species' \
+	reliance on nuclear energy. \
+	<br><br>\
+	Their society is highly competitive, and the frequent disasters in their underground \
+	cities mean the species as a whole has a degree of paranoia far above average for \
+	most sapients, instinctively prepping for any kind of disaster. \
+	<br><br>\
+	Even before their discovery of FTL, the Krisitik had a very advanced society. \
+	Their discovery of FTL was likely delayed due to the subterranean nature of Krisitik \
+	society and the toxic atmosphere of their homeworld. This edge has meant the Krisitik \
+	have faired better as an independent species than other 'newcomers' to the galaxy. "
+	value = CATALOGUER_REWARD_TRIVIAL
+
 /datum/category_item/catalogue/fauna/vox
 	name = "Sapients - Vox"
 	desc = "Probably the best known of these aliens are the Vox, a bird-like species \

diff --git a/code/modules/hardsuits/rig_pieces.dm b/code/modules/hardsuits/rig_pieces.dm
@@ -26,6 +26,7 @@
 		SPECIES_AURIL,
 		SPECIES_DREMACHIR,
 		SPECIES_HUMAN,
+		SPECIES_KRISITIK,
 		SPECIES_NEVREAN,
 		SPECIES_PHORONOID,
 		SPECIES_PROMETHEAN,
@@ -63,6 +64,7 @@
 		SPECIES_AURIL,
 		SPECIES_DREMACHIR,
 		SPECIES_HUMAN,
+		SPECIES_KRISITIK,
 		SPECIES_NEVREAN,
 		SPECIES_PHORONOID,
 		SPECIES_PROMETHEAN,
@@ -103,6 +105,7 @@
 		SPECIES_AURIL,
 		SPECIES_DREMACHIR,
 		SPECIES_HUMAN,
+		SPECIES_KRISITIK,
 		SPECIES_NEVREAN,
 		SPECIES_PHORONOID,
 		SPECIES_PROMETHEAN,
@@ -155,6 +158,7 @@
 		SPECIES_AURIL,
 		SPECIES_DREMACHIR,
 		SPECIES_HUMAN,
+		SPECIES_KRISITIK,
 		SPECIES_NEVREAN,
 		SPECIES_PHORONOID,
 		SPECIES_PROMETHEAN,

diff --git a/code/modules/holidays/halloween_loadout_masquarade.dm b/code/modules/holidays/halloween_loadout_masquarade.dm
@@ -660,4 +660,36 @@
 	display_name = "Invisible Satchel"
 	path = /obj/item/storage/backpack/satchel/invisible
 
+/**
+ * Belly dancer costume
+ */
+/datum/loadout_entry/seasonal/masquarade/dancer
+	antag_name = "Belly Dancer"
+	description = "The outfit of a belly dancer"
+	abstract_type = /datum/loadout_entry/seasonal/masquarade/dancer
+
+/datum/loadout_entry/seasonal/masquarade/dancer/scarf
+	display_name = "Headscarf"
+	path = /obj/item/clothing/head/donator/dancer
+	slot = SLOT_ID_HEAD
+
+/datum/loadout_entry/seasonal/masquarade/dancer/veil
+	display_name = "Veil"
+	path = /obj/item/clothing/mask/donator/dancer
+	slot = SLOT_ID_MASK
+
+/datum/loadout_entry/seasonal/masquarade/dancer/gloves
+	display_name = "Sleeves"
+	path = /obj/item/clothing/gloves/donator/dancer
+	slot = SLOT_ID_GLOVES
+/datum/loadout_entry/seasonal/masquarade/dancer/costume
+	display_name = "Costume"
+	path = /obj/item/clothing/under/donator/dancer
+	slot = SLOT_ID_UNIFORM
+
+/datum/loadout_entry/seasonal/masquarade/dancer/wraps
+	display_name = "Footwraps"
+	path = /obj/item/clothing/shoes/donator/dancer
+	slot = SLOT_ID_SHOES
+
 #undef STD_DEF
diff --git a/code/modules/language/languages/species/altevian.dm b/code/modules/language/languages/species/altevian.dm
diff --git a/code/modules/language/languages/species/krisitik.dm b/code/modules/language/languages/species/krisitik.dm
@@ -0,0 +1,17 @@
+/datum/language/squeakish
+	id = LANGUAGE_ID_SQUEAKISH
+	name = LANGUAGE_SQUEAKISH
+	translation_class = TRANSLATION_CLASS_DEFAULT_STANDARD_RACE
+	desc = "A language native to the Krisitik. It is composed of many squeakish whistles and nuzzles that is very hard to learn for non-native speakers. \
+	It has in recent times adopted words from Tyrmalin."
+	key = "E"
+	colour = "squeakish"
+	speech_verb = "squeaks"
+	whisper_verb = "squiks"
+	exclaim_verb = "squeaks loudly"
+	syllables = list ("sque", "uik", "squeak", "squee", "eak", "uek", "squik",
+			"squeek", "sq", "eek", "ee", "ek", "ak", "ueak", "squea", "tik",
+			"kris", "it", "rus", "gris", "mur", "ith", "vol", "voth", "nar",
+			"ik", "ine", "quol", "quee", "zre", "tch", "ol", "sk",  "rat",
+			"arc", "cra", "kr", "ah", "sin", "si")
+	shorthand = "SQ"
diff --git a/code/modules/loadout/loadout_suit.dm b/code/modules/loadout/loadout_suit.dm
@@ -240,6 +240,10 @@
 	name = "Winter Coat - Olive Green"
 	path = /obj/item/clothing/suit/storage/hooded/wintercoat/olive
 
+/datum/loadout_entry/suit/wintercoat/cosmic
+	name = "Winter Coat - Cosmic"
+	path = /obj/item/clothing/suit/storage/hooded/wintercoat/cosmic
+
 /datum/loadout_entry/suit/techrobes
 	name = "Techpriest"
 	path = /obj/item/clothing/suit/storage/hooded/techpriest

diff --git a/code/modules/mob/living/carbon/human/human_species.dm b/code/modules/mob/living/carbon/human/human_species.dm
@@ -81,3 +81,6 @@
 
 /mob/living/carbon/human/adherent
 	species = /datum/species/adherent
+
+/mob/living/carbon/human/krisitik
+	species = /datum/species/krisitik
diff --git a/code/modules/mob/living/say.dm b/code/modules/mob/living/say.dm
@@ -460,7 +460,7 @@ var/list/channel_to_radio_key = new
 		var/list/objs = potentials["objs"]
 		for(var/hearer in objs)
 			var/obj/O = hearer
-			O.hear_signlang(message, verb, language, src)
+			O.hear_signlang(src, message, verb, language)
 	return 1
 
 /obj/effect/speech_bubble

diff --git a/code/modules/mob/say_vr.dm b/code/modules/mob/say_vr.dm
@@ -58,7 +58,7 @@
 			spawn(0)
 				O.see_emote(src, message, 2)
 
-		var/list/other_viewers = get_hearers_in_view(source = src)
+		var/list/other_viewers = get_hearers_in_view(3, source = src)
 		for(var/mob/M in other_viewers - vis_mobs)
 			M.show_message(SPAN_SMALL("<i>[src] does something [pick("subtly", "discreetly", "hidden", "obscured")].</i>"), SAYCODE_TYPE_VISIBLE)
 
@@ -109,13 +109,15 @@
 			var/mob/M = vismob
 			if(istype(vismob, /mob/observer))
 				continue
+			if(M.stat == DEAD)
+				continue // get mobs and objs in view fast is shitty; say refactor will deal with that
 			M.show_message(message, SAYCODE_TYPE_ALWAYS)
 
 		for(var/visobj in vis_objs)
 			var/obj/O = visobj
 			O.see_emote(src, message, 2)
 
-		var/list/other_viewers = get_hearers_in_view(source = src)
+		var/list/other_viewers = get_hearers_in_view(3, source = src)
 		for(var/mob/M in (other_viewers - vis_mobs))
 			if(istype(M, /mob/observer))
 				continue

diff --git a/code/modules/modular_computers/file_system/programs/command/comm.dm b/code/modules/modular_computers/file_system/programs/command/comm.dm
@@ -44,6 +44,18 @@ var/global/last_message_id = 0
 	for(var/datum/comm_message_listener/l in comm_message_listeners)
 		l.Add(message)
 
+	// todo: refactor
+
+	//Old console support
+	for (var/obj/machinery/computer/communications/comm in GLOB.machines)
+		if (!(comm.machine_stat & (BROKEN | NOPOWER)) && comm.prints_intercept)
+			var/obj/item/paper/intercept = new /obj/item/paper( comm.loc )
+			intercept.name = message_title
+			intercept.info = message_text
+
+			comm.messagetitle.Add(message_title)
+			comm.messagetext.Add(message_text)
+
 /datum/comm_message_listener
 	var/list/messages
 

diff --git a/code/modules/movespeed/movespeed_modifier.dm b/code/modules/movespeed/movespeed_modifier.dm
@@ -77,6 +77,7 @@ Key procs
   */
 /datum/movespeed_modifier/proc/apply_multiplicative(existing, mob/target)
 	// todo: we should max/min to ticklag rather than 0, but, we can't until everything is moved to modifiers.
+	// todo: this is all shitty god we need to get rid of movement_delay() proper aaaa
 	switch(calculation_type)
 	/*
 		if(MOVESPEED_CALCULATION_HYPERBOLIC)
@@ -91,7 +92,9 @@ Key procs
 	*/
 		if(MOVESPEED_CALCULATION_HYPERBOLIC)
 			// going below 0 would fuck multipliers up pretty badly
-			return max(0, existing + multiplicative_slowdown)
+			// return max(0, existing + multiplicative_slowdown)
+			//! WE DO IT ANYWAYS - LEGACY
+			return existing + multiplicative_slowdown
 		if(MOVESPEED_CALCULATION_HYPERBOLIC_BOOST)
 			var/current_tiles = 10 / max(existing, world.tick_lag)
 			var/max_buff_to = max(existing + multiplicative_slowdown, 10 / absolute_max_tiles_per_second, 10 / (current_tiles + max_tiles_per_second_boost))