Merge branch 'master' into MODULE-2

maplestation.dme

@@ -6306,6 +6306,7 @@
 #include "maplestation_modules\code\modules\clothing\masks\ornithid_masks.dm"
 #include "maplestation_modules\code\modules\clothing\neck\coconut_bra.dm"
 #include "maplestation_modules\code\modules\clothing\shoes\digi_shoes.dm"
+#include "maplestation_modules\code\modules\clothing\shoes\laceup.dm"
 #include "maplestation_modules\code\modules\clothing\shoes\loadout_shoes.dm"
 #include "maplestation_modules\code\modules\clothing\suits\armor.dm"
 #include "maplestation_modules\code\modules\clothing\suits\digi_suits.dm"
@@ -6538,10 +6539,12 @@
 #include "maplestation_modules\story_content\kimono\code\kimonoclothing.dm"
 #include "maplestation_modules\story_content\laurence_equipment\code\laurence_clothing.dm"
 #include "maplestation_modules\story_content\lini_equipment\code\liniclothing.dm"
+#include "maplestation_modules\story_content\localnode_equipment\localnode_core.dm"
 #include "maplestation_modules\story_content\noble_equipment\code\beacon.dm"
 #include "maplestation_modules\story_content\noble_equipment\code\nobleclothing.dm"
 #include "maplestation_modules\story_content\noname_equipment\code\nonameclothing.dm"
 #include "maplestation_modules\story_content\noname_equipment\code\nonameitems.dm"
+#include "maplestation_modules\story_content\nurse_equipment\code\vinceclothing.dm"
 #include "maplestation_modules\story_content\phoneguy_equipment\code\headphone.dm"
 #include "maplestation_modules\story_content\post_overlay\code\post_overlay.dm"
 #include "maplestation_modules\story_content\prince_equipment\code\clothing.dm"

maplestation_modules/code/modules/clothing/shoes/laceup.dm

@@ -0,0 +1,14 @@
+/obj/item/clothing/shoes/laceup
+	name = "black laceup shoes"
+
+/obj/item/clothing/shoes/laceup/burgundy
+	name = "burgundy laceup shoes"
+	icon = 'maplestation_modules/icons/obj/clothing/shoes/laceups.dmi'
+	icon_state = "burgundy"
+	worn_icon = 'maplestation_modules/icons/mob/clothing/shoes/laceups.dmi'
+
+/obj/item/clothing/shoes/laceup/brown
+	name = "brown laceup shoes"
+	icon = 'maplestation_modules/icons/obj/clothing/shoes/laceups.dmi'
+	icon_state = "brown"
+	worn_icon = 'maplestation_modules/icons/mob/clothing/shoes/laceups.dmi'

maplestation_modules/code/modules/loadouts/loadout_items/loadout_datum_gloves.dm

@@ -84,3 +84,8 @@
 	name = "Mixed Gloves"
 	item_path = /obj/item/clothing/gloves/black/jessie_gloves
 	additional_displayed_text = list("Character Item")
+
+/datum/loadout_item/gloves/vince
+	name = "Buckled Black Gloves"
+	item_path = /obj/item/clothing/gloves/vince
+	additional_displayed_text = list("Character Item")

maplestation_modules/code/modules/loadouts/loadout_items/loadout_datum_heads.dm

@@ -263,3 +263,8 @@
 	name = "Modified Nun Veil"
 	item_path = /obj/item/clothing/head/costume/hat/belli
 	additional_displayed_text = list("Character Item")
+
+/datum/loadout_item/head/vince
+	name = "Violet Nurse Cap"
+	item_path = /obj/item/clothing/head/costume/vince
+	additional_displayed_text = list("Character Item")

maplestation_modules/code/modules/loadouts/loadout_items/loadout_datum_shoes.dm

@@ -57,10 +57,18 @@
 	name = "Mining Boots"
 	item_path = /obj/item/clothing/shoes/workboots/mining
 
-/datum/loadout_item/shoes/laceup
-	name = "Laceup Shoes"
+/datum/loadout_item/shoes/black_laceup
+	name = "Black Laceup Shoes"
 	item_path = /obj/item/clothing/shoes/laceup
 
+/datum/loadout_item/shoes/burgundy_laceup
+	name = "Burgundy Laceup Shoes"
+	item_path = /obj/item/clothing/shoes/laceup/burgundy
+
+/datum/loadout_item/shoes/brown_laceup
+	name = "Brown Laceup Shoes"
+	item_path = /obj/item/clothing/shoes/laceup/brown
+
 /datum/loadout_item/shoes/russian_boots
 	name = "Russian Boots"
 	item_path = /obj/item/clothing/shoes/russian
@@ -122,3 +130,8 @@
 	name = "Berbier Boots"
 	item_path = /obj/item/clothing/shoes/liniboots
 	additional_displayed_text = list("Character Item")
+
+/datum/loadout_item/shoes/vince
+	name = "Slick Syringe Heels"
+	item_path = /obj/item/clothing/shoes/vince
+	additional_displayed_text = list("Character Item")

maplestation_modules/code/modules/loadouts/loadout_items/loadout_datum_under.dm

@@ -404,3 +404,8 @@
 	name = "Modified Nun Uniform"
 	item_path = /obj/item/clothing/under/jumpsuit/belli
 	additional_displayed_text = list("Character Item")
+
+/datum/loadout_item/under/jumpsuit/vince
+	name = "Violet Nurse Uniform"
+	item_path = /obj/item/clothing/under/dress/vince
+	additional_displayed_text = list("Character Item")

maplestation_modules/code/modules/mob/dead/new_player/sprite_accessories.dm

@@ -332,6 +332,11 @@
 	icon = 'maplestation_modules/icons/mob/human_face.dmi'
 	icon_state = "hair_longbraid"
 
+/datum/sprite_accessory/hair/obsessive_doctor
+	name = "Obsessive Doctor"
+	icon = 'maplestation_modules/icons/mob/human_face.dmi'
+	icon_state = "hair_obsess"
+
 // https://github.com/Skyrat-SS13/Skyrat-tg/pull/17656
 /datum/sprite_accessory/tails/lizard/big
 	name = "Big"
@@ -502,3 +507,8 @@
 	name = "Mismatched Checkered Socks"
 	icon_state = "mismatchpoker"
 	icon = 'maplestation_modules/icons/mob/clothing/underwear.dmi'
+
+/datum/sprite_accessory/socks/pokersocks
+	name = "High Black Stockings"
+	icon_state = "highblackstocking"
+	icon = 'maplestation_modules/icons/mob/clothing/underwear.dmi'

maplestation_modules/code/modules/vending/clothesmate.dm

@@ -31,6 +31,8 @@
 		list(
 			"name" = "Shoes",
 			"products" = list(
+				/obj/item/clothing/shoes/laceup/burgundy = 2,
+				/obj/item/clothing/shoes/laceup/brown = 2,
 				/obj/item/clothing/shoes/heels = 3,
 			),
 		),

maplestation_modules/code/modules/vending/wardrobes.dm

@@ -3,3 +3,15 @@
 		/obj/item/clothing/under/rank/civilian/bartender/vintageskirt = 1,
 		/obj/item/clothing/glasses/eyepatch/reagent = 2,
 	)
+
+/obj/machinery/vending/wardrobe/law_wardrobe
+	added_products = list(
+		/obj/item/clothing/shoes/laceup/burgundy = 2,
+		/obj/item/clothing/shoes/laceup/brown = 2,
+	)
+
+/obj/machinery/vending/wardrobe/det_wardrobe
+	added_products = list(
+		/obj/item/clothing/shoes/laceup/burgundy = 2,
+		/obj/item/clothing/shoes/laceup/brown = 2,
+	)

maplestation_modules/story_content/localnode_equipment/localnode_core.dm

@@ -0,0 +1,31 @@
+/* #Localnode's core.
+* This is a special core item for the strange alien AI localnode.
+* A character can talk as localnode when held, as this is a dual char.
+* Coded by Constellado, made for Blacklist 897
+*/
+
+/obj/item/localnode
+	name = "LocalNode#4248"
+	desc = "It looks like a basketball sized blue orb, however it looks like it had bits broken off with a hammer a few times before covering it with superglue and rolling it in a box of computer parts"
+	icon = 'maplestation_modules/story_content/localnode_equipment/sprites/localnode.dmi'
+	icon_state = "localnode"
+	lefthand_file = 'maplestation_modules/story_content/localnode_equipment/sprites/localnode_inhand_lh.dmi'
+	righthand_file = 'maplestation_modules/story_content/localnode_equipment/sprites/localnode_inhand_rh.dmi'
+	inhand_icon_state = "localnode"
+	var/item_chat_color = "#0e5807"
+	var/voice_name = "LocalNode#4248"
+
+/obj/item/localnode/attack_self(mob/user)
+	playsound(src.loc, 'sound/machines/buzz-sigh.ogg', 35, TRUE)
+
+/obj/item/localnode/talk_into(atom/movable/A, message, channel, list/spans, datum/language/language, list/message_mods)
+	var/mob/M = A
+	if (istype(M))
+		M.log_talk(message, LOG_SAY, tag="LocalNode")
+
+	chat_color = item_chat_color// this feels cursed to call this very time but i cant get it to work
+	say(message, language, sanitize = FALSE)
+	return NOPASS
+
+/obj/item/localnode/GetVoice()
+	return voice_name

maplestation_modules/story_content/nurse_equipment/code/vinceclothing.dm

@@ -0,0 +1,46 @@
+// -- nurse outfit --
+
+/obj/item/clothing/under/dress/vince
+	name = "violet nurse uniform"
+	desc = "A short violet nurse dress, lined with subtle red and pink hues."
+	icon = 'maplestation_modules/story_content/nurse_equipment/icons/vince_item.dmi'
+	worn_icon = 'maplestation_modules/story_content/nurse_equipment/icons/vince_worn.dmi'
+	icon_state = "vincedress"
+	resistance_flags = INDESTRUCTIBLE
+
+/obj/item/clothing/shoes/vince
+	name = "slick syringe heels"
+	desc = "Black pumps with decorative syringes making the heels. They're decorative, right?"
+	icon = 'maplestation_modules/story_content/nurse_equipment/icons/vince_item.dmi'
+	worn_icon = 'maplestation_modules/story_content/nurse_equipment/icons/vince_worn.dmi'
+	icon_state = "vinceshoes"
+	resistance_flags = INDESTRUCTIBLE
+
+/obj/item/clothing/shoes/vince/Initialize(mapload)
+	. = ..()
+	AddComponent( \
+		/datum/component/shoe_footstep, \
+		sounds = list( \
+			'maplestation_modules/sound/items/highheel1.ogg', \
+			'maplestation_modules/sound/items/highheel2.ogg', \
+		), \
+		volume = 55, \
+		chance_per_play = 50, \
+		can_tape = TRUE, \
+	)
+
+/obj/item/clothing/head/costume/vince
+	name = "violet nurse cap"
+	desc = "A violet nurse cap with a deep red 'X' on it. Shouldn't violate the Geneva Convention."
+	icon = 'maplestation_modules/story_content/nurse_equipment/icons/vince_item.dmi'
+	worn_icon = 'maplestation_modules/story_content/nurse_equipment/icons/vince_worn.dmi'
+	icon_state = "vincecap"
+	resistance_flags = INDESTRUCTIBLE
+
+/obj/item/clothing/gloves/vince
+	name = "buckled black gloves"
+	desc = "Slick black gloves with a neon green palm and pink lining. Poisonous!"
+	icon = 'maplestation_modules/story_content/nurse_equipment/icons/vince_item.dmi'
+	worn_icon = 'maplestation_modules/story_content/nurse_equipment/icons/vince_worn.dmi'
+	icon_state = "vincegloves"
+	resistance_flags = INDESTRUCTIBLE