Y

baystation12.dme

@@ -3305,7 +3305,9 @@
 #include "proxima\code\modules\clothing\_clothing.dm"
 #include "proxima\code\modules\clothing\accessories\cloak.dm"
 #include "proxima\code\modules\clothing\accessories\sweater.dm"
+#include "proxima\code\modules\clothing\feet\combat_boots.dm"
 #include "proxima\code\modules\clothing\feet\feet.dm"
+#include "proxima\code\modules\clothing\hands\combat_glovers.dm"
 #include "proxima\code\modules\clothing\masks\masks.dm"
 #include "proxima\code\modules\clothing\masks\smokable.dm"
 #include "proxima\code\modules\clothing\pouch\pouch.dm"

code/__defines/flags.dm

@@ -58,8 +58,4 @@ GLOBAL_LIST_INIT(bitflags, list(1, 2, 4, 8, 16, 32, 64, 128, 256, 512, 1024, 204
 #define TANK_FLAG_LEAKING    FLAG(2)
 #define TANK_FLAG_WIRED      FLAG(3)
 
-// Sector Flags.
-#define OVERMAP_SECTOR_BASE              0x0001 // Whether or not this sector is a starting sector. Z levels contained in this sector are added to station_levels
-#define OVERMAP_SECTOR_KNOWN             0x0002 // Makes the sector show up on nav computers
-#define OVERMAP_SECTOR_IN_SPACE          0x0004 // If the sector can be accessed by drifting off the map edge
-#define OVERMAP_SECTOR_UNTARGETABLE      0x0008 // If the sector is untargetable by missiles
+

maps/torch/torch5_deck1.dmm

@@ -11818,6 +11818,14 @@
 /obj/item/clothing/suit/armor/riot,
 /obj/item/clothing/suit/armor/riot,
 /obj/effect/floor_decal/industrial/outline/grey,
+/obj/item/clothing/shoes/combat,
+/obj/item/clothing/shoes/combat,
+/obj/item/clothing/shoes/combat,
+/obj/item/clothing/shoes/combat,
+/obj/item/clothing/gloves/combat,
+/obj/item/clothing/gloves/combat,
+/obj/item/clothing/gloves/combat,
+/obj/item/clothing/gloves/combat,
 /turf/simulated/floor/tiled/dark/monotile,
 /area/security/armoury)
 "aQq" = (
@@ -18795,6 +18803,8 @@
 /obj/item/clothing/accessory/glassesmod/nvg,
 /obj/item/clothing/glasses/ballistic/security,
 /obj/item/clothing/mask/gas/half,
+/obj/item/clothing/accessory/leg_guards,
+/obj/item/clothing/accessory/arm_guards,
 /turf/simulated/floor/tiled/techfloor/grid,
 /area/command/armoury/tactical)
 "hUb" = (
@@ -21068,6 +21078,8 @@
 	dir = 4
 	},
 /obj/item/clothing/mask/gas/half,
+/obj/item/clothing/accessory/leg_guards,
+/obj/item/clothing/accessory/arm_guards,
 /turf/simulated/floor/tiled/techfloor/grid,
 /area/command/armoury/tactical)
 "kOb" = (
@@ -25604,6 +25616,14 @@
 	d2 = 8;
 	icon_state = "4-8"
 	},
+/obj/item/clothing/shoes/combat/laser,
+/obj/item/clothing/shoes/combat/laser,
+/obj/item/clothing/shoes/combat/laser,
+/obj/item/clothing/shoes/combat/laser,
+/obj/item/clothing/gloves/combat/laser,
+/obj/item/clothing/gloves/combat/laser,
+/obj/item/clothing/gloves/combat/laser,
+/obj/item/clothing/gloves/combat/laser,
 /turf/simulated/floor/tiled/dark/monotile,
 /area/security/armoury)
 "qzb" = (
@@ -26281,6 +26301,8 @@
 /obj/machinery/recharger/wallcharger{
 	pixel_y = 24
 	},
+/obj/item/clothing/accessory/leg_guards,
+/obj/item/clothing/accessory/arm_guards,
 /turf/simulated/floor/tiled/techfloor/grid,
 /area/command/armoury/tactical)
 "rlb" = (
@@ -27491,6 +27513,8 @@
 	dir = 8
 	},
 /obj/item/clothing/mask/gas/half,
+/obj/item/clothing/accessory/leg_guards,
+/obj/item/clothing/accessory/arm_guards,
 /turf/simulated/floor/tiled/techfloor/grid,
 /area/command/armoury/tactical)
 "stb" = (
@@ -27518,6 +27542,8 @@
 	dir = 8
 	},
 /obj/item/clothing/mask/gas/half,
+/obj/item/clothing/accessory/leg_guards,
+/obj/item/clothing/accessory/arm_guards,
 /turf/simulated/floor/tiled/techfloor/grid,
 /area/command/armoury/tactical)
 "sub" = (
@@ -29275,6 +29301,8 @@
 	dir = 4
 	},
 /obj/item/clothing/mask/gas/half,
+/obj/item/clothing/accessory/leg_guards,
+/obj/item/clothing/accessory/arm_guards,
 /turf/simulated/floor/tiled/techfloor/grid,
 /area/command/armoury/tactical)
 "uXe" = (
@@ -30375,6 +30403,14 @@
 	d2 = 4;
 	icon_state = "1-4"
 	},
+/obj/item/clothing/shoes/combat/ballistic,
+/obj/item/clothing/shoes/combat/ballistic,
+/obj/item/clothing/shoes/combat/ballistic,
+/obj/item/clothing/shoes/combat/ballistic,
+/obj/item/clothing/gloves/combat/ballistic,
+/obj/item/clothing/gloves/combat/ballistic,
+/obj/item/clothing/gloves/combat/ballistic,
+/obj/item/clothing/gloves/combat/ballistic,
 /turf/simulated/floor/tiled/dark/monotile,
 /area/security/armoury)
 "xSd" = (

proxima/code/game/machinery/factory/factory.dm

@@ -5,6 +5,8 @@
 	icon_state = "compressor"
 	idle_power_usage = 10
 	active_power_usage = 50 KILOWATTS
+	density = 1
+	anchored = TRUE
 	construct_state = /decl/machine_construction/default/panel_closed
 
 	var/obj/item/factory_blueprint/stored_blueprint = null
@@ -140,7 +142,13 @@
 
 	return TRUE
 
-//obj/machinery/factory/bumped()
+/obj/machinery/factory/Bumped(obj/item/I)
+	.=..()
+
+	if(get_dir(src,I) == input_dir)
+		InsertMaterial(I)
+
+	return TRUE
 
 
 
@@ -232,7 +240,6 @@
 
 	return TRUE
 
-
 /obj/item/stock_parts/circuitboard/factory
 	name = T_BOARD("factory")
 	build_path = /obj/machinery/factory
@@ -243,3 +250,5 @@
 							/obj/item/stock_parts/scanning_module = 1,
 							/obj/item/stock_parts/micro_laser = 1,
 						  )
+
+//УЕБАНЫ НИКОГДА НЕ ТРОГАЙТЕ МОЙ КОД ЗАВОДОВ, ИНАЧЕ Я ВАС ПОВЕШУ НА КРЮК ЗА ЯЙЦА

proxima/code/modules/clothing/feet/combat_boots.dm

@@ -0,0 +1,52 @@
+/obj/item/clothing/shoes/combat
+	name = "riot armored boots"
+	desc = "boots for kick some punks ass."
+	icon_state = "leg_guards_riot"
+	item_state = "leg_guards_riot"
+	icon = 'proxima/icons/obj/clothing/obj_feet.dmi'
+	item_icons = list(slot_shoes_str = 'proxima/icons/mob/onmob/onmob_feet.dmi')
+	armor = list(
+		melee = ARMOR_MELEE_VERY_HIGH,
+		bullet = ARMOR_BALLISTIC_SMALL,
+		laser = ARMOR_LASER_SMALL,
+		energy = ARMOR_ENERGY_MINOR,
+		bomb = ARMOR_BOMB_PADDED
+		)
+
+/obj/item/clothing/shoes/combat/ballistic
+	name = "bullet armored boots"
+	desc = "boots for kick some punks ass."
+	icon_state = "leg_guards_bullet"
+	item_state = "leg_guards_bullet"
+	armor = list(
+		melee = ARMOR_MELEE_RESISTANT,
+		bullet = ARMOR_BALLISTIC_AP,
+		laser = ARMOR_LASER_SMALL,
+		energy = ARMOR_ENERGY_MINOR,
+		bomb = ARMOR_BOMB_PADDED
+		)
+
+/obj/item/clothing/shoes/combat/laser
+	name = "laser armored boots"
+	desc = "boots for kick some punks ass."
+	icon_state = "leg_guards_laser"
+	item_state = "leg_guards_laser"
+	armor = list(
+		melee = ARMOR_MELEE_KNIVES,
+		bullet = ARMOR_BALLISTIC_PISTOL,
+		laser = ARMOR_LASER_RIFLES,
+		energy = ARMOR_ENERGY_RESISTANT
+		)
+
+/obj/item/clothing/shoes/combat/heavy
+	name = "heavy armored boots"
+	desc = "boots for kick some punks ass."
+	icon_state = "leg_guards_combat"
+	item_state = "leg_guards_combat"
+	armor = list(
+		melee = ARMOR_MELEE_RESISTANT,
+		bullet = ARMOR_BALLISTIC_RIFLE,
+		laser = ARMOR_LASER_MAJOR,
+		energy = ARMOR_ENERGY_RESISTANT,
+		bomb = ARMOR_BOMB_PADDED
+	)