From fa8c97e4745d6da788de537681514cfe91cb2921 Mon Sep 17 00:00:00 2001
From: HbmMods <hbmmods@gmail.com>
Date: Thu, 20 Sep 2018 14:28:37 +0200
Subject: [PATCH] lock picking, safe, gas mask filter

---
 assets/hbm/lang/de_DE.lang                    |   5 +
 assets/hbm/lang/en_US.lang                    |   5 +
 assets/hbm/sounds.json                        |   2 +
 assets/hbm/sounds/tool/pinBreak.ogg           | Bin 0 -> 6914 bytes
 assets/hbm/sounds/tool/pinUnlock.ogg          | Bin 0 -> 7233 bytes
 assets/hbm/textures/blocks/safe_front.png     | Bin 0 -> 431 bytes
 assets/hbm/textures/blocks/safe_front_alt.png | Bin 0 -> 429 bytes
 assets/hbm/textures/blocks/safe_side.png      | Bin 0 -> 332 bytes
 assets/hbm/textures/blocks/safe_side_alt.png  | Bin 0 -> 332 bytes
 assets/hbm/textures/gui/gui_safe.png          | Bin 0 -> 1129 bytes
 assets/hbm/textures/items/gas_mask_filter.png | Bin 0 -> 289 bytes
 assets/hbm/textures/items/pin.png             | Bin 0 -> 130 bytes
 com/hbm/blocks/ModBlocks.java                 |   5 +
 com/hbm/blocks/generic/BlockStorageCrate.java |  45 +++++
 com/hbm/handler/GUIHandler.java               |  19 +++
 .../inventory/container/ContainerSafe.java    |  80 +++++++++
 com/hbm/inventory/gui/GUISafe.java            |  44 +++++
 com/hbm/items/ModItems.java                   |   6 +
 com/hbm/items/special/ItemCustomLore.java     |  11 ++
 com/hbm/items/special/ItemSyringe.java        |  14 ++
 com/hbm/lib/HbmChestContents.java             |  12 +-
 com/hbm/main/CraftingManager.java             |   6 +-
 com/hbm/main/MainRegistry.java                |   2 +
 .../machine/TileEntityLockableBase.java       |  28 +++
 .../tileentity/machine/TileEntitySafe.java    | 160 ++++++++++++++++++
 com/hbm/world/Relay.java                      |  13 +-
 26 files changed, 446 insertions(+), 11 deletions(-)
 create mode 100644 assets/hbm/sounds/tool/pinBreak.ogg
 create mode 100644 assets/hbm/sounds/tool/pinUnlock.ogg
 create mode 100644 assets/hbm/textures/blocks/safe_front.png
 create mode 100644 assets/hbm/textures/blocks/safe_front_alt.png
 create mode 100644 assets/hbm/textures/blocks/safe_side.png
 create mode 100644 assets/hbm/textures/blocks/safe_side_alt.png
 create mode 100644 assets/hbm/textures/gui/gui_safe.png
 create mode 100644 assets/hbm/textures/items/gas_mask_filter.png
 create mode 100644 assets/hbm/textures/items/pin.png
 create mode 100644 com/hbm/inventory/container/ContainerSafe.java
 create mode 100644 com/hbm/inventory/gui/GUISafe.java
 create mode 100644 com/hbm/tileentity/machine/TileEntitySafe.java

diff --git a/assets/hbm/lang/de_DE.lang b/assets/hbm/lang/de_DE.lang
index 32d79b0db..6a45a6a48 100644
--- a/assets/hbm/lang/de_DE.lang
+++ b/assets/hbm/lang/de_DE.lang
@@ -260,6 +260,7 @@ item.turret_biometry.name=Geschütz-Telemetriekarte
 
 item.key.name=Schlüssel
 item.key_red.name=Roter Schlüssel
+item.pin.name=Haarklammer
 item.padlock.name=Vorhängeschloss
 tile.machine_keyforge.name=Schlossertisch
 container.keyForge=Schlossertisch
@@ -371,6 +372,8 @@ tile.crate_iron.name=Eisenkiste
 container.crateIron=Eisenkiste
 tile.crate_steel.name=Stahlkiste
 container.crateSteel=Stahlkiste
+tile.safe.name=Panzerschrank
+container.safe=Panzerschrank
 tile.machine_press.name=Dampfpresse
 container.press=Dampfpresse
 tile.machine_siren.name=Sirene
@@ -1113,6 +1116,7 @@ item.lemon.name="Zitrone"
 item.definitelyfood.name=GarantiertKeinDreck-Marken Feldration
 item.loops.name=Lüüps
 item.loop_stew.name=Informatiker-Frühstück
+item.fooditem.name=lebensmittel
 
 tile.frozen_grass.name=Gefrorenes Gras
 tile.frozen_dirt.name=Gefrorene Erde
@@ -1270,6 +1274,7 @@ item.plan_c.name=Plan C
 item.med_ipecac.name=Ipecac-Sirup
 item.med_ptsd.name=PTBS-Medikament
 item.med_schiziphrenia.name=Schizophrenie-Medikament
+item.gas_mask_filter.name=Gasmaskenfilter
 
 item.stealth_boy.name=Mobile Tarnkappe
 
diff --git a/assets/hbm/lang/en_US.lang b/assets/hbm/lang/en_US.lang
index ca0ba8451..954bd0019 100644
--- a/assets/hbm/lang/en_US.lang
+++ b/assets/hbm/lang/en_US.lang
@@ -273,6 +273,7 @@ item.turret_biometry.name=Turret Telemetry Card
 
 item.key.name=Key
 item.key_red.name=Red Key
+item.pin.name=Bobby Pin
 item.padlock.name=Padlock
 tile.machine_keyforge.name=Locksmith Table
 container.keyForge=Locksmith Table
@@ -371,6 +372,8 @@ tile.crate_iron.name=Iron Crate
 container.crateIron=Iron Crate
 tile.crate_steel.name=Steel Crate
 container.crateSteel=Steel Crate
+tile.safe.name=Safe
+container.safe=Safe
 tile.machine_press.name=Steam Press
 container.press=Steam Press
 tile.machine_siren.name=Siren
@@ -1113,6 +1116,7 @@ item.lemon.name="Lemon"
 item.definitelyfood.name=TotallyNotDirt-Brand MRE
 item.loops.name=Lööps
 item.loop_stew.name=IT Breakfast
+item.fooditem.name=food item
 
 tile.frozen_grass.name=Frozen Grass
 tile.frozen_dirt.name=Frozen Dirt
@@ -1270,6 +1274,7 @@ item.plan_c.name=Plan C
 item.med_ipecac.name=Ipecac Syrup
 item.med_ptsd.name=PTSD Medication
 item.med_schiziphrenia.name=Schizophrenia Medication
+item.gas_mask_filter.name=Gas Mask Filter
 
 item.stealth_boy.name=Stealth Device
 
diff --git a/assets/hbm/sounds.json b/assets/hbm/sounds.json
index 16580839e..d6e94b461 100644
--- a/assets/hbm/sounds.json
+++ b/assets/hbm/sounds.json
@@ -34,6 +34,8 @@
     "item.geiger4": {"category": "player", "sounds": [{"name": "tool/geiger4", "stream": false}]},
     "item.geiger5": {"category": "player", "sounds": [{"name": "tool/geiger5", "stream": false}]},
     "item.geiger6": {"category": "player", "sounds": [{"name": "tool/geiger6", "stream": false}]},
+    "item.pinUnlock": {"category": "player", "sounds": [{"name": "tool/pinUnlock", "stream": false}]},
+    "item.pinBreak": {"category": "player", "sounds": [{"name": "tool/pinBreak", "stream": false}]},
 
 	"music.recordLambdaCore": {"category": "record", "sounds": [{"name": "music/recordLambdaCore", "stream": true}]},
 	"music.recordSectorSweep": {"category": "record", "sounds": [{"name": "music/recordSectorSweep", "stream": true}]},
diff --git a/assets/hbm/sounds/tool/pinBreak.ogg b/assets/hbm/sounds/tool/pinBreak.ogg
new file mode 100644
index 0000000000000000000000000000000000000000..bdb42d2ff569b3e08dba8db6b3f592b70d04c797
GIT binary patch
literal 6914
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

literal 0
HcmV?d00001

diff --git a/assets/hbm/sounds/tool/pinUnlock.ogg b/assets/hbm/sounds/tool/pinUnlock.ogg
new file mode 100644
index 0000000000000000000000000000000000000000..680d20a19f648da7b9ccba834b99c305875dcdaf
GIT binary patch
literal 7233
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
I27vv406O*2Y5)KL

literal 0
HcmV?d00001

diff --git a/assets/hbm/textures/blocks/safe_front.png b/assets/hbm/textures/blocks/safe_front.png
new file mode 100644
index 0000000000000000000000000000000000000000..28999652a6cbaed0395eeaac87d18112247853fb
GIT binary patch
literal 431
zcmV;g0Z{&lP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00004b3#c}2nYxW
zd<bNS0004INkl<ZIE`(S!HUB$3`E}wVR{OtrxJ3=p+D8X_aWpMj48nc<K077uG3vZ
zNMc#i%xL`ecs#xVRFzsQ|1A+gRXL7>QVJr1hyb8=z&QudirCv?s*0*oN@>q;W5qeg
zIF6`l>sm^o){4bNr0wOL2_aZq+o5GyT3171-#w~v9C6N(b4F{eC+^<+#@Uh#u80t0
zB!s}e?=NIlpy%Fm1Xz}ZWmy`Ud7immuUsw{8fi<cwX&`&B7*mx=ktlGG7JOjy5gK`
z)SPo?3Kp2>8Gslgr4)u?VB5CSwAx5}{wAo+*?Z44O{A2Xct#`V{1VYNdUJgGV49}W
zc&%9}<wc=)oF(_P`ZN8%h`cHENMeitq?8a5Qc5S0LkPqeO|v&_fNk4O$@{*es-%=i
zDWR&|?{~cSFU@*UZns;ruZa8$T|_vJ<9wM)DJP@YsB+G&;OA;$TJ>IC>$30rA6tJ;
Z>jwiw8wEm<CL90&002ovPDHLkV1mdb!I1y}

literal 0
HcmV?d00001

diff --git a/assets/hbm/textures/blocks/safe_front_alt.png b/assets/hbm/textures/blocks/safe_front_alt.png
new file mode 100644
index 0000000000000000000000000000000000000000..abb87b06f2010bd6b38dac3b16924270cab55b9a
GIT binary patch
literal 429
zcmV;e0aE^nP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00004b3#c}2nYxW
zd<bNS0004GNkl<ZIE`(SU5<nx5QM*OOk|SLn7P{A{|*Kpgb`sMOtUz<Bu0h)sj4pI
z{eD*fRi)O-e@jGARnGIIl!AyLA^;2);G6?!MeJ>7s*0*oN@)+kpsG0Mn5GF;ZCy(#
z)LOA~5ovolXV!J4)_N7Npb$dqYAEcxM>S0o&N*_<47Ju9ckg}UY)J-JM2Io6t}DlJ
zT-2;U&%Nge5JDh?(9kT)!sGE^7=}y4KC#xywrz+A-g`cu530&Ij%?e8bFNWy&fO{4
z!Llp>#26{1FpeYpzTc*0Bh{Y232Jlp-ZRfLDWxW!(a1SpBHBi8j&C2#^L!hxH7liD
z6ne*5a!;#|>HkIKmqL#u#t1-42@xTsbQ5`9S7MBp(R$bb`@Y|jkK;g9Nhy(1LRERa
zUU=_O)n5&A&OD#bW?vEc7rKaWp6C5Cl~Qg-u~FrmTfy(uE|XR7)wM3ias09M_q2Wh
XWAz)DF0Rm+00000NkvXXu0mjfGtRyt

literal 0
HcmV?d00001

diff --git a/assets/hbm/textures/blocks/safe_side.png b/assets/hbm/textures/blocks/safe_side.png
new file mode 100644
index 0000000000000000000000000000000000000000..2e3a21dc151ceecca612a5646a1b50538150eccf
GIT binary patch
literal 332
zcmV-S0ki&zP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00004b3#c}2nYxW
zd<bNS00034Nkl<ZIE`&nL5jpM4AUB6`iB0jzwe=MC?Ocn9(LsMWLqc=b|T4A^K%@>
z3jjzWGx7A88AxKziHLxi!OQ>v)CPA4fCAB1J(3`ah^Y5XOt?GteFw>6jR<5W)Hk!L
zjWKYZr~0f-QXzSnS?gX00C&e21I*0F*`+2kORfOq3CRyYpIvK#^n>b?#I|iHO=9Xm
za=h5yNoh29{~kfePx4m}6e;`sI@~w*em8ZDA%&m$o(}dJfS&)~w=?wko=klL=gK6f
zS9Te^l5myS4=aJ5j*_T!x+y*5uB0<&Cgz;qmnkA}T~`(LOAEB$k$+|iy}N5>m~-O3
e?~<y0Yg)g!wfgXWXYe}!0000<MNUMnLSTZJ&yGC+

literal 0
HcmV?d00001

diff --git a/assets/hbm/textures/blocks/safe_side_alt.png b/assets/hbm/textures/blocks/safe_side_alt.png
new file mode 100644
index 0000000000000000000000000000000000000000..c6fbfefbbd7f4f76774b3db2b378e2ae6356e9bf
GIT binary patch
literal 332
zcmV-S0ki&zP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00004b3#c}2nYxW
zd<bNS00034Nkl<ZIE`(SORj}53`0-SPFWrM-veSwo4mo5`$7d0qRPi{Y-;CuCV;z>
znS4EFhPyN8BqA^~%nX38g4P<q0?}7FcgNj{i1h+=cc-<+aU8h&ni>&gCd!-Hij6V2
zu8Yk40jNkUL@zVfxyAunYm71InfbZ9*ktCSD*$QY?*9OFcbx@N8<lr=dhe{IHK_tg
zaZQs`TCKJAUO~uT^mh$pX|MaMxfa%Z6?Ke3MBsJ5uf`e!79+8IF{t)^iTVZJ_eoNE
zpDuy-A$_M<o8>@tM@}f$t0>ju%A`)rOy->L%M=mZ_q~Gpr3G5=$S!6VdR5oVm~-+x
e&!Vcj-K{_B#`_4VfZ~?`0000<MNUMnLSTY&a+8?=

literal 0
HcmV?d00001

diff --git a/assets/hbm/textures/gui/gui_safe.png b/assets/hbm/textures/gui/gui_safe.png
new file mode 100644
index 0000000000000000000000000000000000000000..05f9aa1556f2b67b607482bb83c99d6d78b28a3f
GIT binary patch
literal 1129
zcmeAS@N?(olHy`uVBq!ia0y~yU<5K5893O0R7}x|G$6%N?Bp530R%N1DIGwrf~SjP
zNX4ADcMbh+7f2j?cz#8;-vnD{v1KwU+|y4S3fxsNZ%(7?q*?~O1B{mzF3noVyQQ!5
zf93pi=7suUE%jZxKfS~4byoGU@>Z;SrB};yebMS)b)W9PFPm;B_G7|&etx9_HFLkZ
zsN(H+e;uh(i;w&N=;h0oLdO~9uYIq*yYBke3JaN9A&KYDuFKE)GvVp8zxIslrZPAf
zFg7GGF&t!JXyRmG5oX{}V-WCRP?!OixM#y_k^cK{-It!LS)qpwW)vr#E7~bz+iqqe
z+OX>V{{_i8X0xT*4$cuSwh^6mSQV=oI1Qh5i+w}X+N{ktXBdB!DFT|9DB+gBxANwk
z<a76*-{6?CcqK!~O^z>;#W^ge9?Fqyw!!wZme;M?Wqer^@@5yWEA8ubu$;x^FtyiV
zzTt7V1v2j#33?yd>1$TjG8EsQQ@pnL#6{gzecyM-hE8=AFj@Hi_o`J@HZrevuG;<K
zp~+cd!(hYYe&+Yze_z!9@M-VYXEQ$UFP?V#=?lw0H+TPLc=iP-lydIlj9(=&Oe8t-
z%@ezZowfOUEoT<b@Y}w^>fZaZ(9nD_{Tm!9=VYGkxyNzkdu?c_tsLLin5(^Y6BEps
zW*YytG-L8TZi^ZD$i7EO6+nrbKm*@AH;|QXJTvpJjCA9&WaSB#o98DhUnsf5j6Y4G
z8{6yf>`WcsWy_s{9M4X;E%;o>2}_XHmBJUo5{jQ0JpUS&aPByenPz|d?8}!sSV*&B
z?E$b28%1Y4yTMgsr^g6M;R`hN<^NmuuUnNBSi0wS-rk)iM{OHE*6pk8UiJ8GRqe^-
yM*iYY^N;7}KUnmtVkL89{lh2hz^qLJpm5OK;uLF_c)i;mkm;VTelF{r5}E+MRdUh*

literal 0
HcmV?d00001

diff --git a/assets/hbm/textures/items/gas_mask_filter.png b/assets/hbm/textures/items/gas_mask_filter.png
new file mode 100644
index 0000000000000000000000000000000000000000..b1393ea9fda45d91b44fa6e661d533871724859b
GIT binary patch
literal 289
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`EX7WqAsj$Z!;#Vf<lpdgaSXBO
zeH*lwt0_R_Uygv5RFGhwH~$4@3u`X{7RN7B90hvM+BWbjG&Ze}4EnyPnRija=O|}q
z?{v#M@8`T{KgarS=^kmTb+LPsmOqYs@P*4_UF^(h7xyhzXv>uBXo?V!JaJ<7+o%G)
zipcLFZ{KinN+nH+y|6=kkIS@s2~lh{`Ui8?aceFC3P0vy*f+hQ<3V-j26YaDa|bLY
za|sC^GGGz>%6(#$&TElXVGSJ%vRVzM$0hEJ3bE`roYxceW}f|lbzE(iUwsz+w!1l`
j!tA>BjqCC+zkg*h=L&V1%dWf(=tl-mS3j3^P6<r_)WmSA

literal 0
HcmV?d00001

diff --git a/assets/hbm/textures/items/pin.png b/assets/hbm/textures/items/pin.png
new file mode 100644
index 0000000000000000000000000000000000000000..a7257d7504b3f1dfb086a74b794f08db5327eb56
GIT binary patch
literal 130
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`EX7WqAsj$Z!;#Vf<Xd{WIEGmC
zCMQUgBvkc0{{Paj?|=J3$Io0!8>J4ptYNgjzvqCK-xkIl2UakCF=7apQn<wsli8rf
az_2h?eD&sOLHmJ*FnGH9xvX<aXaWF{PA9|w

literal 0
HcmV?d00001

diff --git a/com/hbm/blocks/ModBlocks.java b/com/hbm/blocks/ModBlocks.java
index 2fae4ec01..33bbcf07f 100644
--- a/com/hbm/blocks/ModBlocks.java
+++ b/com/hbm/blocks/ModBlocks.java
@@ -226,6 +226,9 @@ public class ModBlocks {
 	public static Block crate_steel;
 	public static final int guiID_crate_steel = 47;
 	
+	public static Block safe;
+	public static final int guiID_safe = 70;
+	
 	public static Block nuke_gadget;
 	public static final int guiID_nuke_gadget = 3;
 
@@ -910,6 +913,7 @@ public class ModBlocks {
 		crate_red = new BlockCrate(Material.iron).setBlockName("crate_red").setStepSound(Block.soundTypeMetal).setHardness(5.0F).setResistance(10.0F).setCreativeTab(null).setBlockTextureName(RefStrings.MODID + ":crate_red");
 		crate_iron = new BlockStorageCrate(Material.iron).setBlockName("crate_iron").setStepSound(Block.soundTypeMetal).setHardness(5.0F).setResistance(10.0F).setCreativeTab(MainRegistry.machineTab);
 		crate_steel = new BlockStorageCrate(Material.iron).setBlockName("crate_steel").setStepSound(Block.soundTypeMetal).setHardness(5.0F).setResistance(10.0F).setCreativeTab(MainRegistry.machineTab);
+		safe = new BlockStorageCrate(Material.iron).setBlockName("safe").setStepSound(Block.soundTypeMetal).setHardness(7.5F).setResistance(10000.0F).setCreativeTab(MainRegistry.machineTab);
 		
 		boxcar = new DecoBlock(Material.iron).setBlockName("boxcar").setStepSound(Block.soundTypeMetal).setHardness(10.0F).setResistance(10.0F).setCreativeTab(MainRegistry.blockTab).setBlockTextureName(RefStrings.MODID + ":boxcar");
 		bomber = new DecoBlock(Material.iron).setBlockName("bomber").setStepSound(Block.soundTypeMetal).setHardness(10.0F).setResistance(10.0F).setCreativeTab(null).setBlockTextureName(RefStrings.MODID + ":bomber");
@@ -1233,6 +1237,7 @@ public class ModBlocks {
 		//Crates
 		GameRegistry.registerBlock(crate_iron, crate_iron.getUnlocalizedName());
 		GameRegistry.registerBlock(crate_steel, crate_steel.getUnlocalizedName());
+		GameRegistry.registerBlock(safe, safe.getUnlocalizedName());
 		
 		//Junk
 		GameRegistry.registerBlock(boxcar, boxcar.getUnlocalizedName());
diff --git a/com/hbm/blocks/generic/BlockStorageCrate.java b/com/hbm/blocks/generic/BlockStorageCrate.java
index 86c7692e1..0e91ac1f2 100644
--- a/com/hbm/blocks/generic/BlockStorageCrate.java
+++ b/com/hbm/blocks/generic/BlockStorageCrate.java
@@ -9,7 +9,9 @@ import com.hbm.main.MainRegistry;
 import com.hbm.tileentity.machine.TileEntityCrateIron;
 import com.hbm.tileentity.machine.TileEntityCrateSteel;
 import com.hbm.tileentity.machine.TileEntityLockableBase;
+import com.hbm.tileentity.machine.TileEntityMachineCoal;
 import com.hbm.tileentity.machine.TileEntityMachineOilWell;
+import com.hbm.tileentity.machine.TileEntitySafe;
 
 import cpw.mods.fml.common.network.internal.FMLNetworkHandler;
 import cpw.mods.fml.relauncher.Side;
@@ -18,6 +20,7 @@ import net.minecraft.block.Block;
 import net.minecraft.block.BlockContainer;
 import net.minecraft.block.material.Material;
 import net.minecraft.client.renderer.texture.IIconRegister;
+import net.minecraft.entity.EntityLivingBase;
 import net.minecraft.entity.item.EntityItem;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.inventory.ISidedInventory;
@@ -25,6 +28,7 @@ import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.util.IIcon;
+import net.minecraft.util.MathHelper;
 import net.minecraft.world.World;
 
 public class BlockStorageCrate extends BlockContainer {
@@ -53,11 +57,20 @@ public class BlockStorageCrate extends BlockContainer {
 			this.iconTop = iconRegister.registerIcon(RefStrings.MODID + ":crate_steel_top");
 			this.blockIcon = iconRegister.registerIcon(RefStrings.MODID + ":crate_steel_side");
 		}
+		if(this == ModBlocks.safe)
+		{
+			this.iconTop = iconRegister.registerIcon(RefStrings.MODID + ":safe_front");
+			this.blockIcon = iconRegister.registerIcon(RefStrings.MODID + ":safe_side");
+		}
 	}
 
 	@Override
 	@SideOnly(Side.CLIENT)
 	public IIcon getIcon(int side, int metadata) {
+		
+		if(this == ModBlocks.safe)
+			return metadata == 0 && side == 3 ? this.iconTop : (side == metadata ? this.iconTop : this.blockIcon);
+		
 		return side == 1 ? this.iconTop : (side == 0 ? this.iconTop : this.blockIcon);
 	}
 
@@ -67,6 +80,8 @@ public class BlockStorageCrate extends BlockContainer {
 			return new TileEntityCrateIron();
 		if(this == ModBlocks.crate_steel)
 			return new TileEntityCrateSteel();
+		if(this == ModBlocks.safe)
+			return new TileEntitySafe();
 		return null;
 	}
 	
@@ -147,10 +162,40 @@ public class BlockStorageCrate extends BlockContainer {
 			{
 				FMLNetworkHandler.openGui(player, MainRegistry.instance, ModBlocks.guiID_crate_steel, world, x, y, z);
 			}
+			if(entity instanceof TileEntitySafe && ((TileEntitySafe)entity).canAccess(player))
+			{
+				FMLNetworkHandler.openGui(player, MainRegistry.instance, ModBlocks.guiID_safe, world, x, y, z);
+			}
 			return true;
 		} else {
 			return false;
 		}
 	}
+	
+	@Override
+	public void onBlockPlacedBy(World world, int x, int y, int z, EntityLivingBase player, ItemStack itemStack) {
+		
+		if(this != ModBlocks.safe)
+			super.onBlockPlacedBy(world, x, y, z, player, itemStack);
+		
+		int i = MathHelper.floor_double(player.rotationYaw * 4.0F / 360.0F + 0.5D) & 3;
+		
+		if(i == 0)
+		{
+			world.setBlockMetadataWithNotify(x, y, z, 2, 2);
+		}
+		if(i == 1)
+		{
+			world.setBlockMetadataWithNotify(x, y, z, 5, 2);
+		}
+		if(i == 2)
+		{
+			world.setBlockMetadataWithNotify(x, y, z, 3, 2);
+		}
+		if(i == 3)
+		{
+			world.setBlockMetadataWithNotify(x, y, z, 4, 2);
+		}
+	}
 
 }
diff --git a/com/hbm/handler/GUIHandler.java b/com/hbm/handler/GUIHandler.java
index 3e46aa2c7..0c14d9851 100644
--- a/com/hbm/handler/GUIHandler.java
+++ b/com/hbm/handler/GUIHandler.java
@@ -72,6 +72,7 @@ import com.hbm.tileentity.machine.TileEntityRadiobox;
 import com.hbm.tileentity.machine.TileEntityReactorMultiblock;
 import com.hbm.tileentity.machine.TileEntityReiXMainframe;
 import com.hbm.tileentity.machine.TileEntityRtgFurnace;
+import com.hbm.tileentity.machine.TileEntitySafe;
 import com.hbm.tileentity.machine.TileEntityMachineSatLinker;
 import com.hbm.tileentity.machine.TileEntityWatzCore;
 
@@ -698,6 +699,15 @@ public class GUIHandler implements IGuiHandler {
 				}
 				return null;
 			}
+
+			case ModBlocks.guiID_safe:
+			{
+				if(entity instanceof TileEntitySafe)
+				{
+					return new ContainerSafe(player.inventory, (TileEntitySafe) entity);
+				}
+				return null;
+			}
 		}
 		return null;
 	}
@@ -1320,6 +1330,15 @@ public class GUIHandler implements IGuiHandler {
 					}
 					return null;
 				}
+				
+				case ModBlocks.guiID_safe:
+				{
+					if(entity instanceof TileEntitySafe)
+					{
+						return new GUISafe(player.inventory, (TileEntitySafe) entity);
+					}
+					return null;
+				}
 			}
 		} else {
 			//CLIENTONLY GUIS
diff --git a/com/hbm/inventory/container/ContainerSafe.java b/com/hbm/inventory/container/ContainerSafe.java
new file mode 100644
index 000000000..91f13f804
--- /dev/null
+++ b/com/hbm/inventory/container/ContainerSafe.java
@@ -0,0 +1,80 @@
+package com.hbm.inventory.container;
+
+import com.hbm.tileentity.machine.TileEntityCrateSteel;
+import com.hbm.tileentity.machine.TileEntitySafe;
+
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.entity.player.InventoryPlayer;
+import net.minecraft.inventory.Container;
+import net.minecraft.inventory.Slot;
+import net.minecraft.item.ItemStack;
+
+public class ContainerSafe extends Container {
+	
+	private TileEntitySafe diFurnace;
+	
+	public ContainerSafe(InventoryPlayer invPlayer, TileEntitySafe tedf) {
+		diFurnace = tedf;
+		
+		for(int i = 0; i < 3; i++)
+		{
+			for(int j = 0; j < 5; j++)
+			{
+				this.addSlotToContainer(new Slot(tedf, j + i * 5, 8 + j * 18 + 18 * 2, 18 + i * 18));
+			}
+		}
+		
+		for(int i = 0; i < 3; i++)
+		{
+			for(int j = 0; j < 9; j++)
+			{
+				this.addSlotToContainer(new Slot(invPlayer, j + i * 9 + 9, 8 + j * 18, 84 + i * 18 + 2));
+			}
+		}
+		
+		for(int i = 0; i < 9; i++)
+		{
+			this.addSlotToContainer(new Slot(invPlayer, i, 8 + i * 18, 142 + 2));
+		}
+	}
+	
+	@Override
+    public ItemStack transferStackInSlot(EntityPlayer p_82846_1_, int par2)
+    {
+		ItemStack var3 = null;
+		Slot var4 = (Slot) this.inventorySlots.get(par2);
+		
+		if (var4 != null && var4.getHasStack())
+		{
+			ItemStack var5 = var4.getStack();
+			var3 = var5.copy();
+			
+            if (par2 <= diFurnace.getSizeInventory() - 1) {
+				if (!this.mergeItemStack(var5, diFurnace.getSizeInventory(), this.inventorySlots.size(), true))
+				{
+					return null;
+				}
+			}
+			else if (!this.mergeItemStack(var5, 0, diFurnace.getSizeInventory(), false))
+			{
+					return null;
+			}
+			
+			if (var5.stackSize == 0)
+			{
+				var4.putStack((ItemStack) null);
+			}
+			else
+			{
+				var4.onSlotChanged();
+			}
+		}
+		
+		return var3;
+    }
+
+	@Override
+	public boolean canInteractWith(EntityPlayer player) {
+		return diFurnace.isUseableByPlayer(player);
+	}
+}
diff --git a/com/hbm/inventory/gui/GUISafe.java b/com/hbm/inventory/gui/GUISafe.java
new file mode 100644
index 000000000..3b6fbac0c
--- /dev/null
+++ b/com/hbm/inventory/gui/GUISafe.java
@@ -0,0 +1,44 @@
+package com.hbm.inventory.gui;
+
+import org.lwjgl.opengl.GL11;
+
+import com.hbm.inventory.container.ContainerCrateSteel;
+import com.hbm.inventory.container.ContainerSafe;
+import com.hbm.lib.RefStrings;
+import com.hbm.tileentity.machine.TileEntityCrateSteel;
+import com.hbm.tileentity.machine.TileEntitySafe;
+
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.gui.inventory.GuiContainer;
+import net.minecraft.client.resources.I18n;
+import net.minecraft.entity.player.InventoryPlayer;
+import net.minecraft.util.ResourceLocation;
+
+public class GUISafe extends GuiContainer {
+
+	private static ResourceLocation texture = new ResourceLocation(RefStrings.MODID + ":textures/gui/gui_safe.png");
+	private TileEntitySafe diFurnace;
+	
+	public GUISafe(InventoryPlayer invPlayer, TileEntitySafe tedf) {
+		super(new ContainerSafe(invPlayer, tedf));
+		diFurnace = tedf;
+
+		this.xSize = 176;
+		this.ySize = 168;
+	}
+	
+	@Override
+	protected void drawGuiContainerForegroundLayer(int i, int j) {
+		String name = this.diFurnace.hasCustomInventoryName() ? this.diFurnace.getInventoryName() : I18n.format(this.diFurnace.getInventoryName());
+		
+		this.fontRendererObj.drawString(name, this.xSize / 2 - this.fontRendererObj.getStringWidth(name) / 2, 6, 4210752);
+		this.fontRendererObj.drawString(I18n.format("container.inventory"), 8, this.ySize - 96 + 2, 4210752);
+	}
+	
+	@Override
+	protected void drawGuiContainerBackgroundLayer(float p_146976_1_, int p_146976_2_, int p_146976_3_) {
+		GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F);
+		Minecraft.getMinecraft().getTextureManager().bindTexture(texture);
+		drawTexturedModalRect(guiLeft, guiTop, 0, 0, xSize, ySize);
+	}
+}
diff --git a/com/hbm/items/ModItems.java b/com/hbm/items/ModItems.java
index e60eb0971..1ad6035aa 100644
--- a/com/hbm/items/ModItems.java
+++ b/com/hbm/items/ModItems.java
@@ -525,6 +525,7 @@ public class ModItems {
 	public static Item pill_iodine;
 	public static Item plan_c;
 	public static Item stealth_boy;
+	public static Item gas_mask_filter;
 
 	public static Item can_empty;
 	public static Item can_smart;
@@ -1190,6 +1191,7 @@ public class ModItems {
 
 	public static Item key;
 	public static Item key_red;
+	public static Item pin;
 	public static Item padlock;
 
 	public static Item turret_light_ammo;
@@ -1794,6 +1796,7 @@ public class ModItems {
 		pill_iodine = new ItemPill(0).setUnlocalizedName("pill_iodine").setCreativeTab(MainRegistry.consumableTab).setTextureName(RefStrings.MODID + ":pill_iodine");
 		plan_c = new ItemPill(0).setUnlocalizedName("plan_c").setCreativeTab(MainRegistry.consumableTab).setTextureName(RefStrings.MODID + ":plan_c");
 		stealth_boy = new ItemStarterKit().setUnlocalizedName("stealth_boy").setCreativeTab(MainRegistry.consumableTab).setTextureName(RefStrings.MODID + ":stealth_boy");
+		gas_mask_filter = new ItemSyringe().setUnlocalizedName("gas_mask_filter").setMaxStackSize(1).setCreativeTab(MainRegistry.consumableTab).setTextureName(RefStrings.MODID + ":gas_mask_filter");
 
 		can_empty = new Item().setUnlocalizedName("can_empty").setCreativeTab(MainRegistry.consumableTab).setTextureName(RefStrings.MODID + ":can_empty");
 		can_smart = new ItemEnergy().setUnlocalizedName("can_smart").setContainerItem(ModItems.can_empty).setCreativeTab(MainRegistry.consumableTab).setTextureName(RefStrings.MODID + ":can_smart");
@@ -2310,6 +2313,7 @@ public class ModItems {
 
 		key = new ItemKey().setUnlocalizedName("key").setMaxStackSize(1).setCreativeTab(MainRegistry.consumableTab).setTextureName(RefStrings.MODID + ":key");
 		key_red = new Item().setUnlocalizedName("key_red").setMaxStackSize(1).setCreativeTab(null).setTextureName(RefStrings.MODID + ":key_red");
+		pin = new ItemCustomLore().setUnlocalizedName("pin").setMaxStackSize(8).setCreativeTab(MainRegistry.consumableTab).setTextureName(RefStrings.MODID + ":pin");
 		padlock = new ItemLock().setUnlocalizedName("padlock").setMaxStackSize(1).setCreativeTab(MainRegistry.consumableTab).setTextureName(RefStrings.MODID + ":padlock");
 
 		turret_light_ammo = new ItemTurretAmmo(ModBlocks.turret_light, 100).setUnlocalizedName("turret_light_ammo").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":turret_light_ammo");
@@ -3365,6 +3369,7 @@ public class ModItems {
 		//Keys and Locks
 		GameRegistry.registerItem(key, key.getUnlocalizedName());
 		GameRegistry.registerItem(key_red, key_red.getUnlocalizedName());
+		GameRegistry.registerItem(pin, pin.getUnlocalizedName());
 		GameRegistry.registerItem(padlock, padlock.getUnlocalizedName());
 		
 		//Missiles
@@ -3650,6 +3655,7 @@ public class ModItems {
 		GameRegistry.registerItem(pill_iodine, pill_iodine.getUnlocalizedName());
 		GameRegistry.registerItem(plan_c, plan_c.getUnlocalizedName());
 		GameRegistry.registerItem(stealth_boy, stealth_boy.getUnlocalizedName());
+		GameRegistry.registerItem(gas_mask_filter, gas_mask_filter.getUnlocalizedName());
 		
 		//Food
 		GameRegistry.registerItem(bomb_waffle, bomb_waffle.getUnlocalizedName());
diff --git a/com/hbm/items/special/ItemCustomLore.java b/com/hbm/items/special/ItemCustomLore.java
index 097e0ff59..d259f914f 100644
--- a/com/hbm/items/special/ItemCustomLore.java
+++ b/com/hbm/items/special/ItemCustomLore.java
@@ -3,6 +3,7 @@ package com.hbm.items.special;
 import java.util.List;
 
 import com.hbm.items.ModItems;
+import com.hbm.lib.Library;
 import com.hbm.main.MainRegistry;
 
 import cpw.mods.fml.relauncher.Side;
@@ -636,6 +637,16 @@ public class ItemCustomLore extends ItemRadioactive {
 			list.add("Schrabidium +15");
 			list.add("Removes fallout");
 		}
+		
+		if(this == ModItems.pin)
+		{
+			list.add("Can be used with a screwdriver to pick locks.");
+			
+			if(Library.checkArmorPiece(player, ModItems.jackt, 2) || Library.checkArmorPiece(player, ModItems.jackt2, 2))
+				list.add("Success rate of lockpicking is 100%!");
+			else
+				list.add("Success rate of lockpicking is ~10%");
+		}
 	}
 
     @Override
diff --git a/com/hbm/items/special/ItemSyringe.java b/com/hbm/items/special/ItemSyringe.java
index c1766990d..78fd31b4a 100644
--- a/com/hbm/items/special/ItemSyringe.java
+++ b/com/hbm/items/special/ItemSyringe.java
@@ -230,6 +230,17 @@ public class ItemSyringe extends Item {
         	}
 		}
 		
+		if(this == ModItems.gas_mask_filter && player.inventory.armorInventory[3] != null &&
+				(player.inventory.armorInventory[3].getItem() == ModItems.gas_mask || player.inventory.armorInventory[3].getItem() == ModItems.gas_mask_m65))
+		{
+            if (!world.isRemote)
+            {
+            	player.inventory.armorInventory[3].setItemDamage(0);
+            
+            	stack.stackSize--;
+            }
+		}
+		
 		return stack;
 	}
 
@@ -484,5 +495,8 @@ public class ItemSyringe extends Item {
 			list.add("Nausea I for 5 seconds");
 			list.add("Cloud damage + taint = tainted heart effect");
 		}
+		if(this == ModItems.gas_mask_filter) {
+			list.add("Repairs worn gasmask");
+		}
 	}
 }
diff --git a/com/hbm/lib/HbmChestContents.java b/com/hbm/lib/HbmChestContents.java
index b3d15572d..6fa674809 100644
--- a/com/hbm/lib/HbmChestContents.java
+++ b/com/hbm/lib/HbmChestContents.java
@@ -36,7 +36,8 @@ public class HbmChestContents {
 			new WeightedRandomChestContent(ModItems.cap_nuka, 0, 1, 15, 7),
 			new WeightedRandomChestContent(ModItems.canister_fuel, 0, 1, 2, 2),
 			new WeightedRandomChestContent(ModItems.canister_biofuel, 0, 1, 2, 3),
-			new WeightedRandomChestContent(ModItems.gas_mask_m65, 60, 1, 1, 2)  };
+			new WeightedRandomChestContent(ModItems.gas_mask_m65, 60, 1, 1, 2),
+			new WeightedRandomChestContent(ModItems.gas_mask_filter, 0, 1, 1, 3)  };
 
 	private static WeightedRandomChestContent[] antenna = new WeightedRandomChestContent[] {
 			new WeightedRandomChestContent(ModItems.ingot_steel, 0, 1, 2, 7),
@@ -61,7 +62,8 @@ public class HbmChestContents {
 			new WeightedRandomChestContent(ModItems.bottle_cherry, 0, 1, 1, 2),
 			new WeightedRandomChestContent(ModItems.stealth_boy, 0, 1, 1, 1),
 			new WeightedRandomChestContent(ModItems.cap_nuka, 0, 1, 15, 7),
-			new WeightedRandomChestContent(ModItems.bomb_caller, 0, 1, 2, 1) };
+			new WeightedRandomChestContent(ModItems.bomb_caller, 0, 1, 2, 1),
+			new WeightedRandomChestContent(ModItems.gas_mask_filter, 0, 1, 1, 2) };
 
 	private static WeightedRandomChestContent[] expensive = new WeightedRandomChestContent[] {
 			new WeightedRandomChestContent(ModItems.nugget_schrabidium, 0, 1, 1, 1),
@@ -98,7 +100,8 @@ public class HbmChestContents {
 			new WeightedRandomChestContent(ModItems.bomb_caller, 1, 1, 2, 1),
 			new WeightedRandomChestContent(ModItems.bomb_caller, 2, 1, 2, 1),
 			new WeightedRandomChestContent(ModItems.bomb_caller, 3, 1, 2, 2),
-			new WeightedRandomChestContent(ModItems.bomb_caller, 4, 1, 2, 1) };
+			new WeightedRandomChestContent(ModItems.bomb_caller, 4, 1, 2, 1),
+			new WeightedRandomChestContent(ModItems.gas_mask_filter, 0, 1, 1, 4) };
 
 	private static WeightedRandomChestContent[] nukeTrash = new WeightedRandomChestContent[] {
 			new WeightedRandomChestContent(ModItems.nugget_u238, 0, 3, 12, 5),
@@ -113,6 +116,7 @@ public class HbmChestContents {
 			new WeightedRandomChestContent(ModItems.rod_quad_pu240, 0, 1, 1, 3),
 			new WeightedRandomChestContent(ModItems.bottle_quantum, 0, 1, 1, 1),
 			new WeightedRandomChestContent(ModItems.gas_mask_m65, 60, 1, 1, 5),
+			new WeightedRandomChestContent(ModItems.gas_mask_filter, 0, 1, 1, 5),
 			new WeightedRandomChestContent(Item.getItemFromBlock(ModBlocks.yellow_barrel), 0, 1, 1, 2) };
 
 	private static WeightedRandomChestContent[] nuclear = new WeightedRandomChestContent[] {
@@ -141,6 +145,7 @@ public class HbmChestContents {
 			new WeightedRandomChestContent(ModItems.powder_cobalt, 0, 1, 1, 1),
 			new WeightedRandomChestContent(ModItems.bottle_quantum, 0, 1, 1, 1),
 			new WeightedRandomChestContent(ModItems.gas_mask_m65, 60, 1, 1, 5),
+			new WeightedRandomChestContent(ModItems.gas_mask_filter, 0, 1, 1, 5),
 			new WeightedRandomChestContent(Item.getItemFromBlock(ModBlocks.yellow_barrel), 0, 1, 3, 3) };
 
 	private static WeightedRandomChestContent[] vertibird = new WeightedRandomChestContent[] {
@@ -164,6 +169,7 @@ public class HbmChestContents {
 			new WeightedRandomChestContent(ModItems.stealth_boy, 0, 1, 1, 7),
 			new WeightedRandomChestContent(ModItems.crate_caller, 0, 1, 1, 3),
 			new WeightedRandomChestContent(ModItems.gas_mask_m65, 0, 1, 1, 5),
+			new WeightedRandomChestContent(ModItems.gas_mask_filter, 0, 1, 1, 5),
 			new WeightedRandomChestContent(ModItems.grenade_nuclear, 0, 1, 2, 2),
 			new WeightedRandomChestContent(ModItems.bomb_caller, 0, 1, 2, 3),
 			new WeightedRandomChestContent(ModItems.bomb_caller, 1, 1, 2, 3),
diff --git a/com/hbm/main/CraftingManager.java b/com/hbm/main/CraftingManager.java
index 09c4eff9f..2c33da46d 100644
--- a/com/hbm/main/CraftingManager.java
+++ b/com/hbm/main/CraftingManager.java
@@ -1077,8 +1077,9 @@ public class CraftingManager {
 		//GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.australium_v, 1), new Object[] { "SCS", "PAP", "ESE", 'S', ModItems.syringe_metal_empty, 'C', ModItems.circuit_gold, 'P', "plateAdvanced", 'A', ModItems.nugget_australium, 'E', ModItems.powder_power }));
 
 		GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.goggles, 1), new Object[] { "P P", "GPG", 'G', "paneGlass", 'P', "plateSteel" }));
-		GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.gas_mask, 1), new Object[] { "PPP", "GPG", "FPF", 'G', "paneGlass", 'P', "plateSteel", 'F', ModItems.filter_coal }));
-		GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.gas_mask_m65, 1), new Object[] { "PPP", "GPG", "FIF", 'G', "paneGlass", 'P', ModItems.plate_polymer, 'F', ModItems.filter_coal, 'I', "plateIron" }));
+		GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.gas_mask, 1), new Object[] { "PPP", "GPG", " F ", 'G', "paneGlass", 'P', "plateSteel", 'F', ModItems.gas_mask_filter }));
+		GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.gas_mask_m65, 1), new Object[] { "PPP", "GPG", " F ", 'G', "paneGlass", 'P', ModItems.plate_polymer, 'F', ModItems.gas_mask_filter }));
+		GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.gas_mask_filter, 1), new Object[] { "F", "I", "F", 'F', ModItems.filter_coal, 'I', "plateIron" }));
 
 		GameRegistry.addRecipe(new ItemStack(ModItems.cape_radiation, 1), new Object[] { "W W", "WIW", "WDW", 'W', new ItemStack(Item.getItemFromBlock(Blocks.wool), 1, 11), 'D', new ItemStack(Items.dye, 1, 11), 'I', ModItems.nuclear_waste });
 		GameRegistry.addRecipe(new ItemStack(ModItems.cape_gasmask, 1), new Object[] { "W W", "WIW", "WDW", 'W', new ItemStack(Item.getItemFromBlock(Blocks.wool), 1, 4), 'D', new ItemStack(Items.dye, 1, 0), 'I', ModItems.gas_mask });
@@ -1111,6 +1112,7 @@ public class CraftingManager {
 
 		GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.key, 1), new Object[] { "  B", " B ", "P  ", 'P', "plateSteel", 'B', ModItems.bolt_tungsten }));
 		GameRegistry.addRecipe(new ItemStack(ModItems.key_red, 1), new Object[] { "  C", " M ", "K  ", 'C', ModItems.circuit_targeting_tier4, 'M', ModItems.motor, 'K', ModItems.key });
+		GameRegistry.addRecipe(new ItemStack(ModItems.pin, 1), new Object[] { "W ", " W", " W", 'W', ModItems.wire_copper });
 		GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.padlock, 1), new Object[] { " P ", "PBP", "PPP", 'P', "plateSteel", 'B', ModItems.bolt_tungsten }));
 		
 		//GameRegistry.addRecipe(new ItemStack(ModItems.schrabidium_hammer, 1), new Object[] { "BBB", "BBB", " S ", 'B', Item.getItemFromBlock(ModBlocks.block_schrabidium), 'S', Items.stick });
diff --git a/com/hbm/main/MainRegistry.java b/com/hbm/main/MainRegistry.java
index a4e442770..6404e640b 100644
--- a/com/hbm/main/MainRegistry.java
+++ b/com/hbm/main/MainRegistry.java
@@ -300,6 +300,7 @@ import com.hbm.tileentity.machine.TileEntityRadioRec;
 import com.hbm.tileentity.machine.TileEntityRadiobox;
 import com.hbm.tileentity.machine.TileEntityReactorMultiblock;
 import com.hbm.tileentity.machine.TileEntityRtgFurnace;
+import com.hbm.tileentity.machine.TileEntitySafe;
 import com.hbm.tileentity.machine.TileEntityMachineSatLinker;
 import com.hbm.tileentity.machine.TileEntityStructureMarker;
 import com.hbm.tileentity.machine.TileEntityVaultDoor;
@@ -696,6 +697,7 @@ public class MainRegistry
 		GameRegistry.registerTileEntity(TileEntitySellafield.class, "tileentity_sellafield_core");
 		GameRegistry.registerTileEntity(TileEntityNukeN45.class, "tileentity_n45");
 		GameRegistry.registerTileEntity(TileEntityBlastDoor.class, "tileentity_blast_door");
+		GameRegistry.registerTileEntity(TileEntitySafe.class, "tileentity_safe");
 
 	    EntityRegistry.registerModEntity(EntityRocket.class, "entity_rocket", 0, this, 250, 1, true);
 	    EntityRegistry.registerModEntity(EntityNukeExplosion.class, "entity_nuke_explosion", 1, this, 250, 1, true);
diff --git a/com/hbm/tileentity/machine/TileEntityLockableBase.java b/com/hbm/tileentity/machine/TileEntityLockableBase.java
index 7bf0311b8..be5c40a27 100644
--- a/com/hbm/tileentity/machine/TileEntityLockableBase.java
+++ b/com/hbm/tileentity/machine/TileEntityLockableBase.java
@@ -2,6 +2,7 @@ package com.hbm.tileentity.machine;
 
 import com.hbm.items.ModItems;
 import com.hbm.items.tool.ItemKey;
+import com.hbm.lib.Library;
 import com.hbm.main.MainRegistry;
 
 import net.minecraft.entity.player.EntityPlayer;
@@ -65,6 +66,33 @@ public abstract class TileEntityLockableBase extends TileEntity {
 	        	worldObj.playSoundAtEntity(player, "hbm:block.lockOpen", 1.0F, 1.0F);
 				return true;
 			}
+			
+			if(stack != null && stack.getItem() == ModItems.pin && player.inventory.hasItem(ModItems.screwdriver)) {
+				
+				stack.stackSize--;
+	        	
+	        	if(player.worldObj.rand.nextInt(10) == 0 || Library.checkArmorPiece(player, ModItems.jackt, 2) || Library.checkArmorPiece(player, ModItems.jackt2, 2)) {
+	        		worldObj.playSoundAtEntity(player, "hbm:item.pinUnlock", 1.0F, 1.0F);
+					return true;
+	        	} else {
+	        		worldObj.playSoundAtEntity(player, "hbm:item.pinBreak", 1.0F, 0.8F + player.worldObj.rand.nextFloat() * 0.2F);
+	        		return false;
+	        	}
+			}
+			
+			if(stack != null && stack.getItem() == ModItems.screwdriver && player.inventory.hasItem(ModItems.pin)) {
+				
+				player.inventory.consumeInventoryItem(ModItems.pin);
+				player.inventoryContainer.detectAndSendChanges();
+	        	
+	        	if(player.worldObj.rand.nextInt(10) == 0 || Library.checkArmorPiece(player, ModItems.jackt, 2) || Library.checkArmorPiece(player, ModItems.jackt2, 2)) {
+	        		worldObj.playSoundAtEntity(player, "hbm:item.pinUnlock", 1.0F, 1.0F);
+					return true;
+	        	} else {
+	        		worldObj.playSoundAtEntity(player, "hbm:item.pinBreak", 1.0F, 0.8F + player.worldObj.rand.nextFloat() * 0.2F);
+	        		return false;
+	        	}
+			}
 		}
 		
 		return false;
diff --git a/com/hbm/tileentity/machine/TileEntitySafe.java b/com/hbm/tileentity/machine/TileEntitySafe.java
new file mode 100644
index 000000000..3af01a068
--- /dev/null
+++ b/com/hbm/tileentity/machine/TileEntitySafe.java
@@ -0,0 +1,160 @@
+package com.hbm.tileentity.machine;
+
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.inventory.ISidedInventory;
+import net.minecraft.item.ItemStack;
+import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.nbt.NBTTagList;
+import net.minecraft.tileentity.TileEntity;
+
+public class TileEntitySafe extends TileEntityLockableBase implements ISidedInventory {
+
+	private ItemStack slots[];
+
+	private String customName;
+
+	public TileEntitySafe() {
+		slots = new ItemStack[15];
+	}
+
+	@Override
+	public int getSizeInventory() {
+		return slots.length;
+	}
+
+	@Override
+	public ItemStack getStackInSlot(int i) {
+		return slots[i];
+	}
+
+	@Override
+	public ItemStack getStackInSlotOnClosing(int i) {
+		if (slots[i] != null) {
+			ItemStack itemStack = slots[i];
+			slots[i] = null;
+			return itemStack;
+		} else {
+			return null;
+		}
+	}
+
+	@Override
+	public void setInventorySlotContents(int i, ItemStack itemStack) {
+		slots[i] = itemStack;
+		if (itemStack != null && itemStack.stackSize > getInventoryStackLimit()) {
+			itemStack.stackSize = getInventoryStackLimit();
+		}
+	}
+
+	@Override
+	public String getInventoryName() {
+		return this.hasCustomInventoryName() ? this.customName : "container.safe";
+	}
+
+	@Override
+	public boolean hasCustomInventoryName() {
+		return this.customName != null && this.customName.length() > 0;
+	}
+
+	public void setCustomName(String name) {
+		this.customName = name;
+	}
+
+	@Override
+	public int getInventoryStackLimit() {
+		return 64;
+	}
+
+	@Override
+	public boolean isUseableByPlayer(EntityPlayer player) {
+		if (worldObj.getTileEntity(xCoord, yCoord, zCoord) != this) {
+			return false;
+		} else {
+			return player.getDistanceSq(xCoord + 0.5D, yCoord + 0.5D, zCoord + 0.5D) <= 64;
+		}
+	}
+
+	// You scrubs aren't needed for anything (right now)
+	@Override
+	public void openInventory() {
+	}
+
+	@Override
+	public void closeInventory() {
+	}
+
+	@Override
+	public boolean isItemValidForSlot(int i, ItemStack stack) {
+		return true;
+	}
+
+	@Override
+	public ItemStack decrStackSize(int i, int j) {
+		if (slots[i] != null) {
+			if (slots[i].stackSize <= j) {
+				ItemStack itemStack = slots[i];
+				slots[i] = null;
+				return itemStack;
+			}
+			ItemStack itemStack1 = slots[i].splitStack(j);
+			if (slots[i].stackSize == 0) {
+				slots[i] = null;
+			}
+
+			return itemStack1;
+		} else {
+			return null;
+		}
+	}
+
+	@Override
+	public void readFromNBT(NBTTagCompound nbt) {
+		super.readFromNBT(nbt);
+		NBTTagList list = nbt.getTagList("items", 10);
+		
+		slots = new ItemStack[getSizeInventory()];
+
+		for (int i = 0; i < list.tagCount(); i++) {
+			NBTTagCompound nbt1 = list.getCompoundTagAt(i);
+			byte b0 = nbt1.getByte("slot");
+			if (b0 >= 0 && b0 < slots.length) {
+				slots[b0] = ItemStack.loadItemStackFromNBT(nbt1);
+			}
+		}
+	}
+
+	@Override
+	public void writeToNBT(NBTTagCompound nbt) {
+		super.writeToNBT(nbt);
+		
+		NBTTagList list = new NBTTagList();
+
+		for (int i = 0; i < slots.length; i++) {
+			if (slots[i] != null) {
+				NBTTagCompound nbt1 = new NBTTagCompound();
+				nbt1.setByte("slot", (byte) i);
+				slots[i].writeToNBT(nbt1);
+				list.appendTag(nbt1);
+			}
+		}
+		nbt.setTag("items", list);
+	}
+
+	@Override
+	public int[] getAccessibleSlotsFromSide(int p_94128_1_) {
+		int[] slots = new int[15];
+		for(int i = 0; i < slots.length; i++)
+			slots[i] = i;
+		return slots;
+	}
+
+	@Override
+	public boolean canInsertItem(int i, ItemStack itemStack, int j) {
+		return this.isItemValidForSlot(i, itemStack);
+	}
+
+	@Override
+	public boolean canExtractItem(int i, ItemStack itemStack, int j) {
+		return true;
+	}
+}
diff --git a/com/hbm/world/Relay.java b/com/hbm/world/Relay.java
index ebf1b35fb..b9d00fa58 100644
--- a/com/hbm/world/Relay.java
+++ b/com/hbm/world/Relay.java
@@ -7,6 +7,7 @@ import java.util.Random;
 import com.hbm.blocks.ModBlocks;
 import com.hbm.lib.HbmChestContents;
 import com.hbm.main.MainRegistry;
+import com.hbm.tileentity.machine.TileEntityCrateIron;
 
 import net.minecraft.block.Block;
 import net.minecraft.block.material.Material;
@@ -646,9 +647,9 @@ public class Relay extends WorldGenerator
 		world.setBlock(x + 10, y + 0, z + 9, Blocks.iron_bars, 0, 3);
 		world.setBlock(x + 0, y + 0, z + 10, Block3, 0, 3);
 		world.setBlock(x + 4, y + 0, z + 10, Blocks.brick_block, 0, 3);
-		world.setBlock(x + 6, y + 0, z + 10, Blocks.chest, 3, 3);
+		world.setBlock(x + 6, y + 0, z + 10, ModBlocks.crate_iron, 0, 3);
 		world.setBlockMetadataWithNotify(x + 6, y + 0, z + 10, 3, 3);
-        WeightedRandomChestContent.generateChestContents(rand, HbmChestContents.getLoot(1), (TileEntityChest)world.getTileEntity(x + 6, y + 0, z + 10), 8);
+        WeightedRandomChestContent.generateChestContents(rand, HbmChestContents.getLoot(1), (TileEntityCrateIron)world.getTileEntity(x + 6, y + 0, z + 10), 8);
 		world.setBlock(x + 7, y + 0, z + 10, Blocks.brick_block, 0, 3);
 		world.setBlock(x + 8, y + 0, z + 10, Blocks.brick_block, 0, 3);
 		world.setBlock(x + 10, y + 0, z + 10, Blocks.iron_bars, 0, 3);
@@ -1265,9 +1266,9 @@ public class Relay extends WorldGenerator
 		world.setBlock(x + 5, y + 14, z + 6, Block4, 2, 3);
 		world.setBlock(x + 6, y + 14, z + 6, Block2, 0, 3);
 		world.setBlock(x + 7, y + 14, z + 6, Block4, 2, 3);
-		world.setBlock(x + 8, y + 14, z + 6, Blocks.chest, 3, 3);
+		world.setBlock(x + 8, y + 14, z + 6, ModBlocks.crate_iron, 0, 3);
 		world.setBlockMetadataWithNotify(x + 8, y + 14, z + 6, 3, 3);
-        WeightedRandomChestContent.generateChestContents(rand, HbmChestContents.getLoot(2), (TileEntityChest)world.getTileEntity(x + 8, y + 14, z + 6), 8);
+        WeightedRandomChestContent.generateChestContents(rand, HbmChestContents.getLoot(2), (TileEntityCrateIron)world.getTileEntity(x + 8, y + 14, z + 6), 8);
 		world.setBlock(x + 9, y + 14, z + 6, Blocks.iron_bars, 0, 3);
 		world.setBlock(x + 10, y + 14, z + 6, Block6, 0, 3);
 		world.setBlock(x + 9, y + 14, z + 7, Blocks.iron_bars, 0, 3);
@@ -1485,9 +1486,9 @@ public class Relay extends WorldGenerator
 		world.setBlock(x + 6, y + 32, z + 1, Block7, 0, 3);
 		world.setBlock(x + 8, y + 32, z + 1, Block6, 0, 3);
 		world.setBlock(x + 5, y + 32, z + 2, Block6, 0, 3);
-		world.setBlock(x + 6, y + 32, z + 2, Blocks.chest, 2, 3);
+		world.setBlock(x + 6, y + 32, z + 2, ModBlocks.crate_iron, 0, 3);
 		world.setBlockMetadataWithNotify(x + 6, y + 32, z + 2, 2, 3);
-        WeightedRandomChestContent.generateChestContents(rand, HbmChestContents.getLoot(3), (TileEntityChest)world.getTileEntity(x + 6, y + 32, z + 2), 8);
+        WeightedRandomChestContent.generateChestContents(rand, HbmChestContents.getLoot(3), (TileEntityCrateIron)world.getTileEntity(x + 6, y + 32, z + 2), 8);
 		world.setBlock(x + 7, y + 32, z + 2, Block6, 0, 3);
 		world.setBlock(x + 5, y + 32, z + 3, Block4, 3, 3);
 		world.setBlock(x + 6, y + 32, z + 3, Block2, 0, 3);