[SECOND SERVER ONLY] Weaving Beacon

ModularTegustation/tegu_items/associations/tame_beacon.dm

@@ -0,0 +1,31 @@
+/obj/item/choice_beacon/tame
+	name = "T.A.M.E's beacon"
+	desc = "A beacon workshops use to summon their T.A.M.E kit. (WARNING: This will spawn a structure at the place it is used)"
+	var/useable_outside_office = FALSE
+	custom_price = PAYCHECK_COMMAND * 2
+
+/obj/item/choice_beacon/tame/attack_self(mob/user)
+	if(useable_outside_office)
+		if(SSmaptype.maptype == "office")
+			if(canUseBeacon(user))
+				generate_options(user)
+		else
+			playsound(src, 'sound/machines/buzz-sigh.ogg', 40, TRUE)
+			to_chat(user, span_hear("You can't use this beacon in this gamemode!"))
+	else
+		if(canUseBeacon(user))
+			generate_options(user)
+
+/obj/item/choice_beacon/tame/generate_display_names()
+	var/static/list/beacon_item_list
+	if(!beacon_item_list)
+		beacon_item_list = list()
+		var/list/templist = list(/obj/structure/ordeal_extractor)
+		for(var/V in templist)
+			var/atom/A = V
+			beacon_item_list[initial(A.name)] = A
+	return beacon_item_list
+
+/obj/item/choice_beacon/tame/spawn_option(obj/choice,mob/living/M)
+	new choice(get_turf(M))
+	to_chat(M, span_hear("Take good care of your T.A.M.E kit!"))

ModularTegustation/tegu_items/associations/vending.dm

@@ -120,6 +120,12 @@
 	icon_state = "robotics"
 	icon_deny = null
 	products = list(
+		/obj/item/choice_beacon/weaving = 1,
+		/obj/item/choice_beacon/tame = 1,
+		/obj/item/storage/photo_album/fixer = 1,
+		/obj/item/camera = 10,
+		/obj/item/taperecorder = 4,
+		/obj/item/tape = 10,
 		/obj/item/flashlight/seclite = 100,
 		/obj/item/attribute_increase/fixer = 1500,
 		/obj/item/radio/headset = 200,

ModularTegustation/tegu_items/associations/weaving_beacon.dm

@@ -0,0 +1,58 @@
+/obj/item/choice_beacon/weaving
+	name = "weaver's beacon"
+	desc = "A beacon weavers use to summon their gear."
+	var/useable_outside_office = FALSE
+	custom_price = PAYCHECK_ASSISTANT
+
+/obj/item/choice_beacon/weaving/attack_self(mob/user)
+	if(useable_outside_office)
+		if(SSmaptype.maptype == "office")
+			if(canUseBeacon(user))
+				generate_options(user)
+		else
+			playsound(src, 'sound/machines/buzz-sigh.ogg', 40, TRUE)
+			to_chat(user, span_hear("You can't use this beacon in this gamemode!"))
+	else
+		if(canUseBeacon(user))
+			generate_options(user)
+
+/obj/item/choice_beacon/weaving/generate_display_names()
+	var/static/list/beacon_item_list
+	if(!beacon_item_list)
+		beacon_item_list = list()
+		var/list/templist = list(/obj/effect/weaving_spawner)
+		for(var/V in templist)
+			var/atom/A = V
+			beacon_item_list[initial(A.name)] = A
+	return beacon_item_list
+
+/obj/item/choice_beacon/weaving/spawn_option(obj/choice,mob/living/M)
+	new choice(get_turf(M))
+	to_chat(M, span_hear("Take good care of your gear!"))
+
+/obj/effect/weaving_spawner
+	name = "Weaver Gear, (WARNING: Comes with a vending machine)"
+	desc = "Spawns in all of the gear that a weaver needs."
+
+/obj/effect/weaving_spawner/Initialize(mapload)
+	. = ..()
+	new /obj/machinery/vending/weaving/cheap (get_turf(src))
+	new /obj/item/book/granter/crafting_recipe/carnival/weaving_armor (get_turf(src))
+	new /obj/item/silkknife (get_turf(src))
+	new /obj/item/storage/bag/silk/filled (get_turf(src))
+	new /obj/item/book/granter/crafting_recipe/carnival/human_replacements (get_turf(src))
+	new /obj/item/book/granter/crafting_recipe/carnival/weaving_basic_converstion (get_turf(src))
+	new /obj/item/paper/fluff/silk_guide (get_turf(src))
+	new /obj/item/paper/fluff/silk_guide (get_turf(src))
+	qdel(src)
+
+/obj/item/storage/bag/silk/filled
+
+/obj/item/storage/bag/silk/filled/PopulateContents()
+	for(var/i in 1 to 8)
+		new /obj/item/stack/sheet/silk/indigo_simple(src)
+		new /obj/item/stack/sheet/silk/green_simple(src)
+		new /obj/item/stack/sheet/silk/steel_simple(src)
+		new /obj/item/stack/sheet/silk/amber_simple(src)
+	for(var/i in 1 to 4)
+		new /obj/item/stack/sheet/silk/human_simple(src)

code/game/objects/items/devices/taperecorder.dm

@@ -13,6 +13,7 @@
 	custom_materials = list(/datum/material/iron=60, /datum/material/glass=30)
 	force = 2
 	throwforce = 0
+	custom_price = PAYCHECK_ASSISTANT
 	var/recording = FALSE
 	var/playing = FALSE
 	var/playsleepseconds = 0
@@ -298,6 +299,7 @@
 	var/list/storedinfo = list()
 	var/list/timestamp = list()
 	var/ruined = FALSE
+	custom_price = PAYCHECK_ASSISTANT
 
 /obj/item/tape/fire_act(exposed_temperature, exposed_volume)
 	ruin()

code/game/objects/items/granters.dm

@@ -535,6 +535,12 @@
 /obj/item/book/granter/crafting_recipe/carnival
 	pages_to_mastery = 1
 	var/carnival_only = TRUE
+
+/obj/item/book/granter/crafting_recipe/carnival/Initialize()
+	. = ..()
+	if(SSmaptype.maptype == "office")
+		carnival_only = FALSE
+
 /obj/item/book/granter/crafting_recipe/carnival/attack_self(mob/user)
 	if (carnival_only && !(user?.mind?.assigned_role == "Carnival" || user?.mind?.assigned_role == "Workshop Attendant")) // check role
 		to_chat(user, span_danger("Wow, This book seems so wacky! None of it makes sense, to you."))

code/game/objects/items/stacks/sheets/silk.dm

@@ -83,7 +83,7 @@
 
 
 /obj/item/stack/sheet/silk
-	name = "silk"
+	var/carnival_only = TRUE
 	var/datum/armor/added_armor = null
 	/*var/rarity = ""
 	var/list/rarities = list(RARITY_SIMPLE = 5,
@@ -97,6 +97,11 @@
 	name = aRarity + " " + name
 	added_armor = added_armor.modifyAllRatings(rarities[aRarity])*/
 
+/obj/item/stack/sheet/silk/Initialize()
+	. = ..()
+	if(SSmaptype.maptype == "office")
+		carnival_only = FALSE
+
 //Indigo Silk
 /obj/item/stack/sheet/silk/indigo_simple
 	name = "Simple Indigo Silk"

code/modules/clothing/suits/armor.dm

@@ -18,13 +18,20 @@
 
 /obj/item/clothing/suit/armor/attackby(obj/item/W, mob/user, params)
 	if(istype(W, /obj/item/stack/sheet/silk))
-		if(user?.mind?.assigned_role == "Carnival" || user?.mind?.assigned_role == "Workshop Attendant")
+		var/obj/item/stack/sheet/silk/S = W
+		if(S.carnival_only)
+			if(user?.mind?.assigned_role == "Carnival" || user?.mind?.assigned_role == "Workshop Attendant")
+				var/datum/component/silkweave/silkweave = GetComponent(/datum/component/silkweave)
+				if(!silkweave)
+					silkweave = AddComponent(/datum/component/silkweave)
+				silkweave.apply_silk(S, user)
+			else
+				to_chat(user, span_danger("You cannot use this silk, as you are not proficent with it."))
+		else
 			var/datum/component/silkweave/silkweave = GetComponent(/datum/component/silkweave)
 			if(!silkweave)
 				silkweave = AddComponent(/datum/component/silkweave)
-			silkweave.apply_silk(W, user)
-		else
-			to_chat(user, span_danger("You cannot use this silk, as you are not proficent with it."))
+			silkweave.apply_silk(S, user)
 	else
 		. = ..()
 

code/modules/photography/photos/album.dm

@@ -116,5 +116,11 @@
 	icon_state = "album_blue"
 	persistence_id = "prison"
 
+/obj/item/storage/photo_album/fixer
+	name = "photo album (Fixer Office)"
+	icon_state = "album_green"
+	persistence_id = "fixer"
+	custom_price = PAYCHECK_ASSISTANT
+
 /obj/item/storage/photo_album/personal
 	icon_state = "album_green"

lobotomy-corp13.dme

@@ -4145,7 +4145,9 @@
 #include "ModularTegustation\tegu_items\associations\items.dm"
 #include "ModularTegustation\tegu_items\associations\machines.dm"
 #include "ModularTegustation\tegu_items\associations\syndicateoffice.dm"
+#include "ModularTegustation\tegu_items\associations\tame_beacon.dm"
 #include "ModularTegustation\tegu_items\associations\vending.dm"
+#include "ModularTegustation\tegu_items\associations\weaving_beacon.dm"
 #include "ModularTegustation\tegu_items\backstreets\templates.dm"
 #include "ModularTegustation\tegu_items\backstreets\random_rooms\bigrooms\bossroom.dm"
 #include "ModularTegustation\tegu_items\backstreets\random_rooms\bigrooms\connector.dm"