Merge branch 'Bubberstation:master' into master

SPLURT-Station · Jul 11, 2024 · d576e76 · d576e76
2 parents ad0362d + 891671d
commit d576e76
Show file tree

Hide file tree

Showing 13 changed files with 379 additions and 63 deletions.
diff --git a/_maps/map_files/moonstation/moonstation.dmm b/_maps/map_files/moonstation/moonstation.dmm
diff --git a/_maps/moonstation.json b/_maps/moonstation.json
@@ -36,7 +36,7 @@
 			"Mining": true,
 			"Linkage": null,
 			"Gravity": true,
-			"Baseturf": "/turf/open/chasm/moonstation",
+			"Baseturf": "/turf/open/openspace/moonstation",
 			"No Parallax": true,
 			"Weather_Sandstorm": true
 		}

diff --git a/html/changelogs/AutoChangeLog-pr-1730.yml b/html/changelogs/AutoChangeLog-pr-1730.yml
@@ -0,0 +1,4 @@
+author: "theselfish"
+delete-after: True
+changes:
+  - rscadd: "Non-locked Donator have been added to vendors. Collect them all!"
diff --git a/html/changelogs/AutoChangeLog-pr-1763.yml b/html/changelogs/AutoChangeLog-pr-1763.yml
@@ -0,0 +1,4 @@
+author: "BurgerBB"
+delete-after: True
+changes:
+  - bugfix: "Fixes moonstation having space turfs on turf destruction on the upper level. Fixes weirdly placed camera monitors due to upstream changes. Fixes a few randomly placed doors in some areas."
diff --git a/modular_skyrat/master_files/code/modules/loadout/categories/donator_personal.dm b/modular_skyrat/master_files/code/modules/loadout/categories/donator_personal.dm
@@ -1,7 +1,7 @@
 /datum/loadout_item/toys/miafoxplush
 	name = "silver fox plushie" //bubber edit on request
 	item_path = /obj/item/toy/plush/skyrat/fox/mia
-//ckeywhitelist = list("fuzlet")
+	//ckeywhitelist = list("fuzlet")
 
 /datum/loadout_item/toys/teasefoxplush
 	name = "Teasable fox plushie"

diff --git a/modular_zubbers/code/game/machinery/vending/multisec.dm b/modular_zubbers/code/game/machinery/vending/multisec.dm
@@ -65,6 +65,7 @@
 					/obj/item/clothing/suit/armor/vest/secjacket = 6,
 					/obj/item/clothing/suit/armor/vest/peacekeeper/armadyne = 6,
 					/obj/item/clothing/suit/armor/vest/peacekeeper/armadyne/armor = 6,
+					/obj/item/clothing/suit/armor/vest/caligram_parka_vest_tan = 6,
 				),
 			),
 		list(

diff --git a/modular_zubbers/code/modules/vending/clothmate.dm b/modular_zubbers/code/modules/vending/clothmate.dm
@@ -0,0 +1,100 @@
+/obj/machinery/vending/clothing
+	zubbers_product_categories = list(
+		list(
+			"name" = "Head",
+			"icon" = "hat-cowboy",
+			"products" = list(
+				/obj/item/clothing/head/avipilot = 5,
+				/obj/item/clothing/head/costume/ushanka/frosty = 5,
+
+			),
+		),
+
+		list(
+			"name" = "Accessories",
+			"icon" = "glasses",
+			"products" = list(
+				/obj/item/clothing/glasses/welding/steampunk_goggles = 5,
+				/obj/item/clothing/glasses/rosecolored = 5,
+				/obj/item/clothing/glasses/eyepatch/rosecolored = 5,
+				/obj/item/clothing/mask/gas/nightlight = 5,
+				/obj/item/clothing/mask/gas/nightlight/fir22 = 5,
+				/obj/item/clothing/gloves/fingerless/blutigen_wraps = 5,
+				/obj/item/clothing/neck/cloak/inferno = 5,
+				/obj/item/clothing/accessory/medal/steele = 5,
+				/obj/item/clothing/neck/cross = 5,
+				/obj/item/clothing/neck/cloak/fluffycloak = 5,
+				/obj/item/clothing/neck/fishpendant = 5,
+				/obj/item/clothing/accessory/badge/holo/jade = 5,
+				/obj/item/clothing/gloves/elofy = 5,
+				/obj/item/clothing/glasses/gold_aviators = 5,
+				/obj/item/clothing/gloves/skyy = 5,
+			),
+		),
+
+		list(
+			"name" = "Under",
+			"icon" = "shirt",
+			"products" = list(
+				/obj/item/clothing/under/syndicate/tacticool/black = 5,
+				/obj/item/clothing/under/custom/blutigen_undergarment = 5,
+				/obj/item/clothing/under/custom/lannese = 5,
+				/obj/item/clothing/under/custom/lannese/vambrace = 5,
+				/obj/item/clothing/under/tactichill = 5,
+				/obj/item/clothing/under/caged_dress/skirt = 5,
+				/obj/item/clothing/under/costume/skyrat/kimono/sigmar = 5,
+				/obj/item/clothing/under/pants/skyy = 5,
+			),
+		),
+
+		list(
+			"name" = "Suits & Skirts",
+			"icon" = "vest",
+			"products" = list(
+				/obj/item/clothing/suit/furcoat = 5,
+				/obj/item/clothing/suit/jacket/cherno = 5,
+				/obj/item/clothing/suit/jacket/hydrogenrobes = 5,
+				/obj/item/clothing/suit/blutigen_kimono = 5,
+				/obj/item/clothing/suit/jacket/delta = 5,
+				/obj/item/clothing/suit/toggle/labcoat/skyrat/tenrai = 5,
+				/obj/item/clothing/suit/short_coat = 5,
+				/obj/item/clothing/suit/hooded/sigmarcoat = 5,
+				/obj/item/clothing/suit/jacket/skyy = 5,
+			),
+		),
+
+		list(
+			"name" = "Shoes",
+			"icon" = "socks",
+			"products" = list(
+				/obj/item/clothing/shoes/jackboots/netra = 5,
+				/obj/item/clothing/shoes/fancy_heels/drag = 5,
+				/obj/item/clothing/shoes/jackboots/elofy = 5,
+			),
+		),
+
+		//Only put clothing in Special thats either Families or exteremly out-of-place
+		list(
+			"name" = "Special",
+			"icon" = "star",
+			"products" = list(
+				/obj/item/clothing/mask/animal/wolf = 5,
+				/obj/item/clothing/head/drake_skull = 5,
+			)
+		)
+	)
+
+	zubbers_premium = list( //being here means you're artificially rare, congratulations
+		/obj/item/clothing/head/razurathhat = 2,
+		/obj/item/clothing/suit/razurathcoat = 2,
+		/obj/item/clothing/suit/hooded/colorblockhoodie = 2,
+		/obj/item/clothing/shoes/jackboots/noble = 2,
+	)
+
+	zubbers_contraband = list(
+		/obj/item/clothing/suit/jacket/ryddid = 3,
+		/obj/item/clothing/neck/cloak/grunnyyy = 3,
+		/obj/item/clothing/gloves/ring/hypno/coffeepot = 2,
+		/obj/item/clothing/mask/hheart = 2,
+		/obj/item/clothing/suit/toggle/digicoat/glitched = 2,
+	)
diff --git a/modular_zubbers/code/modules/vending/comdrobe.dm b/modular_zubbers/code/modules/vending/comdrobe.dm
@@ -3,18 +3,35 @@
 	access_lists["[ACCESS_CAPTAIN]"] += list(
 		/obj/item/clothing/head/hats/warden/drill/captain = 1,
 		/obj/item/clothing/head/hats/warden/drill/blueshield = 1,
+		/obj/item/clothing/under/rank/captain/dress = 1,
+		/obj/item/clothing/under/rank/blueshield/netra = 1,
+		/obj/item/clothing/gloves/netra = 1, //These are meant to go with the dress above it.
+		/obj/item/clothing/under/bimpcap = 1,
 	)
 
 	access_lists["[ACCESS_HOS]"] += list(
 		/obj/item/clothing/head/hats/warden/drill/hos = 1,
+		/obj/item/clothing/under/rank/security/head_of_security/alt/roselia = 1,
+		/obj/item/clothing/glasses/hud/security/sunglasses/gars/giga/roselia = 1,
+		/obj/item/clothing/head/hats/hos/elofy = 1,
+		/obj/item/clothing/suit/armor/hos/elofy = 1,
+		/obj/item/clothing/gloves/elofy = 1, //Part of a set so...
+		/obj/item/clothing/shoes/jackboots/elofy = 1,
 	)
 
 	access_lists["[ACCESS_CENT_GENERAL]"] += list(
 		/obj/item/clothing/head/hats/warden/drill/nanotrasen = 1,
 		/obj/item/clothing/under/rank/nanotrasen_consultant/stripper = 1,
+		/obj/item/clothing/under/nt_idol_skirt = 1,
+		/obj/item/clothing/head/nanotrasen_consultant/hubert = 1,
+		/obj/item/clothing/suit/armor/vest/nanotrasen_consultant/hubert = 1,
+		/obj/item/clothing/under/rank/nanotrasen_consultant/hubert = 1,
+		/obj/item/clothing/head/razurathhat = 1,
+		/obj/item/clothing/suit/razurathcoat = 1,
 	)
 
 	access_lists["[ACCESS_COMMAND]"] += list(
 		/obj/item/clothing/under/rank/civilian/head_of_personnel/stripper = 5, //Multiple for heads. Urgh.
+		/obj/item/clothing/suit/armor/skyy = 2,
 	)
 
diff --git a/modular_zubbers/code/modules/vending/games.dm b/modular_zubbers/code/modules/vending/games.dm
@@ -0,0 +1,117 @@
+/obj/machinery/vending/games
+	zubbers_product_categories = list(
+		list(
+			"name" = "Toys",
+			"icon" = "hat-wizard",
+			"products" = list(
+				/obj/item/toy/plush/skyrat/fox/mia = 3,
+				/obj/item/toy/plush/skyrat/fox/kailyn = 3,
+				/obj/item/toy/plush/skyrat/voodoo = 5,
+				/obj/item/toy/plush/skyrat/immovable_rod = 3,
+				/obj/item/toy/plush/skyrat/tesh = 3,
+				/obj/item/toy/plush/skyrat/roselia = 3,
+				/obj/item/toy/plush/skyrat/chunko/plushie_winrow = 3,
+				/obj/item/toy/plush/skyrat/chunko/bonnie = 3,
+				/obj/item/toy/plush/skyrat/chunko/andrew = 3,
+				/obj/item/toy/plush/skyrat/chunko/inessa = 3,
+				/obj/item/toy/plush/skyrat/plushie_star = 3,
+				/obj/item/toy/plush/skyrat/plushie_chiara = 3,
+				/obj/item/toy/plush/skyrat/plushie_dan = 3,
+				/obj/item/toy/plush/skyrat/fox/plushie_jeanne = 3,
+				/obj/item/toy/plush/skyrat/plushie_azyre = 3,
+				/obj/item/toy/plush/skyrat/plushie_razurath = 3,
+				/obj/item/toy/plush/skyrat/plushie_razurath/second = 3,
+				/obj/item/toy/plush/skyrat/plushie_elofy = 3,
+				/obj/item/toy/plush/skyrat/plushie_syntax1112 = 3,
+				/obj/item/toy/plush/moth/lovers = 3,
+				/obj/item/toy/plush/chirp_plush = 3,
+				/obj/item/toy/plush/bigdeer = 3,
+				/obj/item/toy/plush/bubbledragon = 3,
+				/obj/item/toy/plush/headcrab = 3,
+				/obj/item/toy/plush/bellybird = 3,
+				/obj/item/toy/plush/tiredtesh = 3,
+				/obj/item/toy/plush/xenoplush = 3,
+				/obj/item/toy/plush/xenoplush/xenomaidplush = 3,
+				/obj/item/toy/plush/tunafish = 3,
+				/obj/item/toy/plush/purplecat = 3,
+				/obj/item/toy/plush/secoff = 3,
+				/obj/item/toy/plush/slimeplushie = 3,
+				/obj/item/toy/plush/lizard_plushie = 3,
+				/obj/item/toy/plush/lizard_plushie/space = 3,
+				/obj/item/toy/plush/lizard_plushie/green = 3,
+				/obj/item/toy/plush/lizard_plushie/space/green = 3,
+				/obj/item/toy/plush/snakeplushie = 3,
+				/obj/item/toy/plush/plasmamanplushie = 3,
+				/obj/item/toy/plush/beeplushie = 3,
+				/obj/item/toy/plush/moth = 3,
+				/obj/item/toy/plush/pkplush = 3,
+				/obj/item/toy/plush/carpplushie = 3,
+				/obj/item/toy/plush/goatplushie = 3,
+				/obj/item/toy/plush/rouny = 3,
+				/obj/item/toy/plush/abductor = 3,
+				/obj/item/toy/plush/abductor/agent = 3,
+				/obj/item/toy/plush/shark = 3,
+				/obj/item/toy/plush/bubbleplush = 3,
+				/obj/item/toy/plush/nukeplushie = 3,
+				/obj/item/toy/plush/plasmamanplushie = 3,
+				/obj/item/toy/plush/skyrat/borbplushie = 3,
+				/obj/item/toy/plush/skyrat/deer = 3,
+				/obj/item/toy/plush/skyrat/leaplush = 3,
+				/obj/item/toy/plush/skyrat/fermis = 3,
+				/obj/item/toy/plush/skyrat/fermis/chen = 3,
+				/obj/item/toy/plush/skyrat/fox = 3,
+				/obj/item/toy/plush/skyrat/duffmoth = 3,
+				/obj/item/toy/plush/skyrat/sarmieplush = 3,
+				/obj/item/toy/plush/skyrat/sharknet = 3,
+				/obj/item/toy/plush/skyrat/pintaplush = 3,
+				/obj/item/toy/plush/skyrat/szaplush = 3,
+				/obj/item/toy/plush/skyrat/riffplush = 3,
+				/obj/item/toy/plush/skyrat/ian = 3,
+				/obj/item/toy/plush/skyrat/ian/lisa = 3,
+				/obj/item/toy/plush/skyrat/ian/small = 3,
+				/obj/item/toy/plush/skyrat/cat = 3,
+				/obj/item/toy/plush/skyrat/cat/tux = 3,
+				/obj/item/toy/plush/skyrat/cat/white = 3,
+				/obj/item/toy/plush/skyrat/seaduplush = 3,
+				/obj/item/toy/plush/skyrat/mechanic_fox = 3,
+				/obj/item/toy/plush/skyrat/commanding_teshari = 3,
+				/obj/item/toy/plush/skyrat/snow_owl = 3,
+				/obj/item/toy/plush/skyrat/breakdancing_bird = 3,
+				/obj/item/toy/plush/skyrat/skreking_vox = 3,
+				/obj/item/toy/plush/skyrat/blue_dog = 3,
+				/obj/item/toy/plush/skyrat/engi_snek = 3,
+				/obj/item/toy/plush/skyrat/glitch_synth = 3,
+				/obj/item/toy/plush/skyrat/boom_bird = 3,
+				/obj/item/toy/plush/skyrat/blue_cat = 3,
+				/obj/item/toy/plush/skyrat/igneous_synth = 3,
+				/obj/item/toy/plush/skyrat/edgy_bird = 3,
+				/obj/item/toy/plush/skyrat/xixi = 3,
+				/obj/item/toy/plush/skyrat/rubi = 3,
+				/obj/item/toy/plush/skyrat/derg_plushie = 3,
+				/obj/item/toy/plush/skyrat/tracy = 3,
+				/obj/item/toy/plush/skyrat/plushie_synthia = 3,
+				/obj/item/toy/plush/skyrat/jecca = 3,
+				/obj/item/toy/plush/skyrat/courier_synth = 3,
+			),
+		),
+
+		list(
+			"name" = "Other",
+			"icon" = "star",
+			"products" = list(
+				/obj/item/canvas/drawingtablet = 3,
+				/obj/item/toy/darksabre = 3,
+				/obj/item/storage/belt/sabre/darksabre = 3,
+				/obj/item/holocigarette/cigar = 6,
+				/obj/item/card/fuzzy_license = 3,
+				/obj/item/poster/korpstech = 3,
+				/obj/item/coin/donator/marsoc = 3,
+				/obj/item/donator/transponder = 3,
+				/obj/item/hairbrush/switchblade = 3,
+				/obj/item/holosign_creator/hardlight_wheelchair = 3,
+				/obj/item/instrument/piano_synth/headphones/catear_headphone = 3,
+				/obj/item/clothing/accessory/pocketwatch = 3,
+			),
+		)
+	)
+
diff --git a/modular_zubbers/code/modules/vending/lustwish.dm b/modular_zubbers/code/modules/vending/lustwish.dm
@@ -4,11 +4,18 @@
 			"name" = "Restraints",
 			"icon" = FA_ICON_HANDCUFFS,
 			"products" = list(
-				/obj/item/clothing/neck/human_petcollar/locked/ringbell = 8
+				/obj/item/clothing/neck/human_petcollar/locked/ringbell = 8,
+				/obj/item/clothing/neck/inferno_collar = 8,
+				/obj/item/clothing/neck/flower_collar = 8,
 			)
 		)
 	)
 
 	zubbers_premium = list(
 	/obj/item/holosign_creator/sex = 6,
+	/obj/item/clothing/under/mikubikini = 3,
+	/obj/item/clothing/suit/mikujacket = 3,
+	/obj/item/clothing/head/mikuhair = 3,
+	/obj/item/clothing/gloves/mikugloves = 3,
+	/obj/item/clothing/shoes/sneakers/mikuleggings = 3,
 	)
diff --git a/modular_zubbers/code/modules/vending/wardrobe.dm b/modular_zubbers/code/modules/vending/wardrobe.dm
@@ -13,18 +13,72 @@
 				/obj/item/clothing/head/costume/bubber/jester = 3,
 				/obj/item/clothing/under/rank/civilian/bubber/clown/jester = 3,
 				/obj/item/clothing/shoes/clown_shoes/bubber/jester = 3,
+				/obj/item/clothing/mask/gas/britches = 3,
+				/obj/item/clothing/under/rank/civilian/clown/britches = 3,
+				/obj/item/clothing/shoes/clown_shoes/britches = 3,
+				/obj/item/clothing/under/bubbly_clown/skirt = 3,
+				/obj/item/clothing/mask/luchador/enzo = 3,
 				/obj/item/clothing/glasses/surgerygoggles = 3,
 				/obj/item/clothing/gloves/longrubbergloves = 3,
 				/obj/item/clothing/suit/leatherapron = 3,
+				/obj/item/clothing/head/avipilot = 3,
+				/obj/item/clothing/mask/animal/wolf = 3,
+				/obj/item/clothing/head/drake_skull = 3,
+				/obj/item/clothing/suit/toggle/rainbowcoat = 3,
+				/obj/item/clothing/head/recruiter_cap = 3,
+				/obj/item/clothing/suit/toggle/recruiter_jacket = 3,
+				/obj/item/clothing/under/recruiter_uniform = 3,
+				/obj/item/clothing/head/costume/strigihat = 3,
+				/obj/item/clothing/head/anubite = 3,
+				/obj/item/clothing/under/costume/dragon_maid = 3,
 			),
 		),
 	)
 
+	zubbers_contraband = list(
+		/obj/item/clothing/suit/armor/vest/darkcarapace = 3,
+		/obj/item/clothing/suit/hooded/cloak/zuliecloak = 3,
+		/obj/item/clothing/suit/scraparmour = 3,
+		/obj/item/clothing/mask/breath/vox/octus = 3,
+		/obj/item/clothing/suit/jacket/gorlex_harness = 3,
+		/obj/item/clothing/under/syndicate/skyrat/enclave = 3,
+		/obj/item/clothing/under/syndicate/skyrat/enclave/officer = 3,
+		/obj/item/clothing/under/rank/security/detective/cowboy/armorless = 3,
+	)
 
 /obj/machinery/vending/wardrobe/medi_wardrobe
 	zubbers_products = list(
-
 	/obj/item/clothing/glasses/hud/health/surgerygoggles = 3,
 	/obj/item/clothing/gloves/latex/nitrile/longrubbergloves = 3,
 	/obj/item/clothing/suit/leatherapron = 3,
 	)
+
+/obj/machinery/vending/wardrobe/robo_wardrobe
+	zubbers_products = list(
+	/obj/item/clothing/glasses/welding/steampunk_goggles = 2,
+	)
+
+/obj/machinery/vending/wardrobe/cargo_wardrobe
+	zubbers_products = list(
+		/obj/item/clothing/head/caligram_cap_tan = 3,
+		/obj/item/clothing/under/jumpsuit/caligram_fatigues_tan = 3,
+		/obj/item/clothing/suit/jacket/caligram_parka_tan = 3,
+	)
+
+/obj/machinery/vending/wardrobe/chap_wardrobe
+	zubbers_products = list(
+		/obj/item/clothing/suit/jacket/brasspriest = 1,
+		/obj/item/clothing/neck/cross = 5,
+		/obj/item/clothing/head/anubite = 1,
+	)
+
+/obj/machinery/vending/wardrobe/curator_wardrobe
+	zubbers_products = list(
+		/obj/item/clothing/under/occult = 2,
+		/obj/item/storage/belt/fannypack/occult = 2,
+	)
+
+/obj/machinery/vending/wardrobe/jani_wardrobe
+	zubbers_products = list(
+		/obj/item/clothing/under/costume/dragon_maid = 3,
+	)
diff --git a/tgstation.dme b/tgstation.dme
@@ -9034,7 +9034,9 @@
 #include "modular_zubbers\code\modules\uplink\uplink_items\dangerous.dm"
 #include "modular_zubbers\code\modules\uplink\uplink_items\device_tools.dm"
 #include "modular_zubbers\code\modules\uplink\uplink_items\job.dm"
+#include "modular_zubbers\code\modules\vending\clothmate.dm"
 #include "modular_zubbers\code\modules\vending\comdrobe.dm"
+#include "modular_zubbers\code\modules\vending\games.dm"
 #include "modular_zubbers\code\modules\vending\halloween_chocolate.dm"
 #include "modular_zubbers\code\modules\vending\lustwish.dm"
 #include "modular_zubbers\code\modules\vending\megaseed.dm"