какой же у меня большой хуй

baystation12.dme

@@ -285,6 +285,7 @@
 #include "code\bos\modules\materials\recipes_items.dm"
 #include "code\bos\modules\mob\cat.dm"
 #include "code\bos\modules\mob\desert.dm"
+#include "code\bos\modules\mob\tutorial.dm"
 #include "code\bos\modules\mob\language\lordanian.dm"
 #include "code\bos\modules\mob\language\alien\mantid.dm"
 #include "code\bos\modules\mob\language\alien\tajara.dm"
@@ -3443,6 +3444,7 @@
 #include "code\unit_tests\zas_tests.dm"
 #include "code\unit_tests\~helpers.dm"
 #include "customs\code\ambrosia.dm"
+#include "customs\code\bulka.dm"
 #include "customs\code\coiscin.dm"
 #include "customs\code\coppercats.dm"
 #include "customs\code\devilmayrus.dm"

code/bos/datums/contract.dm

@@ -136,7 +136,7 @@ GLOBAL_LIST_EMPTY(all_antag_contracts)
 /datum/antag_contract/item/punisment/can_place()
 	return ..() && target
 
-/datum/antag_contract/item/punisment/check(obj/item/weapon/storage/container)
+/datum/antag_contract/item/punisment/check(obj/item/storage/container)
 	return target in container
 
 
@@ -179,7 +179,7 @@ GLOBAL_LIST_EMPTY(all_antag_contracts)
 /datum/antag_contract/item/steal/can_place()
 	return ..() && target_desc
 
-/datum/antag_contract/item/steal/check(obj/item/weapon/storage/container)
+/datum/antag_contract/item/steal/check(obj/item/storage/container)
 	return locate(target_type) in container
 
 

code/modules/client/client_procs.dm

@@ -381,10 +381,10 @@
 		'html/images/torchlogo.png',
 		'html/images/sfplogo.png',
 		'html/images/sovlogo.png',
-		'customs/img/passport.png',
-		'customs/img/workpass.png',
-		'customs/img/lordaniavisa.png',
-		'customs/xri.png' //bos
+		'customs/img/passport.png', //bos
+		'customs/img/workpass.png', //bos
+		'customs/img/lordaniavisa.png', //bos
+		'customs/img/earth.png' //bos
 		)
 	addtimer(CALLBACK(src, .proc/after_send_resources), 1 SECOND)
 

code/modules/mob/new_player/new_player.dm

@@ -15,7 +15,7 @@
 		"Коробки - самые большие контейнеры в игре. Используйте их для переноса награбленного",
 		"Одеяло можно порезать на тряпки кусачками. Смоченные в топливе тряпки можно засунуть в бутылку.",
 		"У корабля и отделов есть свои банковские счета, доступ к которым можно получить через консоль на мостике. Можете достать оттуда дополнительное финансирование.",
-		"При помощи бак унитаза можно прятать вещи. Используй это, если в дверь ломится налоговая.",
+		"При помощи лома в бак унитаза можно прятать вещи. Используй это, если в дверь ломится налоговая.",
 		"Попробуйте использовать чат, а не левую кнопку мыши для общения с местными.",
 		"Ха! Если Марс падёт, то я откажусь от фамилии Гудман! - Цитата Джона Ракатански",
 		"Потрогайте траву.",

customs/code/bulka.dm

@@ -0,0 +1,17 @@
+/obj/item/document_coiscin/not_coiscin_its_bulka
+	name = "photo"
+	desc = "A photo of the Earth."
+	info = "Nothing is ever really lost to us as long as we remember it. - written on the back"
+	doc_type = "earth"
+	icon = 'customs/icons/obj/custom_items_obj.dmi'
+	icon_state = "bulka_photo"
+	item_state = "bulka_photo"
+
+/obj/item/document_coiscin/not_coiscin_its_bulka/attack_self(mob/user as mob)
+	show(user)
+	user.visible_message(
+		SPAN_ITALIC("[user] looks at the [src]."),
+		SPAN_ITALIC("You look at the [src] and see a picture."),
+		5
+	)
+	to_chat(user, info || SPAN_WARNING("[src] is completely blank!"))

customs/code/eloncake.dm

@@ -32,7 +32,18 @@
 	item_state = "explorer"
 	icon = 'customs/icons/obj/custom_items_obj.dmi'
 	item_icons = list(slot_w_uniform_str = 'customs/icons/mob/custom_items_mob.dmi')
+
+/obj/item/material/hatchet/machete/unbreakable/elloncake
+	name = "NanoTrasen short sword"
+	desc = "Literally an ancient artifact"
+	icon = 'customs/icons/obj/custom_items_obj.dmi'
+	icon_state = "ntsword"
+	item_state = "ntsword"
+	item_icons = list(
+		slot_l_hand_str = 'customs/icons/mob/custom_items_lhand.dmi',
+		slot_r_hand_str = 'customs/icons/mob/custom_items_rhand.dmi')
 */
+
 /obj/item/clothing/mask/gas/elloncake
 	name = "skrellian gas mask"
 	desc = "A face-covering mask that can be connected to an air supply. It was made in the Empire, and looks pretty new."
@@ -44,16 +55,6 @@
 		SPECIES_SKRELL =  'customs/icons/mob/custom_items_mob_xenosheets.dmi')
 	siemens_coefficient = 0.7
 
-/obj/item/material/hatchet/machete/unbreakable/elloncake
-	name = "NanoTrasen short sword"
-	desc = "Literally an ancient artifact"
-	icon = 'customs/icons/obj/custom_items_obj.dmi'
-	icon_state = "ntsword"
-	item_state = "ntsword"
-	item_icons = list(
-		slot_l_hand_str = 'customs/icons/mob/custom_items_lhand.dmi',
-		slot_r_hand_str = 'customs/icons/mob/custom_items_rhand.dmi')
-
 /obj/item/clothing/head/outhood
 	name = "outcast hood"
 	icon_state = "outhood"

customs/config/bulkagoblina/bulka-photo.json

@@ -0,0 +1,5 @@
+{
+	"ckey": "bulkagoblina",
+	"character_name": "Nick Angel",
+	"item_path": "/obj/item/document_coiscin/not_coiscin_its_bulka"
+}

customs/config/elloncake/eloncake-cloak.json

@@ -0,0 +1,5 @@
+{
+	"ckey": "Elloncake",
+	"character_name": "Nevada",
+	"item_path": "/obj/item/clothing/suit/storage/hooded/outcast"
+}

customs/config/elloncake/eloncake-mask.json

@@ -1,5 +1,5 @@
 {
 	"ckey": "Elloncake",
-	"character_name": "Zva'sel Vre'less",
+	"character_name": "Nevada",
 	"item_path": "/obj/item/clothing/mask/gas/elloncake"
 }

customs/config/lodagn/lodagn-sword.json

@@ -1,6 +1,5 @@
 {
 	"ckey": "lodagn",
 	"character_name": "Qixzao Volxuqm",
-	"item_path": "/obj/item/melee/lodagn",
-	"req_access" :      [ "ACCESS_SECURITY" ]
+	"item_path": "/obj/item/melee/lodagn"
 }

maps/away/cadaab/cadaab_castelnau_shuttles.dm

@@ -46,12 +46,14 @@ CASTELNAU_ESCAPE_POD(4)
 	name = "Cheapskate"
 	move_time = 90
 	shuttle_area = list(
+	/area/shuttle/castelnau/cheapskate,
 	/area/shuttle/castelnau/cheapskate/hallway,
 	/area/shuttle/castelnau/cheapskate/cockpit,
 	/area/shuttle/castelnau/cheapskate/conference,
 	/area/shuttle/castelnau/cheapskate/eva,
 	/area/shuttle/castelnau/cheapskate/med,
 	/area/shuttle/castelnau/cheapskate/maint,
+	/area/shuttle/castelnau/cheapskate/maint/ton,
 	/area/shuttle/castelnau/cheapskate/maint/storage,
 	/area/shuttle/castelnau/cheapskate/maint/dock,
 	/area/shuttle/castelnau/cheapskate/maint/airlock,
@@ -62,6 +64,7 @@ CASTELNAU_ESCAPE_POD(4)
 	/area/shuttle/castelnau/cheapskate/cryo,
 	/area/shuttle/castelnau/cheapskate/merch,
 	/area/shuttle/castelnau/cheapskate/cargo,
+	/area/shuttle/castelnau/cheapskate/cargo/of,
 	/area/shuttle/castelnau/cheapskate/cargo/war,
 	/area/shuttle/castelnau/cheapskate/cargo/smoking,
 	/area/shuttle/castelnau/cheapskate/cargo/extwar
@@ -79,7 +82,7 @@ CASTELNAU_ESCAPE_POD(4)
 	name = "Cheapskate Canyon LZ"
 	landmark_tag = "nav_cheapskate_dock"
 	docking_controller = "cheapskate_shuttle_dock"
-	base_area = /area/space
+	base_area = /area/cadaab/caves
 	base_turf = /turf/simulated/floor/exoplanet/cadaab
 
 

maps/away/cadaab/cadaab_setup.dm

@@ -12,6 +12,15 @@
 		"nav_shahtinsk"
 	)
 
+/obj/effect/overmap/visitable/sector/sputnik
+	name = "Sputnik"
+	desc = "A small telecommunications satellite. Too small to be docked or shot down."
+	sector_flags = OVERMAP_SECTOR_KNOWN
+	icon_state = "object"
+	color = "#4287f5"
+	start_x = 3
+	start_y = 3
+
 /obj/effect/overmap/visitable/sector/inax
 	name = "Inax"
 	desc = "Inax is a dark jungle planet, in a place where the Lordanian Sovereign Systems has no serious influence. Thus, it is inhabited by pirates and other undesirables who live in small settlements on nitrogen-rich land."