Merge branch 'Fluffy-Frontier:master' into psyonics

_maps/map_files/Snowglobe/snowglobe.dmm

@@ -9956,6 +9956,7 @@
 /area/station/science/genetics)
 "cGs" = (
 /obj/vehicle/ridden/secway,
+/obj/item/key/security,
 /turf/open/floor/iron/recharge_floor,
 /area/station/ai_monitored/security/armory)
 "cGu" = (
@@ -45032,10 +45033,6 @@
 	dir = 8
 	},
 /area/station/command/secure_bunker)
-"mai" = (
-/obj/structure/reagent_dispensers/wall/peppertank/directional/east,
-/turf/closed/wall/r_wall,
-/area/station/security/interrogation)
 "mav" = (
 /obj/effect/turf_decal/trimline/green/filled/line{
 	dir = 1
@@ -57855,6 +57852,7 @@
 /obj/effect/turf_decal/trimline/white/line{
 	dir = 8
 	},
+/obj/structure/reagent_dispensers/wall/peppertank/directional/west,
 /turf/open/floor/iron/dark/smooth_edge{
 	dir = 8
 	},
@@ -245043,7 +245041,7 @@ bTu
 bTu
 bTu
 bTu
-mai
+bTu
 bmd
 ayV
 bsm

code/game/objects/empulse.dm

@@ -1,4 +1,4 @@
-/proc/empulse(turf/epicenter, heavy_range, light_range, log=0)
+/proc/empulse(turf/epicenter, heavy_range, light_range, log=1) // NOVA EDIT CHANGE - ORIGINAL: /proc/empulse(turf/epicenter, heavy_range, light_range, log=0)
 	if(!epicenter)
 		return
 

code/modules/antagonists/changeling/changeling.dm

@@ -11,7 +11,7 @@
 	hijack_speed = 0.5
 	ui_name = "AntagInfoChangeling"
 	suicide_cry = "FOR THE HIVE!!"
-	can_assign_self_objectives = TRUE
+	can_assign_self_objectives = FALSE // NOVA EDIT CHANGE - Too loose of a cannon, and doesn't have staff sign off - ORIGINAL: can_assign_self_objectives = TRUE
 	default_custom_objective = "Consume the station's most valuable genomes."
 	hardcore_random_bonus = TRUE
 	stinger_sound = 'sound/music/antag/ling_alert.ogg'

code/modules/antagonists/traitor/datum_traitor.dm

@@ -14,7 +14,7 @@
 	ui_name = "AntagInfoTraitor"
 	suicide_cry = "FOR THE SYNDICATE!!"
 	preview_outfit = /datum/outfit/traitor
-	can_assign_self_objectives = TRUE
+	can_assign_self_objectives = FALSE // NOVA EDIT CHANGE - Too loose of a cannon, and doesn't have staff sign off - ORIGINAL: can_assign_self_objectives = TRUE
 	default_custom_objective = "Perform an overcomplicated heist on valuable Nanotrasen assets."
 	hardcore_random_bonus = TRUE
 	stinger_sound = 'sound/music/antag/traitor/tatoralert.ogg'

html/changelogs/AutoChangeLog-pr-5188.yml

@@ -0,0 +1,7 @@
+author: "Thedragmeme"
+delete-after: True
+changes:
+  - rscadd: "Adds 7 new drinks: Starfruit Soda, Starfruit Lubricant(Synth), Starlit Latte, Starbeam Shake, Forgotten Star, Astral Flame, and Space Muse."
+  - rscadd: "Adds 14 new dishes: Glazed Ribs, BBQ Meat Platter, Chicken Alfredo(cursed), Starfruit Sushi Roll, Starfruit Sashimi, Starfruit Eggplant Stir Fry, Starfruit Tofu Beef Ramen, Starfruit Noodles, Starfruit Cake(do you see the theme yet), Starfruit Jelly, Starfruit Macaron, Starfruit Cobbler, Starfruit Jelly Toast, Starfruit Pie, Starfruit Compote, Starfruit Creme Brulee, and Starfruit Cupcake"
+  - image: "Adds roughly 20 new sprites to the game"
+  - qol: "Adds a new book to the starfruit seed crate"

html/changelogs/AutoChangeLog-pr-5189.yml

@@ -0,0 +1,5 @@
+author: "FlufflesTheDog"
+delete-after: True
+changes:
+  - bugfix: "stomachs no longer drop out of oversized characters on spawn"
+  - bugfix: "charging implants no longer drop out of synth characters on spawn"

html/changelogs/AutoChangeLog-pr-5190.yml

@@ -0,0 +1,4 @@
+author: "sqnztb"
+delete-after: True
+changes:
+  - map: "snowglobe - fixed the floating pepperspray refiller and added a secway key."

html/changelogs/AutoChangeLog-pr-5191.yml

@@ -0,0 +1,4 @@
+author: "sqnztb"
+delete-after: True
+changes:
+  - admin: "logging enabled by default for all emp sources."

html/changelogs/AutoChangeLog-pr-5192.yml

@@ -0,0 +1,7 @@
+author: "iskawhiskers"
+delete-after: True
+changes:
+  - rscadd: "new sprite accessories: floppy (ears), big legs with pegfeet (taur legs), porcine and porcine + tusks (snout)"
+  - qol: "duplicated fuzzball/cetaceous/geniculate antennae to horns"
+  - rscadd: "new clothing: giant scarf (undersuit), designer gloves (hands), designer jacket (suit)"
+  - qol: "add security cape to the loadout menu. accessible by all players as it is a neck item with no mechanical benefit"

html/changelogs/AutoChangeLog-pr-5193.yml

@@ -0,0 +1,4 @@
+author: "RatFromTheJungle"
+delete-after: True
+changes:
+  - code_imp: "Traitors and changelings can no longer self-assign objectives."

modular_nova/master_files/code/modules/clothing/suits/labcoat.dm

@@ -35,6 +35,12 @@
 	icon_state = "labcoat_regular"
 	gets_cropped_on_taurs = FALSE
 
+/obj/item/clothing/suit/toggle/labcoat/nova/lalunevest
+	name = "sleeveless buttoned coat"
+	desc = "A fashionable jacket bearing the La Lune insignia on the inside. It appears similar to a labcoat in design and materials, though the tag warns against it being a replacement for such."
+	icon_state = "labcoat_lalunevest"
+	gets_cropped_on_taurs = FALSE
+
 /obj/item/clothing/suit/toggle/labcoat/nova/pharmacist
 	name = "pharmacist's labcoat"
 	desc = "A standard labcoat for chemistry which protects the wearer from acid spills."

modular_nova/master_files/code/modules/clothing/under/skirts_dresses.dm

@@ -216,6 +216,17 @@
 	greyscale_config = /datum/greyscale_config/wedding_dress_ribbon
 	greyscale_config_worn = /datum/greyscale_config/wedding_dress_ribbon/worn
 
+/obj/item/clothing/under/dress/nova/giant_scarf
+	name = "giant scarf"
+	desc = "An absurdly massive scarf, worn as the main article of clothing over the body. Ironically, not very suitable for the cold."
+	icon_state = "giant_scarf"
+	body_parts_covered = CHEST|GROIN|LEGS
+	greyscale_config = /datum/greyscale_config/giant_scarf
+	greyscale_config_worn = /datum/greyscale_config/giant_scarf/worn
+	greyscale_colors = "#EEEEEE"
+	female_sprite_flags = NO_FEMALE_UNIFORM
+	flags_1 = IS_PLAYER_COLORABLE_1
+
 /*
  *	Others
  */

modular_nova/modules/GAGS/greyscale_configs.dm

@@ -1346,6 +1346,15 @@
 	name = "Wedding Dress With Ribbon (Worn)"
 	icon_file = 'modular_nova/master_files/icons/mob/clothing/under/skirts_dresses.dmi'
 
+/datum/greyscale_config/giant_scarf
+	name = "Giant Scarf"
+	icon_file = 'modular_nova/master_files/icons/obj/clothing/under/skirts_dresses.dmi'
+	json_config = 'modular_nova/modules/GAGS/json_configs/pants_shorts_skirts_dresses/giant_scarf.json'
+
+/datum/greyscale_config/giant_scarf/worn
+	name = "Giant Scarf (Worn)"
+	icon_file = 'modular_nova/master_files/icons/mob/clothing/under/skirts_dresses.dmi'
+
 
 // KILT
 // COSTUMES

modular_nova/modules/GAGS/json_configs/pants_shorts_skirts_dresses/giant_scarf.json

@@ -0,0 +1,10 @@
+{
+	"giant_scarf": [
+		{
+			"type": "icon_state",
+			"icon_state": "giant_scarf",
+			"blend_mode": "overlay",
+			"color_ids": [ 1 ]
+		}
+	]
+}

modular_nova/modules/cargo/code/packs.dm

@@ -716,4 +716,5 @@
 	cost = CARGO_CRATE_VALUE * 5
 	contains = list(
 		/obj/item/seeds/starfruit = 2,
+		/obj/item/book/manual/starfruit = 1,
 	)

modular_nova/modules/customization/modules/client/augment/implants.dm

@@ -1,11 +1,11 @@
 /datum/augment_item/implant
 	category = AUGMENT_CATEGORY_IMPLANTS
 
-/datum/augment_item/implant/apply(mob/living/carbon/human/H, character_setup = FALSE, datum/preferences/prefs)
+/datum/augment_item/implant/apply(mob/living/carbon/human/organ_receiver, character_setup = FALSE, datum/preferences/prefs)
 	if(character_setup)
 		return
-	var/obj/item/organ/new_organ = new path()
-	new_organ.Insert(H,FALSE,FALSE)
+	var/obj/item/organ/new_organ = new path
+	new_organ.Insert(organ_receiver, special = FALSE, movement_flags = DELETE_IF_REPLACED)
 
 //BRAIN IMPLANTS
 /datum/augment_item/implant/brain

modular_nova/modules/customization/modules/clothing/hands/hands.dm

@@ -9,6 +9,15 @@
 	cold_protection = HANDS
 	min_cold_protection_temperature = GLOVES_MIN_TEMP_PROTECT
 
+/obj/item/clothing/gloves/lalune_long
+	icon = 'modular_nova/master_files/icons/obj/clothing/gloves.dmi'
+	worn_icon = 'modular_nova/master_files/icons/mob/clothing/hands.dmi'
+	name = "designer long gloves"
+	desc = "A fancy set of bicep-length black gloves. The La Lune insignia is sewn into the rims."
+	icon_state = "lalune_long"
+	strip_delay = 4 SECONDS
+	equip_delay_other = 2 SECONDS
+
 /obj/item/clothing/gloves/kim
 	icon = 'modular_nova/master_files/icons/obj/clothing/gloves.dmi'
 	worn_icon = 'modular_nova/master_files/icons/mob/clothing/hands.dmi'