Баллистические пистолеты в экстренный арсенал... [PREDATOR? - EDITION]

baystation12.dme

@@ -3270,7 +3270,7 @@
 #include "proxima\code\game\items\devices\holopad_hand.dm"
 #include "proxima\code\game\items\devices\remote_device.dm"
 #include "proxima\code\game\items\weapons\gun\energy\k342.dm"
-#include "proxima\code\game\items\weapons\gun\projectiles\bosnia.dm"
+#include "proxima\code\game\items\weapons\gun\projectiles\prx_gun.dm"
 #include "proxima\code\game\items\weapons\melee\swords.dm"
 #include "proxima\code\game\items\weapons\projectile\infinity-ammuntion.dm"
 #include "proxima\code\game\items\weapons\projectile\infinity-guns.dm"
@@ -3292,9 +3292,13 @@
 #include "proxima\code\game\objects\items\remote_weapon_ammo.dm"
 #include "proxima\code\game\objects\items\toys.dm"
 #include "proxima\code\game\objects\items\device\remote_weapon_controller.dm"
+#include "proxima\code\game\objects\items\weapons\storage\case.dm"
 #include "proxima\code\game\objects\structures\barrier.dm"
 #include "proxima\code\game\objects\structures\flora.dm"
 #include "proxima\code\game\objects\structures\holoplants.dm"
+#include "proxima\code\game\objects\structures\crates_lockers\crates.dm"
+#include "proxima\code\game\objects\structures\crates_lockers\closets\_closet_appearance_definitions.dm"
+#include "proxima\code\game\turfs\flooring\flooring_decals.dm"
 #include "proxima\code\game\verbs\who.dm"
 #include "proxima\code\modules\filmgrain.dm"
 #include "proxima\code\modules\poraz_corgi.dm"

code/game/machinery/barrier.dm

@@ -1,7 +1,7 @@
 /obj/machinery/barrier
 	name = "deployable barrier"
 	desc = "A deployable barrier."
-	icon = 'icons/obj/objects.dmi'
+	icon = 'proxima/icons/obj/objects.dmi' //PRX
 	icon_state = "barrier0"
 	req_access = list(access_brig)
 	density = TRUE

code/game/objects/items/weapons/storage/briefcase.dm

@@ -11,18 +11,3 @@
 	max_w_class = ITEM_SIZE_NORMAL
 	max_storage_space = DEFAULT_BACKPACK_STORAGE
 	allow_slow_dump = TRUE
-
-/obj/item/storage/briefcase/psinull
-	name = "\improper Foundation psi-null case"
-	desc = "A handsome black leather case designed for carry psi-null implants by Cuchulain Foundation."
-	icon_state = "psicase"
-	item_state = "psicase"
-
-/obj/item/storage/briefcase/psinull/New()
-	..()
-	new /obj/item/implantcase/psi(src)
-	new /obj/item/implantcase/psi(src)
-	new /obj/item/implantcase/psi(src)
-	new /obj/item/implanter/psi(src)
-	new /obj/item/implantpad(src)
-	make_exact_fit()

code/game/objects/structures/crates_lockers/closets/_closet_appearance_definitions.dm

@@ -525,12 +525,6 @@
 /decl/closet_appearance/crate/plastic
 	color = COLOR_GRAY80
 
-/decl/closet_appearance/crate/war
-	color = COLOR_DARK_BLUE_GRAY
-	decals = list(
-		"crate_war" = COLOR_GRAY20
-	)
-
 /decl/closet_appearance/crate/oxygen
 	color = COLOR_CYAN_BLUE
 	decals = list(

code/game/objects/structures/crates_lockers/crates.dm

@@ -77,13 +77,6 @@
 	closet_appearance = /decl/closet_appearance/crate/plastic
 	material = MATERIAL_PLASTIC
 
-/obj/structure/closet/crate/war
-	name = "armored crate"
-	desc = "A special armored weapon crate."
-	points_per_crate = 6
-	closet_appearance = /decl/closet_appearance/crate/war
-	material = MATERIAL_PLASTEEL
-
 /obj/structure/closet/crate/internals
 	name = "internals crate"
 	desc = "A internals crate."

code/modules/clothing/spacesuits/rig/suits/ert.dm

@@ -35,6 +35,16 @@
 
 /obj/item/clothing/suit/space/rig/ert
 	species_restricted = list(SPECIES_HUMAN,SPECIES_SKRELL,SPECIES_UNATHI,SPECIES_IPC, SPECIES_SHELL)
+	allowed = list(
+		/obj/item/gun,
+		/obj/item/ammo_magazine,
+		/obj/item/ammo_casing,
+		/obj/item/melee/baton,
+		/obj/item/handcuffs,
+		/obj/item/tank,
+		/obj/item/device/suit_cooling_unit,
+		/obj/item/cell
+	)
 
 /obj/item/clothing/shoes/magboots/rig/ert
 	species_restricted = list(SPECIES_HUMAN,SPECIES_SKRELL,SPECIES_UNATHI,SPECIES_IPC, SPECIES_SHELL)

infinity/code/modules/projectiles/guns/projectile/automatic.dm

@@ -6,7 +6,7 @@
 	desc = "The NT41 Enforcer is a self-defense weapon made on bullpup system. Produced by NanoTrasen for it's Security Force. Looks cool and stylish, but sometimes too uncomfortably to run with it. Uses 5.7x28mm rounds."
 	icon_state = "nt41"
 	item_state = "nt41"
-	icon = 'infinity/icons/obj/guns.dmi'
+	icon = 'proxima/icons/obj/guns/nt41.dmi'
 	wielded_item_state = "nt41-wielded"
 	item_icons = list(
 		slot_r_hand_str = 'infinity/icons/mob/onmob/righthand.dmi',
@@ -39,8 +39,8 @@
 /obj/item/gun/projectile/automatic/amrcarabine
 	name = "LDC-542 carabine"
 	desc = "The sielent and deadly and manufactured by Aussec Armory, bullpup carabine LDC-542 is a common weapon for a long-medium ranged combat units in Private Military Companies. Uses 12.7x55mm rounds."
-	icon = 'infinity/icons/obj/guns.dmi'
-	icon_state = "amrcarabine"
+	icon = 'proxima/icons/obj/guns/ldc542.dmi'
+	icon_state = "ldc542"
 	item_state = "z8carbine"
 	force = 10
 	caliber = CALIBER_ANTIMATERIAL_SMALL
@@ -63,14 +63,14 @@
 
 /obj/item/gun/projectile/automatic/amrcarabine/on_update_icon()
 	..()
-	icon_state = (ammo_magazine)? "amrcarabine" : "amrcarabine-e"
+	icon_state = (ammo_magazine)? "ldc542" : "ldc542-e"
 
 
 /obj/item/gun/projectile/automatic/bp15
 	name = "BP-15 PDW"
 	desc = "The BP-15 'Moloh' is a  personal defense weapon, produced by Aussec Armory for use by police spec ops or solders. Uses 5.7x28 mm rounds."
 	icon = 'infinity/icons/event/guns.dmi'
-	icon_state = "pdw"
+	icon_state = "BP15"
 	item_state = "c20r"
 	item_icons = list(
 		slot_r_hand_str = 'icons/mob/onmob/items/righthand_guns.dmi',
@@ -96,66 +96,9 @@
 	one_hand_penalty = 3
 
 /obj/item/gun/projectile/automatic/bp15/on_update_icon()
-	icon_state = (ammo_magazine)? "pdw" : "pdw-empty"
+	icon_state = (ammo_magazine)? "BP15" : "BP15-e"
 	..()
 
-/obj/item/gun/projectile/automatic/invider
-	name = "Invider submachine gun"
-	desc = "The Invider is a Hi-tech and rapid firing SMG. Uses 4.6x30mm universal rounds."
-	icon = 'infinity/icons/event/guns.dmi'
-	icon_state = "pdw"
-	item_state = "c20r"
-	var/projetcile_type = 0
-	force = 10
-	caliber = CALIBER_PISTOL_FAST
-	origin_tech = list(TECH_COMBAT = 5, TECH_MATERIAL = 2, TECH_ESOTERIC = 8)
-	slot_flags = SLOT_BELT|SLOT_BACK
-	load_method = MAGAZINE
-	magazine_type = /obj/item/ammo_magazine/uni46x30mm
-	allowed_magazines = /obj/item/ammo_magazine/uni46x30mm
-	auto_eject = 1
-	auto_eject_sound = 'sound/weapons/smg_empty_alarm.ogg'
-
-	firemodes = list(
-		list(mode_name="semiauto",       burst=1, fire_delay=0,      one_hand_penalty=0, burst_accuracy=null, dispersion=null),
-		list(mode_name="3-round bursts", burst=3, fire_delay=null,      one_hand_penalty=0, burst_accuracy=list(0,-1,-1),       dispersion=list(0.0, 0.6, 1.0)),
-		)
-
-	bulk = GUN_BULK_CARABINE
-	w_class = ITEM_SIZE_LARGE
-	one_hand_penalty = 3
-
-
-/obj/item/gun/projectile/automatic/invider/modify_projectile(obj/item/projectile/p, var/list/params = list())
-	if (params["Charged"] == 1 && loaded.len)
-		p = new /obj/item/projectile/bullet/smg/uni46x30mm_charged
-	return p
-
-/obj/item/gun/projectile/automatic/invider/CtrlAltClick(mob/user)
-	if(user.incapacitated())
-		to_chat(user, "<span class='warning'>You can't do that right now!</span>")
-		return
-
-	else
-		if(src == user.get_active_hand())
-			projetcile_type = !projetcile_type
-			playsound(user, 'infinity/sound/weapons/selector.ogg', 50, 1)
-			to_chat(user, "<span class='notice'>You toggle the bullet penetration mode [projetcile_type ? "on":"off"].</span>")
-
-/obj/item/gun/projectile/automatic/invider/Fire(atom/target, mob/living/user, clickparams, pointblank=0, reflex=0, var/list/params = list())
-	if (projetcile_type == 1)
-		..(target, user, clickparams, pointblank, reflex, list("Charged" = 1))
-	else
-		..(target, user, clickparams, pointblank, reflex, list("Charged" = 0))
-
-/obj/item/gun/projectile/automatic/invider/on_update_icon()
-	..()
-	if(ammo_magazine)
-		icon_state = "pdw"
-	else
-		icon_state = "pdw-empty"
-	return
-
 /obj/item/gun/projectile/automatic/nt41/armory
 	starts_loaded = 0