Merge pull request #733 from molnizz/cringe13

Darect rebalance

_maps/_mod_celadon/outpost/indie_space.dmm

@@ -8328,6 +8328,18 @@
 /obj/effect/turf_decal/corner/opaque/neutral/three_quarters,
 /turf/open/floor/plasteel,
 /area/outpost/hallway/port)
+"Za" = (
+/obj/effect/turf_decal/corner/opaque/grey/full,
+/obj/structure/cable/yellow{
+	icon_state = "4-8"
+	},
+/obj/structure/disposalpipe/segment{
+	dir = 4
+	},
+/obj/structure/sign/number/random,
+/obj/effect/landmark/observer_start,
+/turf/open/floor/plasteel,
+/area/outpost/hallway/central)
 "Ze" = (
 /obj/effect/turf_decal/corner/opaque/grey/full,
 /obj/machinery/light/dim/directional/east,
@@ -15932,7 +15944,7 @@ LK
 LK
 gb
 VG
-Bp
+Za
 fE
 zw
 ks

_maps/_mod_celadon/outpost/nanotrasen_asteroid.dmm

@@ -11070,6 +11070,7 @@
 /obj/structure/cable{
 	icon_state = "1-2"
 	},
+/obj/effect/landmark/observer_start,
 /turf/open/floor/concrete/tiles,
 /area/outpost/hallway/central)
 "MX" = (

_maps/_mod_celadon/shuttles/nanotrasen/nanotrasen_darect.dmm

@@ -738,7 +738,7 @@
 /obj/machinery/power/apc/auto_name/directional/east,
 /obj/machinery/light_switch{
 	dir = 8;
-	pixel_x = 20;
+	pixel_x = 19;
 	pixel_y = -12
 	},
 /turf/open/floor/carpet/nanoweave,
@@ -807,6 +807,12 @@
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
 	dir = 8
 	},
+/obj/machinery/door/firedoor/border_only{
+	dir = 8
+	},
+/obj/machinery/door/firedoor/border_only{
+	dir = 4
+	},
 /turf/open/floor/plasteel/patterned,
 /area/ship/hallway/central)
 "oj" = (
@@ -881,17 +887,17 @@
 /obj/structure/guncase{
 	anchored = 1
 	},
-/obj/item/gun/energy/e_gun/iot{
-	pixel_y = -7
+/obj/item/gun/energy/e_gun/smg{
+	pixel_y = 10
+	},
+/obj/item/gun/energy/e_gun/smg{
+	pixel_y = 4
 	},
 /obj/item/gun/energy/e_gun/iot{
 	pixel_y = -1
 	},
-/obj/item/gun/energy/e_gun{
-	pixel_y = 2
-	},
-/obj/item/gun/energy/e_gun{
-	pixel_y = 8
+/obj/item/gun/energy/e_gun/iot{
+	pixel_y = -7
 	},
 /obj/item/gun/energy/ionrifle,
 /turf/open/floor/plasteel/tech,
@@ -1018,7 +1024,7 @@
 /obj/machinery/light_switch{
 	dir = 1;
 	pixel_x = -12;
-	pixel_y = -16
+	pixel_y = -15
 	},
 /obj/structure/cable{
 	icon_state = "0-8"
@@ -1084,7 +1090,7 @@
 "sy" = (
 /obj/machinery/light_switch{
 	pixel_x = -12;
-	pixel_y = 23
+	pixel_y = 21
 	},
 /obj/effect/turf_decal/techfloor{
 	dir = 1
@@ -1524,31 +1530,65 @@
 	dir = 1
 	},
 /obj/item/stock_parts/cell/gun{
-	pixel_x = 6
+	pixel_x = 6;
+	maxcharge = 20000
+	},
+/obj/item/stock_parts/cell/gun{
+	pixel_x = -4;
+	maxcharge = 20000
 	},
-/obj/item/stock_parts/cell/gun,
 /obj/item/stock_parts/cell/gun{
-	pixel_x = -7
+	pixel_x = 1;
+	maxcharge = 20000
+	},
+/obj/item/stock_parts/cell/gun{
+	pixel_x = -11;
+	maxcharge = 20000
+	},
+/obj/item/stock_parts/cell/gun{
+	pixel_x = -11;
+	maxcharge = 20000;
+	pixel_y = 8
 	},
 /obj/item/stock_parts/cell/gun{
 	pixel_x = -4;
-	pixel_y = 5
+	maxcharge = 20000;
+	pixel_y = 8
 	},
 /obj/item/stock_parts/cell/gun{
 	pixel_x = 4;
-	pixel_y = 5
+	maxcharge = 20000;
+	pixel_y = 8
 	},
 /obj/item/stock_parts/cell/gun{
-	pixel_x = -12;
-	pixel_y = 5
+	pixel_x = 10;
+	maxcharge = 20000;
+	pixel_y = 8
 	},
 /obj/item/stock_parts/cell/gun{
-	pixel_x = -9;
-	pixel_y = 5
+	pixel_x = 10;
+	maxcharge = 20000;
+	pixel_y = -4
 	},
 /obj/item/stock_parts/cell/gun{
-	pixel_x = -1;
-	pixel_y = 5
+	pixel_x = 1;
+	maxcharge = 20000;
+	pixel_y = -4
+	},
+/obj/item/stock_parts/cell/gun{
+	pixel_x = -8;
+	maxcharge = 20000;
+	pixel_y = -4
+	},
+/obj/item/stock_parts/cell/gun{
+	pixel_x = -15;
+	maxcharge = 20000;
+	pixel_y = 1
+	},
+/obj/item/stock_parts/cell/gun{
+	pixel_x = -6;
+	maxcharge = 20000;
+	pixel_y = 1
 	},
 /turf/open/floor/plasteel/tech,
 /area/ship/security)
@@ -1644,7 +1684,7 @@
 	},
 /obj/machinery/light_switch{
 	dir = 8;
-	pixel_x = 20;
+	pixel_x = 19;
 	pixel_y = -12
 	},
 /obj/effect/decal/cleanable/dirt/dust,
@@ -2300,16 +2340,16 @@
 /turf/open/floor/plasteel/tech,
 /area/ship/security)
 "QS" = (
-/obj/structure/closet/wall{
-	name = "radio locker";
-	pixel_y = -28
-	},
 /obj/item/radio,
 /obj/item/radio,
 /obj/item/radio,
 /obj/item/radio,
 /obj/item/radio,
 /obj/item/radio,
+/obj/structure/closet/wall{
+	name = "radio locker";
+	pixel_y = -28
+	},
 /turf/open/floor/plasteel/patterned,
 /area/ship/hallway/central)
 "QY" = (
@@ -2423,9 +2463,6 @@
 /turf/open/floor/plasteel/patterned,
 /area/ship/cargo)
 "Um" = (
-/obj/machinery/door/airlock/medical{
-	name = "Surgery"
-	},
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
 	dir = 1
 	},
@@ -2438,6 +2475,13 @@
 /obj/effect/turf_decal/siding/thinplating/dark/end{
 	dir = 1
 	},
+/obj/machinery/door/firedoor/border_only{
+	dir = 1
+	},
+/obj/machinery/door/firedoor/border_only,
+/obj/machinery/door/airlock/medical{
+	name = "Surgery"
+	},
 /turf/open/floor/plasteel/patterned,
 /area/ship/medical)
 "Uq" = (

mod_celadon/balance/README.md

@@ -98,6 +98,7 @@ REMOVE: `D:\1ss\ShiptestYata\code\modules\surgery\experimental_dissection.dm`: `
 ### Авторы:
 
 - Кинетик Крашер, универасльная вендор плата, цены карго, одежда с ЦК, нёрф очков диссекции с спец мобов и её упрощение - Yata9arasu, двигатели, рад. коллекторы - RalseiDreemuurr
+	Затронуты проджектайлы энергетических дробовиков - Molniz
 <!--
   Здесь находится твой никнейм
   Если работал совместно - никнеймы тех, кто помогал.

mod_celadon/balance/_balance.dm

@@ -1,4 +1,4 @@
 /datum/modpack/balance
 	name = "Balance"
-	desc = "Вносит изменения в баланс. Затронуты кинетик Крашер, двигатели, радиационные коллекторы, универсальная плата для вендоров с карго, цены в карго, одежда с ЦК. Изменено количество получаемого лута с элиток."
-	author = "Yata9arasu, RalseiDreemuurr, MrCat15352"
+	desc = "Вносит изменения в баланс. Затронуты кинетик Крашер, проджектайлы энергетических дробовиков, двигатели, радиационные коллекторы, универсальная плата для вендоров с карго, цены в карго, одежда с ЦК. Изменено количество получаемого лута с элиток."
+	author = "Yata9arasu, RalseiDreemuurr, MrCat15352, Molniz"

mod_celadon/balance/_balance.dme

@@ -8,6 +8,7 @@
 #include "code/engine/rnd.dm"
 #include "code/cc_clothes.dm"
 #include "code/guncase.dm"
+#include "code/e_sg500.dm"
 
 #include "../cargo_items/_cargo_items.dme"
 

mod_celadon/balance/code/e_sg500.dm

@@ -0,0 +1,20 @@
+// Проджектайлы дробовиков
+
+/obj/projectile/beam/disabler/weak
+	damage = 15
+	range = 10
+
+// Тип патрона
+
+/obj/item/ammo_casing/energy/laser/ultima
+	projectile_type = /obj/projectile/beam/laser/weak
+	pellets = 3
+	variance = 35
+	e_cost = 2000
+	select_name = "kill"
+
+/obj/item/ammo_casing/energy/disabler/scatter/ultima
+	projectile_type = /obj/projectile/beam/disabler/weak
+	pellets = 4
+	variance = 35
+	e_cost = 2000