Merge pull request #203 from Kolergo/dev

Последний пулл реквест БоСа(я надеюсь)

baystation12.dme

@@ -281,6 +281,7 @@
 #include "code\bos\modules\food\recipes_microwave.dm"
 #include "code\bos\modules\guns\crafting_zipgun.dm"
 #include "code\bos\modules\guns\disprcd.dm"
+#include "code\bos\modules\guns\ks_23m.dm"
 #include "code\bos\modules\guns\mantid.dm"
 #include "code\bos\modules\guns\revolver.dm"
 #include "code\bos\modules\guns\zipgun.dm"
@@ -355,6 +356,8 @@
 #include "code\bos\modules\overmap\ships\engines\engine.dm"
 #include "code\bos\modules\overmap\ships\engines\gas_thruster.dm"
 #include "code\bos\modules\overmap\ships\engines\ion_thruster.dm"
+#include "code\bos\modules\projectiles\ammunition\bullets.dm"
+#include "code\bos\modules\projectiles\projectile\bullets.dm"
 #include "code\bos\modules\projectiles\projectile\special.dm"
 #include "code\bos\modules\reagents\Chemistry-Reagents-Recipes.dm"
 #include "code\bos\modules\reagents\kvasok.dm"

code/bos/modules/guns/ks_23m.dm

@@ -0,0 +1,16 @@
+/obj/item/gun/projectile/shotgun/pump/mirania
+	name = "KS-23M Racist"
+	desc = "Originaly, modification of old Hephaestus KS-23, made in Mirania."
+	icon = 'icons/bos/obj/guns/ks_23m.dmi'
+	icon_state = "KS-23M"
+	item_state = "cshotgun"
+	wielded_item_state = "cshotgun-wielded"
+	origin_tech = list(TECH_COMBAT = 5, TECH_MATERIAL = 3)
+	max_shells = 3
+	ammo_type = /obj/item/ammo_casing/shotgun/pellet/giant
+	one_hand_penalty = 9
+	bulk = 8
+	screen_shake = 6
+
+/obj/item/gun/projectile/shotgun/pump/mirania/update_icon()
+	return

code/bos/modules/overmap/disperser/disperser_charge.dm

@@ -85,6 +85,9 @@
 	chargetype = OVERMAP_WEAKNESS_EXPLOSIVE
 	chargedesc = "KOSMAG"
 
+/obj/structure/ship_munition/disperser_charge/s2s/fire(turf/target, strength, range)
+	explosion(target, strength * range / 1)
+
 /obj/structure/closet/odst
 	name = "OFD droppod"
 	desc = "A crude droppod allowing the OFD to safely fire itself, with a living creature at a target. Oxygen not included. Designed to fit a single rifleman, but may be used to drop two soldiers in a pinch."
@@ -93,9 +96,6 @@
 	storage_capacity = (MOB_MEDIUM * 2)
 	var/chargedesc = "ODST"
 
-/obj/structure/ship_munition/disperser_charge/s2s/fire(turf/target, strength, range)
-	explosion(target, 0, strength * range / 1, 2)
-
 /obj/structure/ship_munition/disperser_charge/vox
 	name = "Vox charge"
 	color = "#a33fbf"

code/bos/modules/overmap/disperser/disperser_fire.dm

@@ -130,6 +130,16 @@
 			targetturf.ex_act(1)
 		for(var/atom/A in targetturf)
 			A.ex_act(3)
+		//BoS start. Add some effects, make hole in roof if droppod fall in house
+		var/turf/above_turf = GetAbove(targetturf)
+		while(above_turf)
+			explosion(above_turf, 1, 1, 2)
+			above_turf = GetAbove(above_turf)
+		explosion(targetturf, 0, 0, 3)
+		var/datum/effect/effect/system/smoke_spread/smoke = new /datum/effect/effect/system/smoke_spread()
+		smoke.set_up(7, 0, targetturf)
+		smoke.start()
+		//BoS end
 		charge.forceMove(targetturf)
 		//The disperser is infact a taxi
 		for(var/mob/living/L in charge)
@@ -157,4 +167,4 @@
 		if(WEST)
 			return locate(1,start.y,start.z)
 		if(EAST)
-			return locate(world.maxx,start.y,start.z)
+			return locate(world.maxx,start.y,start.z)

code/bos/modules/projectiles/ammunition/bullets.dm

@@ -0,0 +1,7 @@
+/obj/item/ammo_casing/shotgun/pellet/giant
+	name = "giant shotgun shell"
+	desc = "A giant shotshell."
+	icon_state = "gshell"
+	spent_icon = "gshell-spent"
+	projectile_type = /obj/item/projectile/bullet/pellet/shotgun/giant
+	matter = list(MATERIAL_STEEL = 450)

code/bos/modules/projectiles/projectile/bullets.dm

@@ -0,0 +1,6 @@
+/obj/item/projectile/bullet/pellet/shotgun/giant
+	icon_state = "pellet"
+	damage = 40
+	pellets = 14
+	range_step = 1
+	spread_step = 80

code/game/antagonist/station/mini_roles.dm

@@ -261,8 +261,8 @@ GLOBAL_DATUM_INIT(mini_role, /datum/antagonist/mini_roles, new)
 
 /datum/mini_role/creditor/special_act(var/mob/living/carbon/human/target)
 	var/debt
-	debt = mini_target.assigned_job.economic_power * 1000 - rand(-40,1) * 100
-	if(debt << 0) debt += 4000
+	debt = mini_target.assigned_job.economic_power * 500 + rand(-10,20) * 100
+	if(debt << 1000) debt += 2000
 	objective = "[mini_target]([mini_target.assigned_job.title]) задолжал Вам [debt] кредитов. Добейтесь от должника возвращения долга до конца смены."
 	double_text = "<span class='danger'><font size=3>Вы вспоминаете, что то ли по пьяне, то ли из-за смертельной угрозы, то ли просто по случайности, но Вы должны [owner] [debt] кредитов. Не сказать, что бы Вам хотелось с ними раставаться...</font></span>"
 	double_objective = "Избегать отдачи долга в [debt] кредитов [owner]([owner.assigned_job.title])."
@@ -302,15 +302,17 @@ GLOBAL_DATUM_INIT(mini_role, /datum/antagonist/mini_roles, new)
 	double_text = "<span class='danger'><font size=3>Где-то рядом с Вами должен находится связной, который может обладать интересной и полезной информацией. Найдите его и получите эту информацию.</font></span>"
 	double_objective = "Найдите и установите контакт с связным."
 
-	//Put names of possible coop roles in list below
+	//Put types of possible coop roles in list below
 	var/connected_roles = list(/datum/mini_role/rat, /datum/mini_role/contractor)
+	//Guys below too boring to unmask them
+	var/boring_roles = list(/datum/mini_role/creditor)
 
 /datum/mini_role/link/additional_check(var/mob/living/carbon/human/target)
 	var/try_amount = 0
 	var/list/unmasked_roles = list()
 	while(try_amount != 4)
 		var/datum/mini_role/picked_role = pick(GLOB.mini_role.all_mini_roles_datums)
-		if((is_type_in_list(picked_role, connected_roles)) || (picked_role.owner == target.mind))
+		if((is_type_in_list(picked_role, connected_roles)) || (is_type_in_list(picked_role, unmasked_roles)) || (is_type_in_list(picked_role, boring_roles)) || (picked_role.owner == target.mind))
 			try_amount += 1
 			continue
 		unmasked_roles += picked_role

code/modules/emotes/definitions/visible.dm

@@ -343,4 +343,4 @@
 	key = "adjust"
 	check_restraints = TRUE
 	emote_message_3p = "USER поправляет одежду."
-	emote_message_3p_target = "USER поправляет одежду TARGET."
+	emote_message_3p_target = "USER поправляет одежду TARGET."

code/modules/mob/living/carbon/human/human_interactions.dm

@@ -32,6 +32,10 @@
 			if (istype(P.loc, /obj/structure/closet) && P.loc == H.loc)
 				P.visible_message("<B>[H]</B> кланяется <B>[P]</B>.")
 
+		else if (href_list["interaction"] == "wink") //BoS
+			to_chat(P, "<B>[H]</B> незаметно подмигивает Вам.")
+			to_chat(H, "Вы незаметно подмигнули <B>[P]</B>.")
+
 		else if (href_list["interaction"] == "pet")
 			if(((!istype(P.loc, /obj/structure/closet)) || (H.loc == P.loc)) && hashands && H.Adjacent(P))
 				H.visible_message("<B>[H]</B> [pick("гладит", "поглаживает")] <B>[P]</B>.")

code/modules/mob/living/carbon/human/interactions.dm

@@ -42,6 +42,7 @@
 	var/ya = "я"
 
 	dat +=  {"• <A href='?src=\ref[src];interaction=bow'>Отвесить поклон.</A><BR>"}
+	dat +=  {"• <A href='?src=\ref[src];interaction=wink'>Незаметно подмигнуть.</A><BR>"}
 	if (hashands)
 		dat +=  {"<font size=3><B>Руки:</B></font><BR>"}
 		dat +=  {"• <A href='?src=\ref[src];interaction=bow_affably'>Приветливо кивнуть.</A><BR>"}