Merge branch 'master' into HeyNiceClock

Citadel-Station-13 · Oct 20, 2023 · f71bc68 · f71bc68
2 parents c3ed0b0 + 4d4c876
commit f71bc68
Show file tree

Hide file tree

Showing 41 changed files with 503 additions and 211 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/fishing/fishing.dm b/code/__DEFINES/fishing/fishing.dm
@@ -54,6 +54,8 @@
 #define FISHING_MINIGAME_RULE_WEIGHTED_BAIT "weighted"
 #define FISHING_MINIGAME_RULE_LIMIT_LOSS "limit_loss"
 
+#define isfish(fish_type) (ispath(fish_type, /obj/item/fish) || ispath(fish_type, /mob/living/simple_mob/animal/passive/fish))
+
 /// The default additive value for fishing hook catch weight modifiers.
 #define FISHING_DEFAULT_HOOK_BONUS_ADDITIVE 0
 /// The default multiplicative value for fishing hook catch weight modifiers.

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/machinery/vending.dm b/code/game/machinery/vending.dm
@@ -789,7 +789,9 @@
 		/obj/item/reagent_containers/food/drinks/bottle/small/sarsaparilla = 10,
 		/obj/item/reagent_containers/food/drinks/cans/gingerale = 10,
 		/obj/item/reagent_containers/food/drinks/cans/nicola = 10,
+		/obj/item/reagent_containers/food/drinks/cans/nicola_fire = 10,
 		/obj/item/reagent_containers/food/drinks/cans/nicola_sakura = 10,
+		/obj/item/reagent_containers/food/drinks/cans/nicola_blue = 10,
 		/obj/item/reagent_containers/food/drinks/cans/crystalgibb = 10,
 		/obj/item/reagent_containers/food/drinks/cans/dr_gibb = 10,
 		/obj/item/reagent_containers/food/drinks/cans/dr_gibb_cherry = 10,
@@ -834,7 +836,9 @@
 		/obj/item/reagent_containers/food/drinks/bludboxlight = 35,
 		/obj/item/reagent_containers/food/drinks/cans/coconutwater = 6,
 		/obj/item/reagent_containers/food/drinks/cans/nicola = 2,
+		/obj/item/reagent_containers/food/drinks/cans/nicola_fire = 2,
 		/obj/item/reagent_containers/food/drinks/cans/nicola_sakura = 2,
+		/obj/item/reagent_containers/food/drinks/cans/nicola_blue = 2,
 		/obj/item/reagent_containers/food/drinks/cans/dr_gibb_cherry = 2,
 		/obj/item/reagent_containers/food/drinks/cans/cola_cherry = 2,
 		/obj/item/reagent_containers/food/drinks/cans/cola_coffee = 2,
@@ -892,7 +896,9 @@
 		/obj/item/reagent_containers/food/drinks/cans/ochamidori = 10,
 		/obj/item/reagent_containers/food/drinks/cans/ramune = 10,
 		/obj/item/reagent_containers/food/drinks/cans/nicola = 10,
+		/obj/item/reagent_containers/food/drinks/cans/nicola_fire = 10,
 		/obj/item/reagent_containers/food/drinks/cans/nicola_sakura = 10,
+		/obj/item/reagent_containers/food/drinks/cans/nicola_blue = 10,
 		/obj/item/clothing/under/kimono = 5,
 		/obj/item/clothing/under/kimono/yellow = 5,
 		/obj/item/clothing/under/kimono/blue = 5,
@@ -915,8 +921,10 @@
 		/obj/item/reagent_containers/food/snacks/bagged/wpeas = 5,
 		/obj/item/reagent_containers/food/drinks/cans/ochamidori = 8,
 		/obj/item/reagent_containers/food/drinks/cans/ramune = 10,
-		/obj/item/reagent_containers/food/drinks/cans/nicola = 10,
-		/obj/item/reagent_containers/food/drinks/cans/nicola_sakura = 10,
+		/obj/item/reagent_containers/food/drinks/cans/nicola = 2,
+		/obj/item/reagent_containers/food/drinks/cans/nicola_fire = 2,
+		/obj/item/reagent_containers/food/drinks/cans/nicola_sakura = 2,
+		/obj/item/reagent_containers/food/drinks/cans/nicola_blue = 2,
 		/obj/item/clothing/under/kimono = 10,
 		/obj/item/clothing/under/kimono/yellow = 10,
 		/obj/item/clothing/under/kimono/blue = 10,

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/fishing/equipment/hook.dm b/code/modules/fishing/equipment/hook.dm
@@ -59,7 +59,7 @@
 	// chasm_detritus_type = /obj/item/chasm_detritus/restricted/objects
 
 /obj/item/fishing_hook/magnet/get_hook_bonus_multiplicative(fish_type, datum/fish_source/source)
-	if(fish_type == FISHING_DUD || ispath(fish_type, /obj/item/fish))
+	if(fish_type == FISHING_DUD || isfish(fish_type))
 		return ..()
 	// We multiply the odds by five for everything that's not a fish nor a dud
 	return MAGNET_HOOK_BONUS_MULTIPLIER
@@ -103,7 +103,7 @@
 
 /obj/item/fishing_hook/rescue/get_hook_bonus_multiplicative(fish_type, datum/fish_source/source)
 	// Sorry, you won't catch fish with this.
-	if(ispath(fish_type, /obj/item/fish))
+	if(isfish(fish_type))
 		return RESCUE_HOOK_FISH_MULTIPLIER
 	return ..()
 

diff --git a/code/modules/food/food/cans.dm b/code/modules/food/food/cans.dm
@@ -275,16 +275,36 @@
 	. = ..()
 	reagents.add_reagent("nicola", 30)
 
+/obj/item/reagent_containers/food/drinks/cans/nicola_fire
+	name = "\improper NiCola Fire"
+	desc = "A can of crisp NiCola, spiked with flaming hot spices."
+	icon_state = "nicolafire"
+	center_of_mass = list("x"=16, "y"=10)
+
+/obj/item/reagent_containers/food/drinks/cans/nicola_fire/Initialize(mapload)
+	. = ..()
+	reagents.add_reagent("nicolafire", 30)
+
 /obj/item/reagent_containers/food/drinks/cans/nicola_sakura
 	name = "\improper NiCola Sakura"
-	desc = "A can of crisp NiCola, subtly flavored with cherry."
+	desc = "A can of crisp NiCola, subtly flavored with cherry blossoms."
 	icon_state = "nicolasakura"
 	center_of_mass = list("x"=16, "y"=10)
 
 /obj/item/reagent_containers/food/drinks/cans/nicola_sakura/Initialize(mapload)
 	. = ..()
 	reagents.add_reagent("nicolacherry", 30)
 
+/obj/item/reagent_containers/food/drinks/cans/nicola_blue
+	name = "\improper NiCola Blue"
+	desc = "A limited edition can of crisp NiCola, paired with a mellow violet flavor."
+	icon_state = "nicolablue"
+	center_of_mass = list("x"=16, "y"=10)
+
+/obj/item/reagent_containers/food/drinks/cans/nicola_blue/Initialize(mapload)
+	. = ..()
+	reagents.add_reagent("nicolablue", 30)
+
 /obj/item/reagent_containers/food/drinks/cans/robustexpress
 	name = "\improper Robust Express"
 	desc = "Delicious caffeine awaits inside. It's pleasantly warm to the touch."

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/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/mob/living/carbon/human/human_species.dm b/code/modules/mob/living/carbon/human/human_species.dm
@@ -81,3 +81,12 @@
 
 /mob/living/carbon/human/adherent
 	species = /datum/species/adherent
+
+/mob/living/carbon/human/krisitik
+	species = /datum/species/krisitik
+
+/mob/living/carbon/human/skeleton
+	species = /datum/species/skeleton
+
+/mob/living/carbon/human/shadow
+	species = /datum/species/shadow
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))

diff --git a/code/modules/projectiles/gun.dm b/code/modules/projectiles/gun.dm
@@ -60,7 +60,9 @@
 	var/fire_sound_text = "gunshot"
 	var/fire_anim = null
 	var/recoil = 0		//screen shake
-	var/silenced = 0
+	var/suppressible = FALSE
+	var/silenced = FALSE
+	var/silenced_icon = null
 	var/muzzle_flash = 3
 	var/accuracy = 65   //Accuracy is measured in percents. +15 accuracy means that everything is effectively one tile closer for the purpose of miss chance, -15 means the opposite. launchers are not supported, at the moment.
 	var/scoped_accuracy = null