Merge branch 'master' into tram-bar-contest-ocean

Monkestation · Nov 11, 2023 · dab3ca8 · dab3ca8
2 parents ecb9f0f + fffd032
commit dab3ca8
Show file tree

Hide file tree

Showing 50 changed files with 645 additions and 47 deletions.
diff --git a/_maps/RandomRuins/IceRuins/icemoon_underground_wendigo_cave.dmm b/_maps/RandomRuins/IceRuins/icemoon_underground_wendigo_cave.dmm
@@ -13,7 +13,7 @@
 /turf/open/misc/asteroid/snow/ice/icemoon,
 /area/icemoon/underground/unexplored)
 "q" = (
-/mob/living/simple_animal/hostile/megafauna/wendigo,
+/mob/living/simple_animal/hostile/megafauna/wendigo/monkestation_override,
 /turf/open/indestructible/necropolis{
 	initial_gas_mix = "ICEMOON_ATMOS"
 	},

diff --git a/code/__DEFINES/DNA.dm b/code/__DEFINES/DNA.dm
@@ -140,6 +140,7 @@
 #define ORGAN_SLOT_EXTERNAL_ANIME_HEAD "anime_head"
 #define ORGAN_SLOT_EXTERNAL_ANIME_CHEST "anime_chest"
 #define ORGAN_SLOT_EXTERNAL_ANIME_BOTTOM "anime_bottom"
+#define ORGAN_SLOT_EXTERNAL_FLORAN_LEAVES "floran_leaves"
 
 /// Xenomorph organ slots
 #define ORGAN_SLOT_XENO_ACIDGLAND "acid_gland"

diff --git a/code/__DEFINES/external_organs.dm b/code/__DEFINES/external_organs.dm
@@ -6,6 +6,9 @@
 #define ORGAN_COLOR_HAIR (1<<2)
 ///uses the parents anime color
 #define ORGAN_COLOR_ANIME (1<<3)
+///uses the parents mutcolor secondary
+#define ORGAN_COLOR_MUTSECONDARY (1<<4)
+
 ///Tail wagging
 #define WAG_ABLE (1<<0)
 #define WAG_WAGGING (1<<1)
diff --git a/code/__DEFINES/is_helpers.dm b/code/__DEFINES/is_helpers.dm
@@ -81,7 +81,7 @@ GLOBAL_LIST_INIT(turfs_openspace, typecacheof(list(
 #define isgolem(A) (is_species(A, /datum/species/golem))
 #define islizard(A) (is_species(A, /datum/species/lizard))
 #define isplasmaman(A) (is_species(A, /datum/species/plasmaman))
-#define issimian(A) (is_species(A, /datum/species/simian))
+#define issimian(A) (is_species(A, /datum/species/simian)) //Monkestation Addition
 #define ispodperson(A) (is_species(A, /datum/species/pod))
 #define isflyperson(A) (is_species(A, /datum/species/fly))
 #define isjellyperson(A) (is_species(A, /datum/species/jelly))
@@ -97,7 +97,8 @@ GLOBAL_LIST_INIT(turfs_openspace, typecacheof(list(
 #define isandroid(A) (is_species(A, /datum/species/android))
 #define isnightmare(A) (is_species(A, /datum/species/shadow/nightmare))
 #define isipc(A) (is_species(A, /datum/species/ipc))
-#define isgoblin(A) (is_species(A, /datum/species/goblin))//monkestation addition
+#define isgoblin(A) (is_species(A, /datum/species/goblin)) //Monkestation Addition
+#define isfloran(A) (is_species(A, /datum/species/floran)) //Monkestation Addition
 
 
 //More carbon mobs

diff --git a/code/__DEFINES/mobs.dm b/code/__DEFINES/mobs.dm
@@ -128,8 +128,9 @@
 #define SPECIES_ZOMBIE_KROKODIL "krokodil_zombie"
 #define SPECIES_OOZELING "oozeling"
 #define SPECIES_IPC "ipc"
-#define SPECIES_SIMIAN "simian"
-#define SPECIES_GOBLIN "goblin"//monkestation addition
+#define SPECIES_SIMIAN "simian" //Monkestation Addition
+#define SPECIES_GOBLIN "goblin" //Monkestation Addition
+#define SPECIES_FLORAN "floran" //Monkestation Addition
 // Like species IDs, but not specifically attached a species.
 #define BODYPART_ID_ALIEN "alien"
 #define BODYPART_ID_ROBOTIC "robotic"

diff --git a/code/__HELPERS/global_lists.dm b/code/__HELPERS/global_lists.dm
@@ -44,6 +44,7 @@
 	init_sprite_accessory_subtypes(/datum/sprite_accessory/arachnid_appendages, GLOB.arachnid_appendages_list) //Monkestation Addition
 	init_sprite_accessory_subtypes(/datum/sprite_accessory/arachnid_chelicerae, GLOB.arachnid_chelicerae_list) //Monkestation Addition
 	init_sprite_accessory_subtypes(/datum/sprite_accessory/goblin_ears, GLOB.goblin_ears_list) //Monkestation Addition
+	init_sprite_accessory_subtypes(/datum/sprite_accessory/floran_leaves, GLOB.floran_leaves_list) //Monkestation Addition
 
 	//Species
 	for(var/spath in subtypesof(/datum/species))

diff --git a/code/__HELPERS/mobs.dm b/code/__HELPERS/mobs.dm
@@ -110,6 +110,8 @@
 		init_sprite_accessory_subtypes(/datum/sprite_accessory/arachnid_chelicerae, GLOB.arachnid_chelicerae_list)
 	if(!GLOB.goblin_ears_list.len)
 		init_sprite_accessory_subtypes(/datum/sprite_accessory/goblin_ears, GLOB.goblin_ears_list)
+	if(!GLOB.floran_leaves_list.len)
+		init_sprite_accessory_subtypes(/datum/sprite_accessory/floran_leaves, GLOB.floran_leaves_list)
 //Monkestation Addition End
 
 	//For now we will always return none for tail_human and ears. | "For now" he says.
@@ -142,7 +144,8 @@
 		"arachnid_appendages" = pick(GLOB.arachnid_appendages_list), //Monkestation Addition
 		"arachnid_chelicerae" = pick(GLOB.arachnid_chelicerae_list), //Monkestation Addition
 		"animecolor" = "#[pick("7F","FF")][pick("7F","FF")][pick("7F","FF")]", //Monkestation Addition
-		"goblin_ears" = pick(GLOB.goblin_ears_list) //Monkestation Addition
+		"goblin_ears" = pick(GLOB.goblin_ears_list), //Monkestation Addition
+		"floran_leaves" = pick(GLOB.floran_leaves_list), //Monkestation Addition
 	))
 
 /proc/random_hairstyle(gender)

diff --git a/code/_globalvars/lists/flavor_misc.dm b/code/_globalvars/lists/flavor_misc.dm
@@ -50,6 +50,7 @@ GLOBAL_LIST_EMPTY(anime_bottom_list) //Monkestation Addition
 GLOBAL_LIST_EMPTY(arachnid_appendages_list) //Monkestation Addition
 GLOBAL_LIST_EMPTY(arachnid_chelicerae_list) //Monkestation Addition
 GLOBAL_LIST_EMPTY(goblin_ears_list) //Monkestation Addition
+GLOBAL_LIST_EMPTY(floran_leaves_list) //Monkestation Addition
 
 GLOBAL_LIST_INIT(color_list_ethereal, list(
 	"Blue" = "#3399ff",
@@ -58,6 +59,7 @@ GLOBAL_LIST_INIT(color_list_ethereal, list(
 	"Cyan Blue" = "#00ffff",
 	"Dark Blue" = "#6666ff",
 	"Dark Fuschia" = "#cc0066",
+
 	"Dark Green" = "#37835b",
 	"Dark Red" = "#9c3030",
 	"Dull Yellow" = "#fbdf56",

diff --git a/code/datums/bodypart_overlays/mutant_bodypart_overlay.dm b/code/datums/bodypart_overlays/mutant_bodypart_overlay.dm
@@ -140,6 +140,11 @@
 				return
 			var/mob/living/carbon/human/human_owner = ownerlimb.owner
 			draw_color = human_owner.dna.features["animecolor"]
+		if(ORGAN_COLOR_MUTSECONDARY)
+			if(!ishuman(ownerlimb.owner))
+				return
+			var/mob/living/carbon/human/human_owner = ownerlimb.owner
+			draw_color = human_owner.dna.features["mcolor_secondary"]
 
 	return TRUE
 

diff --git a/code/game/objects/structures/crates_lockers/closets/secure/medical.dm b/code/game/objects/structures/crates_lockers/closets/secure/medical.dm
@@ -124,7 +124,11 @@
 	new /obj/item/storage/box/medigels(src)
 	new /obj/item/ph_booklet(src)
 	new /obj/item/reagent_containers/dropper(src)
+	//MONKESTATION REMOVAL START - FermiChem/pH chem is disabled, so having buffer bottles in the chemist lockers is a complete waste of time, space and processing power.
+	/*
 	new /obj/item/reagent_containers/cup/bottle/acidic_buffer(src) //hopefully they get the hint
+	*/
+	//MONKESTATION REMOVAL END
 
 /obj/structure/closet/secure_closet/chemical/heisenberg //contains one of each beaker, syringe etc.
 	name = "advanced chemical closet"

diff --git a/code/modules/food_and_drinks/recipes/soup_mixtures.dm b/code/modules/food_and_drinks/recipes/soup_mixtures.dm
@@ -36,6 +36,7 @@
 	mix_message = "You smell something good coming from the steaming pot of soup."
 	reaction_tags = REACTION_TAG_FOOD | REACTION_TAG_EASY
 	reaction_flags = REACTION_NON_INSTANT
+	var/Nonsouprecipe = FALSE
 
 	// General soup guideline:
 	// - Soups should produce 60-90 units (3-4 servings)
@@ -188,14 +189,14 @@
 			continue
 
 		// Things that had reagents or ingredients in the soup will get deleted
-		if((!isnull(ingredient.reagents) || is_type_in_list(ingredient, required_ingredients)) && !is_type_in_list(ingredient, outputted_ingredients))
+		if((!isnull(ingredient.reagents) || is_type_in_list(ingredient, required_ingredients)) && !is_type_in_list(ingredient, outputted_ingredients) && !Nonsouprecipe) //monkeedit
 			// Send everything left behind
 			transfer_ingredient_reagents(ingredient, holder)
 			// Delete, it's done
 			qdel(ingredient)
 
 		// Everything else will just get fried
-		else
+		if (!Nonsouprecipe) //monkeedit
 			ingredient.AddElement(/datum/element/fried_item, 30)
 
 	//LAZYNULL(pot.added_ingredients)

diff --git a/code/modules/jobs/job_types/chemist.dm b/code/modules/jobs/job_types/chemist.dm
@@ -49,7 +49,11 @@
 	ears = /obj/item/radio/headset/headset_med
 	glasses = /obj/item/clothing/glasses/science
 	shoes = /obj/item/clothing/shoes/sneakers/white
+	//MONKESTATION REMOVAL START - FermiChem/pH chem is disabled, so having buffer bottles in the chemists starting loadout is a complete waste of time, space and processing power.
+	/*
 	l_pocket = /obj/item/reagent_containers/cup/bottle/random_buffer
+	*/
+	//MONKESTATION REMOVAL END
 	r_pocket = /obj/item/reagent_containers/dropper
 
 	backpack = /obj/item/storage/backpack/chemistry

diff --git a/code/modules/mob/living/carbon/human/dummy.dm b/code/modules/mob/living/carbon/human/dummy.dm
@@ -109,6 +109,7 @@ INITIALIZE_IMMEDIATE(/mob/living/carbon/human/dummy)
 	target.dna.features["arachnid_appendages"] = "Long" //Monkestation Addition
 	target.dna.features["arachnid_chelicerae"] = "Basic" //Monkestation Addition
 	target.dna.features["goblin_ears"] = "Normal" //Monkestation Addition
+	target.dna.features["floran_leaves"] = "Furnivour" //Monkestation Addition
 
 /// Provides a dummy that is consistently bald, white, naked, etc.
 /mob/living/carbon/human/dummy/consistent

diff --git a/code/modules/mob/living/silicon/robot/robot.dm b/code/modules/mob/living/silicon/robot/robot.dm
@@ -358,6 +358,7 @@
 	cut_overlays()
 	SSvis_overlays.remove_vis_overlay(src, managed_vis_overlays)
 	icon_state = model.cyborg_base_icon
+	icon = model.cyborg_base_icon_file
 	if(stat != DEAD && !(HAS_TRAIT(src, TRAIT_KNOCKEDOUT) || IsStun() || IsParalyzed() || low_power_mode)) //Not dead, not stunned.
 		if(!eye_lights)
 			eye_lights = new()

diff --git a/code/modules/mob/living/silicon/robot/robot_model.dm b/code/modules/mob/living/silicon/robot/robot_model.dm
@@ -21,6 +21,8 @@
 	var/model_select_icon = "nomod"
 	///Produces the icon for the borg and, if no special_light_key is set, the lights
 	var/cyborg_base_icon = "robot"
+	///Keeps track of alternate icon files for the borg
+	var/cyborg_base_icon_file = 'icons/mob/silicon/robots.dmi'
 	///If we want specific lights, use this instead of copying lights in the dmi
 	var/special_light_key
 	///Holds all the usable modules (tools)
@@ -238,6 +240,7 @@
 	cyborg.diag_hud_set_status()
 	cyborg.diag_hud_set_borgcell()
 	cyborg.diag_hud_set_aishell()
+	cyborg.update_icons()
 	log_silicon("CYBORG: [key_name(cyborg)] has transformed into the [new_model] model.")
 
 	INVOKE_ASYNC(new_model, PROC_REF(do_transform_animation))

diff --git a/code/modules/mob/living/simple_animal/hostile/megafauna/wendigo.dm b/code/modules/mob/living/simple_animal/hostile/megafauna/wendigo.dm
@@ -10,6 +10,8 @@
 
 Difficulty: Hard
 
+Warning the icebox version is being overridden in monkestation/code/modules/mob/living/simple_animal/megafauna/wendigo.dm
+
 */
 
 /mob/living/simple_animal/hostile/megafauna/wendigo
@@ -57,13 +59,13 @@ Difficulty: Hard
 	/// Saves the turf the megafauna was created at (spawns exit portal here)
 	var/turf/starting
 	/// Range for wendigo stomping when it moves
-	var/stomp_range = 0
+	var/stomp_range = 1
 	/// Stores directions the mob is moving, then calls that a move has fully ended when these directions are removed in moved
 	var/stored_move_dirs = 0
 	/// If the wendigo is allowed to move
 	var/can_move = TRUE
 	/// Time before the wendigo can scream again
-	var/scream_cooldown_time = 5 SECONDS
+	var/scream_cooldown_time = 10 SECONDS
 	/// Stores the last scream time so it doesn't spam it
 	COOLDOWN_DECLARE(scream_cooldown)
 

diff --git a/code/modules/unit_tests/screenshots/screenshot_humanoids__datum_species_floran.png b/code/modules/unit_tests/screenshots/screenshot_humanoids__datum_species_floran.png
diff --git a/config/game_options.txt b/config/game_options.txt
@@ -355,6 +355,7 @@ ROUNDSTART_RACES arachnid
 ## Races that are better than humans in some ways, but worse in others
 ROUNDSTART_RACES ethereal
 ROUNDSTART_RACES goblin
+ROUNDSTART_RACES floran
 #ROUNDSTART_RACES jelly
 #ROUNDSTART_RACES abductor
 #ROUNDSTART_RACES synth

diff --git a/html/changelogs/archive/2023-11.yml b/html/changelogs/archive/2023-11.yml
@@ -0,0 +1,26 @@
+2023-11-06:
+  DexeeXI:
+  - rscadd: Dagoth Ur wishes you all to behave yourselves and pray well, lest you
+      invoke his anger.
+  Gboster-0:
+  - rscdel: Deleted wendigo's impossible attack
+  Salted-Zen:
+  - bugfix: Un-fries your boiled spagetti
+  Senri:
+  - bugfix: Fixed patreon monkecoin boost to work properly
+  - balance: rebalanced Throwing Arm quirk
+  lmenvs:
+  - rscadd: New Space Marine helmet, thanks to Odie_boy!
+  - bugfix: Pets that died and had no sprite should now be fixed. Lazarus Injections
+      will work properly too.
+2023-11-07:
+  DexeeXI:
+  - rscdel: Removed buffer bottles from Chemist job starting gear and the Chemist
+      lockers.
+  NicoDeLuna:
+  - rscadd: Added Edgerunner Hairstyle for Roundstart
+2023-11-08:
+  Glyphee:
+  - rscadd: Florans
+  KoboldCommando:
+  - bugfix: cargo, zoomba and kerfus borgs should no longer go invisible when reset
diff --git a/icons/mob/species/human/human_face.dmi b/icons/mob/species/human/human_face.dmi
diff --git a/monkestation/code/game/objects/items/choice_beacon.dm b/monkestation/code/game/objects/items/choice_beacon.dm
@@ -29,7 +29,6 @@
 			/mob/living/basic/butterfly,
 			/mob/living/basic/bee/friendly,
 			/mob/living/basic/crab,
-			/mob/living/basic/crab/spycrab,
 			/mob/living/basic/pet/penguin/baby,
 			/mob/living/basic/pet/fox,
 			/mob/living/simple_animal/pet/cat,

diff --git a/monkestation/code/modules/admin/smites/dagothkillsmite.dm b/monkestation/code/modules/admin/smites/dagothkillsmite.dm
@@ -0,0 +1,25 @@
+// Dagoth KILL Smite! (ported from Biblefart code) - Dexee
+// tweaked the name of this to make it extremely apparent that someone's gonna get fucked up. completely and utterly apparent. will be making a separate funny smite that doesn't kill
+
+/datum/smite/dagothkillsmite
+	name = "Dagoth KILL Smite"
+
+/datum/smite/dagothkillsmite/effect(client/user, mob/living/target)
+	. = ..()
+	if (!iscarbon(target))
+		to_chat(user, span_warning("This must be used on a carbon mob."), confidential = TRUE)
+		return
+	var/mob/living/carbon/human/Person = target
+	var/turf/Location = get_turf(target)
+	var/turf/T = get_step(get_step(Person, NORTH), NORTH)
+	to_chat(Person,span_ratvar("What a grand and intoxicating innocence. Perish."))
+	T.Beam(Person, icon_state="lightning[rand(1,12)]", time = 1.5 SECONDS)
+	Person.unequip_everything()
+	Person.Paralyze(15)
+	playsound(target,'sound/magic/lightningshock.ogg', 50, 1)
+	playsound(target,'monkestation/sound/misc/dagothgod.ogg', 80)
+	Person.electrocution_animation(15)
+	spawn(15)
+		Person.gib()
+		playsound(Location,'sound/effects/explosion3.ogg', 75, 1)
+	return
diff --git a/monkestation/code/modules/admin/smites/dagothstripsmite.dm b/monkestation/code/modules/admin/smites/dagothstripsmite.dm
@@ -0,0 +1,17 @@
+// The Dagoth Strip! To have something that doesn't kill but you still wanna humiliate someone! -Dexee
+
+/datum/smite/dagothstripsmite
+	name = "Dagoth STRIP"
+
+/datum/smite/dagothstripsmite/effect(client/user, mob/living/target)
+	. = ..()
+	if (!iscarbon(target))
+		to_chat(user, span_warning("This must be used on a carbon mob."), confidential = TRUE)
+		return
+	var/mob/living/carbon/human/Person = target
+	to_chat(Person,span_ratvar("Why have you come unprepared?"))
+	Person.unequip_everything()
+	Person.Paralyze(15)
+	playsound(target,'monkestation/sound/misc/dagothgod.ogg', 80)
+	return
+
diff --git a/monkestation/code/modules/cargoborg/code/cargo_module.dm b/monkestation/code/modules/cargoborg/code/cargo_module.dm
@@ -29,6 +29,7 @@
 	)
 	hat_offset = 0
 	cyborg_base_icon = "cargo"
+	cyborg_base_icon_file = 'monkestation/code/modules/cargoborg/icons/robots_cargo.dmi'
 	model_select_icon = "cargo"
 	canDispose = TRUE
 	borg_skins = list(