Merge branch 'CeladonSS13:beta-dev' into cringe24

_maps/_mod_celadon/shuttles/inteq/inteq_hammerhead.dmm

@@ -549,9 +549,7 @@
 /turf/open/floor/plasteel/tech/grid,
 /area/ship/engineering/engine)
 "cn" = (
-/obj/machinery/power/smes/shuttle/precharged{
-	dir = 4
-	},
+/obj/machinery/power/smes/shuttle/precharged,
 /obj/structure/cable{
 	icon_state = "0-8"
 	},
@@ -574,9 +572,6 @@
 /obj/effect/decal/cleanable/dirt,
 /turf/open/floor/plasteel/tech,
 /area/ship/engineering/communications)
-"cs" = (
-/turf/closed/wall/mineral/titanium/nodiagonal,
-/area/ship/crew/cryo)
 "ct" = (
 /obj/effect/turf_decal/industrial/traffic{
 	dir = 1
@@ -1865,7 +1860,7 @@
 /obj/machinery/light/small/directional/east,
 /obj/structure/urinal{
 	dir = 8;
-	pixel_x = 11
+	pixel_x = 14
 	},
 /turf/open/floor/plasteel/freezer,
 /area/ship/crew/janitor)
@@ -2017,9 +2012,7 @@
 /obj/structure/cable{
 	icon_state = "0-4"
 	},
-/obj/machinery/power/shuttle/engine/electric/tech2{
-	dir = 4
-	},
+/obj/machinery/power/shuttle/engine/electric/tech2,
 /turf/open/floor/plating,
 /area/ship/engineering/engine)
 "nb" = (
@@ -2245,9 +2238,7 @@
 /turf/open/floor/plasteel/dark,
 /area/ship/security/prison)
 "oD" = (
-/obj/machinery/power/smes/shuttle/precharged{
-	dir = 4
-	},
+/obj/machinery/power/smes/shuttle/precharged,
 /obj/structure/cable{
 	icon_state = "0-8"
 	},
@@ -2530,9 +2521,7 @@
 /obj/structure/cable{
 	icon_state = "2-8"
 	},
-/obj/machinery/power/smes/shuttle/precharged{
-	dir = 4
-	},
+/obj/machinery/power/smes/shuttle/precharged,
 /obj/structure/cable,
 /obj/structure/cable{
 	icon_state = "0-2"
@@ -2711,8 +2700,7 @@
 /obj/machinery/button/shieldwallgen{
 	pixel_x = 10;
 	pixel_y = 20;
-	id = "Hamm_down_ex";
-	req_access_txt = "0"
+	id = "Hamm_down_ex"
 	},
 /obj/structure/cable{
 	icon_state = "4-8"
@@ -2789,9 +2777,9 @@
 	req_access_txt = "8485";
 	anchored = 1
 	},
-/obj/item/ammo_box/magazine/m12g_bulldog/drum,
+/obj/item/ammo_box/magazine/m12g_bulldog,
 /obj/item/storage/toolbox/ammo/a308,
-/obj/item/ammo_box/magazine/m12g_bulldog/drum,
+/obj/item/ammo_box/magazine/m12g_bulldog,
 /obj/item/storage/toolbox/ammo/c9mm,
 /obj/item/storage/toolbox/ammo/c9mm,
 /obj/item/ammo_box/magazine/f4_308,
@@ -2834,9 +2822,7 @@
 /area/ship/security/prison)
 "sx" = (
 /obj/effect/turf_decal/techfloor/orange,
-/obj/structure/bed/dogbed{
-	anchored = 1
-	},
+/obj/structure/bed/dogbed,
 /mob/living/simple_animal/cow/wisdom{
 	dir = 8;
 	name = "Golosa";
@@ -3085,7 +3071,7 @@
 /obj/effect/decal/cleanable/garbage,
 /obj/structure/urinal{
 	dir = 8;
-	pixel_x = 11
+	pixel_x = 14
 	},
 /turf/open/floor/plasteel/freezer,
 /area/ship/crew/janitor)
@@ -3466,6 +3452,11 @@
 /obj/item/bedsheet/brown,
 /obj/structure/curtain/bounty,
 /obj/structure/bed,
+/obj/item/gun/ballistic/shotgun/toy{
+	pixel_x = -4;
+	pixel_y = -8;
+	desc = "A shotgun for the youngest InteQ operatives. Shoots foam darts. 'For you and your little war crimes' Aged 18 years and older."
+	},
 /turf/open/floor/carpet/black,
 /area/ship/crew/dorm)
 "wP" = (
@@ -3518,8 +3509,8 @@
 "xb" = (
 /obj/structure/disposalpipe/trunk,
 /obj/machinery/igniter/incinerator_atmos,
-/obj/item/gun/ballistic/automatic/toy,
 /obj/machinery/air_sensor/atmos/incinerator_tank,
+/obj/item/gun/ballistic/automatic/toy,
 /turf/open/floor/engine/airless,
 /area/ship/engineering/engine)
 "xh" = (
@@ -5059,7 +5050,6 @@
 /area/ship/engineering/communications)
 "Fy" = (
 /obj/machinery/atmospherics/components/unary/shuttle/heater{
-	dir = 4;
 	piping_layer = 1
 	},
 /obj/machinery/door/poddoor{
@@ -5678,7 +5668,7 @@
 /area/ship/crew/crewtwo)
 "IG" = (
 /obj/structure/table/chem,
-/obj/item/storage/backpack/duffelbag/med,
+/obj/item/storage/backpack/duffelbag/sec/surgery,
 /turf/open/floor/mineral/titanium/white,
 /area/ship/medical)
 "IK" = (
@@ -5761,9 +5751,7 @@
 /turf/open/floor/plating,
 /area/ship/engineering/atmospherics)
 "Jm" = (
-/obj/machinery/power/shuttle/engine/fueled/plasma{
-	dir = 4
-	},
+/obj/machinery/power/shuttle/engine/fueled/plasma,
 /turf/open/floor/plating,
 /area/ship/engineering/engine)
 "Jp" = (
@@ -5998,9 +5986,7 @@
 /turf/open/floor/plating,
 /area/ship/engineering/atmospherics)
 "Ld" = (
-/obj/machinery/power/smes/shuttle/precharged{
-	dir = 4
-	},
+/obj/machinery/power/smes/shuttle/precharged,
 /obj/structure/cable{
 	icon_state = "0-2"
 	},
@@ -6390,9 +6376,7 @@
 /obj/structure/cable{
 	icon_state = "0-4"
 	},
-/obj/machinery/power/shuttle/engine/electric/tech2{
-	dir = 4
-	},
+/obj/machinery/power/shuttle/engine/electric/tech2,
 /turf/open/floor/plating,
 /area/ship/engineering/electrical)
 "Oq" = (
@@ -6596,7 +6580,7 @@
 "Pe" = (
 /obj/structure/urinal{
 	dir = 8;
-	pixel_x = 11
+	pixel_x = 14
 	},
 /turf/open/floor/plasteel/freezer,
 /area/ship/crew/janitor)
@@ -7899,6 +7883,10 @@
 "Yv" = (
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
 /obj/structure/dresser,
+/obj/item/ammo_box/foambox{
+	pixel_y = 11;
+	layer = 6
+	},
 /turf/open/floor/carpet/black,
 /area/ship/crew/dorm)
 "Yw" = (
@@ -9289,7 +9277,7 @@ rc
 tB
 OO
 Rx
-cs
+Br
 Br
 fn
 Vx

code/modules/vending/_vending.dm

@@ -887,27 +887,58 @@ IF YOU MODIFY THE PRODUCTS LIST OF A MACHINE, MAKE SURE TO UPDATE ITS RESUPPLY C
 	*/
 /obj/machinery/vending/proc/throw_item()
 	var/obj/throw_item = null
-	var/mob/living/target = locate() in view(7,src)
+	// [CELADON-EDIT] - CELADON_BALANCE - Чиним абьюз
+	// var/mob/living/target = locate() in view(7,src)
+	// if(!target)
+	// 	return 0
+	// for(var/datum/data/vending_product/R in shuffle(product_records))
+		// if(R.amount <= 0) //Try to use a record that actually has something to dump.
+			// continue
+		// var/dump_path = R.product_path
+		// if(!dump_path)
+			// continue
+		//
+		// R.amount--
+		// throw_item = new dump_path(loc)
+		// break
+	// if(!throw_item)
+		// return 0		// CELADON-EDIT - ORIGINAL
+	var/mob/living/target = locate() in view(1,src)
 	if(!target)
 		return 0
+	if (prob(10))
+		for(var/datum/data/vending_product/R in shuffle(product_records))
+			if(R.amount <= 0) //Try to use a record that actually has something to dump.
+				continue
+			var/dump_path = R.product_path
+			if(!dump_path)
+				continue
 
-	for(var/datum/data/vending_product/R in shuffle(product_records))
-		if(R.amount <= 0) //Try to use a record that actually has something to dump.
-			continue
-		var/dump_path = R.product_path
-		if(!dump_path)
-			continue
-
-		R.amount--
-		throw_item = new dump_path(loc)
-		break
-	if(!throw_item)
-		return 0
+			R.amount--
+			throw_item = new dump_path(loc)
+			break
+		if(!throw_item)
+			return 0
 
-	pre_throw(throw_item)
+		pre_throw(throw_item)
 
-	throw_item.throw_at(target, 16, 3)
-	visible_message("<span class='danger'>[src] launches [throw_item] at [target]!</span>")
+		throw_item.throw_at(target, 16, 3)
+		visible_message("<span class='danger'>[src] launches [throw_item] at [target]!</span>")
+	else
+		visible_message("<span class='danger'>Автомат угрожающе жужит...</span>")
+
+	if(tiltable && !tilted)
+		switch(rand(1, 100))
+			if(1 to 70)
+				visible_message("<span class='danger'>Атомат перестал жужать.</span>")
+				return
+			if(71 to 90)
+				visible_message("<span class='danger'>Атомат от сильного жужания кренится и падает на [target]!.</span>")
+				tilt(target)
+			if(91 to 100)
+				visible_message("<span class='danger'>Что-то взрывается внутри атомата и он подпрыгивает падая на [target]!.</span>")
+				tilt(target, crit=TRUE)
+	// [/CELADON-EDIT]
 	return 1
 /**
 	* A callback called before an item is tossed out

mod_celadon/_components/code/emotes/emotes_living.dm

@@ -687,7 +687,7 @@
 	else if(user.client && user.client.prefs.muted & MUTE_IC)
 		to_chat(user, "<span class='boldwarning'>You cannot send IC messages (muted).</span>")
 		return FALSE
-	else if(!params)
+	else if(params == ".")
 		var/custom_emote = copytext(sanitize(input("Choose an emote to display.") as text|null), 1, MAX_MESSAGE_LEN)
 		if(custom_emote && !check_invalid(user, custom_emote))
 			var/type = input("Is this a visible or hearable emote?") as null|anything in list("Visible", "Hearable")

mod_celadon/areas/code/ship_areas.dm

@@ -99,3 +99,17 @@
 /area/ship/general/other/zone_4
 	name = "Other Shuttle 4"
 	icon_state = "osz_4"
+
+/// Hallways ///
+/area/ship/hallway/starboard_fore
+	name = "Starboard Fore Hallway"
+	icon_state = "starforehallway"
+
+/area/ship/hallway/port_fore
+	name = "Port Fore Hallway"
+	icon_state = "portforehallway"
+
+/// Security ///
+/area/ship/security/weapons_control
+	name = "Weapons Control Room"
+	icon_state = "weaponscontrolroom"

mod_celadon/cargo_items/code/export/canister.dm

@@ -3,8 +3,30 @@
 	var/worth = 10
 
 	worth += C.air_contents.get_moles(GAS_BZ)*0.02
+	worth += C.air_contents.get_moles(GAS_STIMULUM)*1
+	worth += C.air_contents.get_moles(GAS_HYPERNOB)*10
+	worth += C.air_contents.get_moles(GAS_TRITIUM)*0.04
+	worth += C.air_contents.get_moles(GAS_PLUOXIUM)*0.05
+	return worth
+
+/* Было от офов
+	worth += C.air_contents.get_moles(GAS_BZ)*2
 	worth += C.air_contents.get_moles(GAS_STIMULUM)*100
 	worth += C.air_contents.get_moles(GAS_HYPERNOB)*1000
 	worth += C.air_contents.get_moles(GAS_TRITIUM)*4
 	worth += C.air_contents.get_moles(GAS_PLUOXIUM)*5
-	return worth
+
+1 вариант
+	worth += C.air_contents.get_moles(GAS_BZ)*0.02
+	worth += C.air_contents.get_moles(GAS_STIMULUM)*100
+	worth += C.air_contents.get_moles(GAS_HYPERNOB)*1000
+	worth += C.air_contents.get_moles(GAS_TRITIUM)*4
+	worth += C.air_contents.get_moles(GAS_PLUOXIUM)*5
+
+2 вариант (текущий)
+	worth += C.air_contents.get_moles(GAS_BZ)*0.02
+	worth += C.air_contents.get_moles(GAS_STIMULUM)*1
+	worth += C.air_contents.get_moles(GAS_HYPERNOB)*10
+	worth += C.air_contents.get_moles(GAS_TRITIUM)*0.04
+	worth += C.air_contents.get_moles(GAS_PLUOXIUM)*0.05
+*/

mod_celadon/qol/README.md

@@ -32,6 +32,7 @@ ID мода: CELADON_QOL
 - убраны неиспользуемые кнопки со вкладки ООС	
 - перемещены технические кнопки во вкладку Special Verbs
 - обновлён функционал Fit Viewport
+- исправлен зависающий пузырик сообщения над головой куклы
 <!--
   Что он делает, что добавляет: что, куда, зачем и почему - всё здесь.
   А также любая полезная информация.
@@ -115,6 +116,8 @@ ID мода: CELADON_QOL
 - `/datum/viewData/assertFormat`
 - `/datum/viewData/resetFormat`
 - `/client/fit_viewport`
+- `/mob/verb/me_verb`
+- `/mob/verb/say_verb`
 <!--
   Если ты добавлял новый модульный оверрайд, его нужно указать здесь.
   Здесь указываются оверрайды в твоём моде и папке `_master_files`

mod_celadon/qol/_qol.dme

@@ -15,5 +15,6 @@
 #include "code/reefresh_tgui.dm"
 #include "code/reagent_containers.dm"
 #include "code/fit_viewport2.dm"
+#include "code/mob_say2.dm"
 
 #endif