Merge branch 'master' of https://github.com/BlueMoon-Labs/MOLOT-BlueM…

…oon-Station
Kush1Push1 · Apr 8, 2024 · 392d60a · 392d60a
2 parents c7edbcd + 68f5e12
commit 392d60a
Show file tree

Hide file tree

Showing 4 changed files with 32 additions and 27 deletions.
diff --git a/_maps/map_files/LambdaStation/lambda.dmm b/_maps/map_files/LambdaStation/lambda.dmm
@@ -50309,13 +50309,6 @@
 	},
 /turf/open/floor/plasteel,
 /area/engineering/atmos)
-"ckK" = (
-/obj/structure/window/reinforced/spawner/north,
-/obj/machinery/atmospherics/pipe/manifold/yellow/visible{
-	dir = 8
-	},
-/turf/open/floor/plating/airless,
-/area/engineering/atmos)
 "ckL" = (
 /obj/structure/cable{
 	icon_state = "4-8"
@@ -61783,9 +61776,7 @@
 /area/engineering/storage/tech)
 "cTG" = (
 /obj/structure/window/reinforced/spawner/north,
-/obj/machinery/atmospherics/pipe/simple/yellow/visible{
-	dir = 9
-	},
+/obj/machinery/atmospherics/pipe/layer_manifold,
 /turf/open/floor/plating/airless,
 /area/engineering/atmos)
 "cTH" = (
@@ -69404,6 +69395,13 @@
 	},
 /turf/open/floor/plasteel,
 /area/engineering/break_room)
+"oyA" = (
+/obj/machinery/atmospherics/pipe/simple/yellow/visible{
+	dir = 9
+	},
+/obj/structure/grille,
+/turf/closed/wall/r_wall,
+/area/engineering/atmos)
 "oBc" = (
 /obj/effect/spawner/structure/window/reinforced,
 /obj/machinery/atmospherics/pipe/simple/green/visible,
@@ -72212,6 +72210,13 @@
 /obj/machinery/meter,
 /turf/open/floor/plasteel,
 /area/maintenance/disposal/incinerator)
+"uox" = (
+/obj/machinery/atmospherics/pipe/manifold/yellow/visible{
+	dir = 8
+	},
+/obj/structure/grille,
+/turf/closed/wall/r_wall,
+/area/engineering/atmos)
 "uoQ" = (
 /obj/structure/closet/firecloset,
 /obj/effect/turf_decal/tile/neutral,
@@ -73888,7 +73893,7 @@
 /area/maintenance/aft)
 "xrA" = (
 /obj/structure/window/reinforced/spawner,
-/obj/machinery/atmospherics/pipe/simple/yellow/visible,
+/obj/machinery/atmospherics/pipe/layer_manifold,
 /turf/open/floor/plating/airless,
 /area/engineering/atmos)
 "xtx" = (
@@ -125401,8 +125406,8 @@ chB
 cji
 cjk
 cjZ
-ckK
-cUj
+cmv
+uox
 pbg
 cnf
 cpT
@@ -125659,7 +125664,7 @@ ciq
 eVS
 clt
 cTG
-cTH
+oyA
 cTH
 cTH
 cTH
@@ -126429,8 +126434,8 @@ chB
 cjh
 cjp
 ckc
-ckK
-cUj
+cmv
+uox
 iXq
 eQt
 csx
@@ -126687,7 +126692,7 @@ ciq
 twF
 rxJ
 cTG
-cTH
+oyA
 cTH
 cTH
 cTH

diff --git a/code/game/objects/effects/spawners/lootdrop.dm b/code/game/objects/effects/spawners/lootdrop.dm
@@ -77,21 +77,21 @@
 	lootdoubles = FALSE
 	loot = list(
 				/obj/item/poster/random_contraband = 120,
-				/obj/item/reagent_containers/hypospray/medipen/magillitis = 2,
-				/obj/item/storage/box/syndie_kit/space = 3,
+//				/obj/item/reagent_containers/hypospray/medipen/magillitis = 2, / BLUEMOON REMOVAL - убираем манчерские вещи из техов
+//				/obj/item/storage/box/syndie_kit/space = 3, / BLUEMOON REMOVAL - убираем манчерские вещи из техов
 				/obj/item/storage/toolbox/syndicate = 5,
-				/obj/item/clothing/shoes/chameleon/noslip = 6,
-				/obj/item/grenade/clusterbuster/soap/inteq = 6,
+//				/obj/item/clothing/shoes/chameleon/noslip = 6, / BLUEMOON REMOVAL - убираем манчерские вещи из техов
+//				/obj/item/grenade/clusterbuster/soap/inteq = 6, / BLUEMOON REMOVAL - убираем манчерские вещи из техов
 				/obj/item/soap/syndie = 8,
-				/obj/item/pen/sleepy = 12,
+//				/obj/item/pen/sleepy = 12, / BLUEMOON REMOVAL - убираем манчерские вещи из техов
 				/obj/item/storage/backpack/duffelbag/syndie = 3,
 				/obj/item/storage/box/syndie_kit/chameleon = 4,
 				/obj/item/storage/toolbox/inteq = 1,
 				/obj/item/storage/backpack/duffelbag/syndie/inteq = 1,
-				/obj/item/storage/box/syndie_kit/space/inteq = 1,
+//				/obj/item/storage/box/syndie_kit/space/inteq = 1, / BLUEMOON REMOVAL - убираем манчерские вещи из техов
 				/obj/item/soap/inteq = 4,
 				/obj/item/sign/flag/inteq = 1,
-				/obj/item/storage/fancy/cigarettes/cigpack_inteq = 1,
+//				/obj/item/storage/fancy/cigarettes/cigpack_inteq = 1, / BLUEMOON REMOVAL - убираем манчерские вещи из техов
 				)
 
 /obj/effect/spawner/lootdrop/prison_contraband

diff --git a/code/modules/mob/mob_helpers.dm b/code/modules/mob/mob_helpers.dm
@@ -614,7 +614,7 @@ It's fairly easy to fix if dealing with single letters but not so much with comp
 				H.client.prefs.copy_to(H)
 				H.real_name = H.client.prefs.real_name
 				H.mind.name = H.real_name //Makes sure to change their mind name to their real name.
-				SSquirks.AssignQuirks(H, H.client, TRUE, FALSE, H.job, FALSE)//This Assigns the selected character's quirks
+				SSquirks.AssignQuirks(H, H.client, TRUE, FALSE, SSjob.GetJob(H.job), FALSE)//This Assigns the selected character's quirks
 				SSlanguage.AssignLanguage(H, H.client)
 				H.dna.update_dna_identity() //This makes sure their DNA is updated.
 				var/obj/item/card/id/idCard = H.get_idcard() //Time to change their ID card as well if they have one.

diff --git a/modular_bluemoon/fluffs/code/donator.dm b/modular_bluemoon/fluffs/code/donator.dm
@@ -199,7 +199,7 @@
 	subcategory = LOADOUT_SUBCATEGORIES_DON02
 
 /datum/gear/donator/bm/admcloak
-	name = "syndicate admiral's cloak"
+	name = "Syndicate Admiral's Cloak"
 	slot = ITEM_SLOT_NECK
 	path = /obj/item/clothing/neck/cloak/syndieadm
 	ckeywhitelist = list("architect0r", "fanlexa")
@@ -216,7 +216,7 @@
 	name = "FTU Cape"
 	slot = ITEM_SLOT_NECK
 	path = /obj/item/clothing/neck/cloak/ftu
-	ckeywhitelist = list("fanlexa")
+	ckeywhitelist = list("fanlexa", "kosep")
 	subcategory = LOADOUT_SUBCATEGORIES_DON02
 
 /datum/gear/donator/bm/angelo