Merge branch 'ss220club:master' into master

modular_ss220/aesthetics/_aesthetics.dme

@@ -1,52 +1,53 @@
 #include "_aesthetics.dm"
 
 #include "airalarm\code\airalarm.dm"
+#include "airlocks\code\airlock.dm"
+#include "airlocks\code\airlock_assembly_types.dm"
+#include "airlocks\code\airlock_types.dm"
 #include "apc\code\apc.dm"
+#include "applicator\code\applicator.dm"
 #include "atm\code\atm.dm"
 #include "atmospherics\code\atmospherics.dm"
 #include "better_ids\code\better_ids.dm"
 #include "blastdoor\code\blastdoor.dm"
 #include "boxes\code\boxes.dm"
 #include "cameras\code\cameras.dm"
 #include "chairs\code\chairs.dm"
+#include "closets\code\closets.dm"
+#include "decals\code\decals.dm"
 #include "defib\code\defib.dm"
 #include "dirwindows\code\dirwindows.dm"
 #include "door_control\code\door_control.dm"
+#include "dresser\code\dresser.dm"
 #include "extinguisher\code\extinguisher.dm"
 #include "firealarm\code\firealarm.dm"
 #include "floors\code\floors.dm"
 #include "floors\code\tile_types.dm"
 #include "goonstation\code\items.dm"
 #include "hydroponics\code\hydroponics.dm"
+#include "intercom\code\intercom.dm"
 #include "keycard\code\keycard.dm"
 #include "labeler\code\labeler.dm"
 #include "library\code\library.dm"
 #include "light_switch\code\light_switch.dm"
+#include "lights\code\lights.dm"
 #include "newscaster\code\newscaster.dm"
 #include "piano\code\piano.dm"
 #include "racks\code\racks.dm"
 #include "requests_console\code\requests_console.dm"
 #include "rollerbed\code\rollerbed.dm"
 #include "safe\code\safe.dm"
+#include "satellite\code\satellite.dm"
+#include "sheets\code\sheets.dm"
 #include "shutters\code\shutters.dm"
+#include "skin\code\darkmode.dm"
 #include "soap\code\soap.dm"
 #include "stamps\code\stamps.dm"
 #include "surgery_table\code\surgery_table.dm"
 #include "toolboxes\code\toolboxes.dm"
 #include "wallcloset\code\wallcloset.dm"
+#include "walls\code\walls.dm"
 #include "windoor\code\windoor.dm"
+#include "windows\code\windows.dm"
 #include "windowtint\code\windowtint.dm"
 #include "zippo\code\zippo.dm"
-#include "intercom\code\intercom.dm"
-#include "walls\code\walls.dm"
-#include "windows\code\windows.dm"
-#include "decals\code\decals.dm"
-#include "airlocks\code\airlock.dm"
-#include "airlocks\code\airlock_types.dm"
-#include "airlocks\code\airlock_assembly_types.dm"
-#include "lights\code\lights.dm"
-#include "skin\code\darkmode.dm"
-#include "sheets\code\sheets.dm"
-#include "applicator\code\applicator.dm"
-#include "satellite\code\satellite.dm"
-

modular_ss220/aesthetics/closets/code/closets.dm

@@ -0,0 +1,11 @@
+/obj/structure/closet/cabinet
+	icon = 'modular_ss220/aesthetics/closets/icons/closets.dmi'
+
+/obj/structure/closet/secure_closet/detective
+	icon = 'modular_ss220/aesthetics/closets/icons/closets.dmi'
+
+/obj/structure/closet/secure_closet/bar
+	icon = 'modular_ss220/aesthetics/closets/icons/closets.dmi'
+
+/obj/structure/closet/secure_closet/personal/cabinet
+	icon = 'modular_ss220/aesthetics/closets/icons/closets.dmi'

modular_ss220/aesthetics/dresser/code/dresser.dm

@@ -0,0 +1,3 @@
+/obj/structure/dresser
+	icon = 'modular_ss220/aesthetics/dresser/icons/dresser.dmi'
+	icon_state = "dresser"

modular_ss220/aesthetics/racks/code/racks.dm

@@ -1,10 +1,6 @@
 /obj/structure/rack
 	icon = 'modular_ss220/aesthetics/racks/icons/racks.dmi'
 
-/obj/structure/rack/skeletal_bar
-	icon = 'icons/obj/stationobjs.dmi'
-	//TODO: need icon
-
 /obj/structure/rack/gunrack
 	name = "gun rack"
 	desc = "A gun rack for storing guns."

modular_ss220/balance/_balance.dme

@@ -1,5 +1,6 @@
 #include "_balance.dm"
 
+#include "code/items/projectiles.dm"
 #include "code/items/weapons.dm"
 #include "code/jobs/warden.dm"
 #include "code/species/nucleation.dm"

modular_ss220/balance/code/items/projectiles.dm

@@ -0,0 +1,2 @@
+/mob/living/carbon/human/projectile_hit_check(obj/item/projectile/P)
+	return !density

modular_ss220/mecha_skins/code/paintkit_install.dm

@@ -1,32 +1,34 @@
 /obj/mecha/attackby(obj/item/W, mob/user, params)
-	. = ..()
-	if(istype(W, /obj/item/paintkit))
-		if(occupant)
-			to_chat(user, "Вы не можете кастомизировать экзокостюм, пока кто-то его пилотирует - это небезопасно!")
-			return
-
-		var/obj/item/paintkit/P = W
-		var/found = null
-
-		for(var/type in P.allowed_types)
-			if(type == initial_icon)
-				found = 1
-				break
-
-		if(!found)
-			to_chat(user, "Этот комплект не предназначен для использования на экзокостюме данного класса.")
-			return
-
-		user.visible_message("[user] открывает [P] и проводит некоторое время за кастомизацией [src].")
-		if(do_after_once(user, 3 SECONDS, target = src))
-
-			name = P.new_name
-			desc = P.new_desc
-			icon = 'modular_ss220/mecha_skins/code/mecha.dmi'
-			initial_icon = P.new_icon
-			wreckage = P.new_wreckage
-			reset_icon()
-			qdel(P)
+	if(!istype(W, /obj/item/paintkit))
+		return ..()
+	if(occupant)
+		to_chat(user, "Вы не можете кастомизировать экзокостюм, пока кто-то его пилотирует - это небезопасно!")
+		return
+
+	var/obj/item/paintkit/P = W
+	var/found = null
+
+	for(var/type in P.allowed_types)
+		if(type == initial_icon)
+			found = 1
+			break
+
+	if(!found)
+		to_chat(user, "Этот комплект не предназначен для использования на экзокостюме данного класса.")
+		return
+
+	user.visible_message("[user] открывает [P] и проводит некоторое время за кастомизацией [src].")
+	if(!do_after_once(user, 3 SECONDS, target = src))
+		to_chat(user, "Вы должны стоять смирно при настройке экзокостюма!")
+		return
+	name = P.new_name
+	desc = P.new_desc
+	icon = 'modular_ss220/mecha_skins/code/mecha.dmi'
+	initial_icon = P.new_icon
+	wreckage = P.new_wreckage
+	reset_icon()
+	qdel(P)
+
 
 //RIP AND PEPPERONI