ну короче дохуя всего

baystation12.dme

@@ -194,6 +194,7 @@
 #include "code\bos\game\objects\items\weapons\chem_mine.dm"
 #include "code\bos\game\objects\items\weapons\improvised.dm"
 #include "code\bos\game\objects\items\weapons\mine.dm"
+#include "code\bos\game\objects\items\weapons\new_and_cool.dm"
 #include "code\bos\game\objects\items\weapons\implants\implants\emp.dm"
 #include "code\bos\game\objects\items\weapons\implants\implants\fake_death.dm"
 #include "code\bos\game\objects\items\weapons\implants\implants\spying.dm"

code/bos/game/objects/items/weapons/new_and_cool.dm

@@ -0,0 +1,117 @@
+//SWORDS
+////////
+
+
+/// PARRY,ACCURACY > PENETRATION,DAMAGE
+/obj/item/material/sword/bos
+	name = "stab-sword"
+	desc = "Good at parrying and accuracy, worse at cutting and penetration"
+	icon = 'icons/bos/obj/NEW_AND_COOL.dmi'
+	hitsound = list('sound/weapons/bos/hit.ogg', 'sound/weapons/bos/slash.ogg', 'sound/weapons/bos/meatslash.ogg', 'sound/weapons/bos/woosh.ogg')
+	icon_state = "sword"
+	item_state = "sword"
+	slot_flags = SLOT_BELT
+	w_class = ITEM_SIZE_NORMAL
+	force = 15
+	max_force = 10
+	force_multiplier = 0.5
+	armor_penetration = 5
+	base_parry_chance = 45
+	melee_accuracy_bonus = 30
+	applies_material_colour = FALSE
+	item_icons = list(
+		slot_l_hand_str = 'icons/bos/mob/onmob/lefthand.dmi',
+		slot_r_hand_str = 'icons/bos/mob/onmob/righthand.dmi',
+		slot_belt_str = 'icons/mob/onmob/onmob_belt.dmi'
+		)
+
+/obj/item/material/sword/bos/blunted
+	name = "blunted sword"
+	desc = "Good at parrying and accuracy, worse at cutting and penetration. This one is blunted."
+	sharp = FALSE
+	edge = FALSE
+
+
+///DAMAGE,ACCURACY > PENETRATION
+/obj/item/material/sword/bos/bastard
+	name = "bastard sword"
+	desc = "A pretty good sword. Good at cutting, worse at penetration."
+	icon_state = "big_sword"
+	slot_flags = SLOT_BELT
+	w_class = ITEM_SIZE_LARGE
+	force = 25
+	max_force = 20
+	armor_penetration = 5
+	base_parry_chance = 25
+	melee_accuracy_bonus = 2
+
+//DAMAGE, PENETRATION > PARRYING, ACCURACY
+/obj/item/material/sword/bos/zvein
+	name = "zveinhander sword"
+	desc = "Good at penetration, worse at parrying and accuracy."
+	icon_state = "zvein_sword"
+	slot_flags = SLOT_BELT
+	w_class = ITEM_SIZE_LARGE
+	force = 30
+	max_force = 25
+	armor_penetration = 30
+	base_parry_chance = 15
+	melee_accuracy_bonus = -5
+
+
+//KNIVES
+////////
+
+/obj/item/material/knife/bos
+	name = "hunting knife"
+	desc = "Yeah, that's definetly a knife."
+	icon = 'icons/bos/obj/NEW_AND_COOL.dmi'
+	icon_state = "knife"
+	item_state = "knife"
+	hitsound = list('sound/weapons/bos/hit.ogg', 'sound/weapons/bos/slash.ogg', 'sound/weapons/bos/meatslash.ogg', 'sound/weapons/bos/woosh.ogg')
+	applies_material_colour = FALSE
+
+/obj/item/material/knife/bos/military
+	name = "military knife"
+	icon_state = "knife2"
+
+/obj/item/material/knife/bos/bowie
+	name = "bowie knife"
+	icon_state = "knife3"
+
+/obj/item/material/knife/bos/katar
+	name = "katar dagger"
+	desc = "Yeah, that's definetly a dagger."
+	icon_state = "knife4"
+
+/obj/item/material/knife/bos/tanto
+	name = "tanto knife"
+	icon_state = "knife5"
+
+/obj/item/material/knife/bos/specops
+	name = "spec-ops knife"
+	icon_state = "knife6"
+
+/obj/item/material/knife/bos/dagger
+	name = "dagger"
+	desc = "Yeah, that's definetly a dagger."
+	icon_state = "knife8"
+
+/obj/item/material/knife/bos/gator
+	name = "gator machete"
+	desc = "Yeah, that's definetly a machete."
+	icon_state = "knife9"
+
+/obj/item/material/knife/bos/kukri
+	name = "kukri knife"
+	icon_state = "kukri"
+
+/obj/item/material/knife/bos/hook
+	name = "hook"
+	desc = "Yeah, that's definetly a hook."
+	icon_state = "hook"
+
+/obj/item/material/knife/bos/razor
+	name = "razor"
+	desc = "Yeah, that's definetly a razor."
+	icon_state = "razor"

code/bos/game/objects/random/random.dm

@@ -160,6 +160,23 @@
 /mob/living/simple_animal/hostile/retaliate/malf_drone/hive
 	faction = "hivebot"
 
+/obj/random/simple_mob/barbarian
+	name = "random tech-barbarian"
+	desc = "Here is a random ITshnik maker."
+	icon = 'maps/castelnau/techbarb-event/barbs.dmi'
+	icon_state = "barbmelee"
+
+/obj/random/simple_mob/barbarian/spawn_choices()
+	return list(/mob/living/simple_animal/hostile/russian/barbmelee/wild = 10,
+				/mob/living/simple_animal/hostile/sol_military/barbarian/wild = 4,
+				/mob/living/simple_animal/hostile/sol_military/barbarian/shield/wild = 2)
+
+/mob/living/simple_animal/hostile/russian/barbmelee/wild
+	faction = "tech-barbarians"
+
+/mob/living/simple_animal/hostile/sol_military/barbarian/wild
+	faction = "tech-barbarians"
+
 ////
 // No way, turf random generation?7?
 ////

code/game/objects/items.dm

@@ -559,7 +559,7 @@ var/global/list/slot_flags_enumeration = list(
 		if(default_parry_check(user, attacker, damage_source) && prob(parry_chance))
 			user.visible_message("<span class='danger'>\The [user] parries [attack_text] with \the [src]!</span>")
 			admin_attack_log(attacker, user, "Attempted to attack with \a [damage_source] but was parried", "Was targeted with \a [damage_source] but parried the attack", "attmpted to use \a [damage_source] to attack but was parried by")
-			playsound(user.loc, 'sound/weapons/punchmiss.ogg', 50, 1)
+			playsound(user.loc, 'sound/weapons/parry/parry_metalsmall.ogg', 50, 1) //bos
 			on_parry(damage_source)
 			return 1
 	return 0
@@ -582,7 +582,7 @@ var/global/list/slot_flags_enumeration = list(
 	attacker.apply_damage(force, damtype, attacker.hand ? BP_L_HAND : BP_R_HAND, used_weapon = src)
 	attacker.visible_message("<span class='danger'>[attacker] hurts \his hand on [src]!</span>")
 	admin_attack_log(attacker, target, "Attempted to disarm but was blocked", "Was targeted with a disarm but blocked the attack", "attmpted to disarm but was blocked by")
-	playsound(target, 'sound/weapons/thudswoosh.ogg', 50, 1, -1)
+	playsound(target, 'sound/weapons/bos/meatslash.ogg', 50, 1, -1) //bos
 	playsound(target, hitsound, 50, 1, -1)
 	return 1
 

code/modules/client/preference_setup/loadout/lists/misc.dm

@@ -1,3 +1,38 @@
+/datum/gear/melee //bos
+	display_name = "melee selection"
+	description = "A selection of melee weapons"
+	path = /obj/item/material/knife/bos
+	cost = 4
+
+/datum/gear/melee/New()
+	..()
+	var/melee = list()
+	melee["hunting knife"] = /obj/item/material/knife/bos
+	melee["military knife"] = /obj/item/material/knife/bos/military
+	melee["bowie knife"] = /obj/item/material/knife/bos/bowie
+	melee["katar dagger"] = /obj/item/material/knife/bos/katar
+	melee["tanto knife"] = /obj/item/material/knife/bos/tanto
+	melee["spec-ops knife"] = /obj/item/material/knife/bos/specops
+	melee["dagger"] = /obj/item/material/knife/bos/dagger
+	melee["gator machete"] = /obj/item/material/knife/bos/gator
+	melee["kukri knife"] = /obj/item/material/knife/bos/kukri
+	melee["hook"] = /obj/item/material/knife/bos/hook
+	gear_tweaks += new/datum/gear_tweak/path(melee)
+
+/datum/gear/swords //bos
+	display_name = "swords selection"
+	description = "A selection of swords"
+	path = /obj/item/material/sword/bos
+	cost = 8
+
+/datum/gear/swords/New()
+	..()
+	var/swords = list()
+	swords["stab-sword"] = /obj/item/material/sword/bos
+	swords["bastard sword"] = /obj/item/material/sword/bos/bastard
+	swords["zveinhander sword"] = /obj/item/material/sword/bos/zvein
+	gear_tweaks += new/datum/gear_tweak/path(swords)
+
 /datum/gear/cane
 	display_name = "cane"
 	path = /obj/item/cane

maps/away/ascent/ascent-2.dmm

@@ -1166,8 +1166,8 @@
 /area/ship/ascent/hydroponics_port)
 "cE" = (
 /obj/machinery/smartfridge/foods{
-	dir = 4;
-	color = "PURPLE"
+	color = "PURPLE";
+	dir = 4
 	},
 /turf/simulated/floor/tiled/ascent,
 /area/ship/ascent/fore_port_prow)
@@ -3364,9 +3364,9 @@
 	dir = 4
 	},
 /mob/living/bot/farmbot/premade{
-	req_access = list(list("ACCESS_ASCENT"));
+	color = "#800080";
 	desc = "The tiro's best friend.";
-	color = "#800080"
+	req_access = list(list("ACCESS_ASCENT"))
 	},
 /turf/simulated/floor/ascent,
 /area/ship/ascent/hydroponics_port)
@@ -4472,10 +4472,10 @@
 /area/ship/ascent/fore_starboard_jut)
 "wq" = (
 /mob/living/bot/farmbot/premade{
-	req_access = list(list("ACCESS_ASCENT"));
-	desc = "The tiro's best friend.";
 	color = "PURPLE";
-	name = "Old Wizard"
+	desc = "The tiro's best friend.";
+	name = "Old Wizard";
+	req_access = list(list("ACCESS_ASCENT"))
 	},
 /turf/simulated/floor/tiled/ascent,
 /area/ship/ascent/hydroponics_port)
@@ -4638,8 +4638,8 @@
 /area/ship/ascent/shuttle_port)
 "Ab" = (
 /obj/machinery/reagentgrinder/juicer{
-	pixel_z = 8;
-	color = "PURPLE"
+	color = "PURPLE";
+	pixel_z = 8
 	},
 /obj/structure/table/steel_reinforced,
 /obj/item/reagent_containers/glass/beaker{
@@ -4868,9 +4868,9 @@
 "Mv" = (
 /obj/structure/table/steel_reinforced,
 /obj/machinery/microwave{
+	color = "PURPLE";
 	pixel_x = 0;
-	pixel_y = 6;
-	color = "PURPLE"
+	pixel_y = 6
 	},
 /turf/simulated/floor/tiled/ascent,
 /area/ship/ascent/fore_port_prow)
@@ -5131,16 +5131,16 @@
 "Tf" = (
 /obj/structure/table/steel_reinforced,
 /obj/item/reagent_containers/food/condiment/small/peppermill{
+	color = "#800080";
 	pixel_w = 5;
 	pixel_x = 3;
-	pixel_z = 11;
-	color = "#800080"
+	pixel_z = 11
 	},
 /obj/item/reagent_containers/food/condiment/small/saltshaker{
+	color = "#800080";
 	pixel_w = 11;
 	pixel_x = -3;
-	pixel_y = 0;
-	color = "#800080"
+	pixel_y = 0
 	},
 /turf/simulated/floor/tiled/ascent,
 /area/ship/ascent/fore_port_prow)

maps/away/cadaab/cadaab_areas.dm

@@ -21,9 +21,15 @@
 	forced_ambience = list('sound/effects/wind/desert0.ogg','sound/effects/wind/desert1.ogg','sound/effects/wind/desert2.ogg','sound/effects/wind/desert3.ogg','sound/effects/wind/desert4.ogg','sound/effects/wind/desert5.ogg', 'sound/ambience/bos/desert_music1.ogg', 'sound/ambience/bos/desert_music2.ogg')
 	outside = TRUE
 
-/area/cadaab/ladder // shitcoded hell. use if base_turf is broken and you have no idea why
+/area/cadaab/ladder // shitcoded hell. use if base_turf is broken and you have no idea why 				UPD: found the reason, I'll delete this later
 	base_turf = /turf/space
 
+/area/cadaab/ladder/roof
+	name = "Shahtinsk - Rooftops"
+	icon_state = "desert"
+	forced_ambience = list('sound/effects/wind/desert0.ogg','sound/effects/wind/desert1.ogg','sound/effects/wind/desert2.ogg','sound/effects/wind/desert3.ogg','sound/effects/wind/desert4.ogg','sound/effects/wind/desert5.ogg')
+	outside = TRUE
+
 /area/cadaab/outpost/syndivault
 	name = "Syndipass Vault"
 	icon_state = "syndipass"
@@ -55,6 +61,7 @@
 
 /area/cadaab/outpost
 	name = "Regulators Outpost"
+	base_turf = /turf/space
 
 /area/cadaab/outpost/teleport
 	name = "Outpost - Teleport"
@@ -152,6 +159,7 @@
 /area/cadaab/shahtinsk
 	name = "Cadaab - Shahtinsk - Near Outpost"
 	icon_state = "desert"
+	base_turf = /turf/space
 
 /area/cadaab/shahtinsk/second
 	name = "Cadaab - Shahtinsk - Near Tribe"
@@ -179,6 +187,7 @@
 	name = "Police"
 	icon_state = "command"
 	req_access = list(access_cadaab_prison)
+	base_turf = /turf/space
 
 /area/cadaab/sputnik
 	name = "Sputnik - Telecommunications"

maps/away/cadaab/cadaab_objects.dm

@@ -201,6 +201,13 @@
 	name = "CYBER KILLER RETRO advertising panel"
 	icon_state = "retro"
 
+/obj/effect/decal/weeks
+	name = "status display"
+	desc = "It says, 'Decontamination in two weeks.'"
+	icon = 'maps/away/cadaab/icons/objects.dmi'
+	icon_state = "2weeks"
+	anchored = 1
+
 /obj/effect/floor_decal/holecadaab
 	name = "hole"
 	icon = 'maps/away/cadaab/icons/turfs.dmi'

maps/away/cadaab/cadaab_text.dm

@@ -45,13 +45,13 @@
 
 /obj/item/paper/cadaab/safety
 	name = "Safety"
-	icon = 'maps/away/cadaab/icons/objects.dmi'
+//	icon = 'maps/away/cadaab/icons/objects.dmi'
 	icon_state = "paper_blu"
 	info = {"
 Взываю ко всем благоразумным людям, коих осталось немного. На юге подземных пещер находится последнее прибежище адекватных людей. У нас есть вода и еда. Эти варвары туда не пробьются, а для доказательства своего благоразумия вам потребуется ответить на пару вопросов. Вы сможете определить это место по трём картонным коробкам у входа."}
 
 /obj/item/paper/cadaab/flowers
 	name = "FLOWERS"
-	icon = 'maps/away/cadaab/icons/objects.dmi'
+//	icon = 'maps/away/cadaab/icons/objects.dmi'
 	icon_state = "paper_sand"
 	info = {"<B>ПРИВЕТ.</B> МЫ МОГазиН ЦВЕТОВ, МЫ НА ЗАПАДЕ В ПЕЩЕХАВРАХ ПЕЩЕРАХ СНИЗУ, МЫ ПРОДАЕ  М ЦВЕТЫ. ЗАХОДИТЕ И ПОКУПАЙТЕ ЦВЕТЫ. МЫ ЛЮБИМ РАСТИТЕЛЬНОАВЫФАСТЬ И МЯСО."}