From 959e5df8cf64099da2c40f696c8a2f794447ef50 Mon Sep 17 00:00:00 2001 From: skull132 Date: Mon, 7 Apr 2014 22:18:25 +0300 Subject: [PATCH] Crates Crate modification. --- code/modules/mining/abandonedcrates.dm | 42 +++++++++++++++----------- 1 file changed, 24 insertions(+), 18 deletions(-) diff --git a/code/modules/mining/abandonedcrates.dm b/code/modules/mining/abandonedcrates.dm index 5c3061e1..fa88bd53 100644 --- a/code/modules/mining/abandonedcrates.dm +++ b/code/modules/mining/abandonedcrates.dm @@ -36,7 +36,7 @@ if(7) new/obj/item/weapon/reagent_containers/glass/bottle/cyanide(src) if(8) - new/obj/item/weapon/melee/energy/sword(src) +// new/obj/item/weapon/melee/energy/sword(src) Dummy if(9) for(var/i = 0, i < 3, i++) new/obj/machinery/hydroponics(src) @@ -58,14 +58,14 @@ new/obj/item/clothing/under/shorts(src) new/obj/item/clothing/under/shorts/red(src) new/obj/item/clothing/under/shorts/blue(src) - //Dummy crates start here. //Ha, no. Your dummy crates are dumb and I hope you die. + //Dummy crates start here. //Ha, no. Your dummy crates are dumb and I hope you die. //Sorry Duck, but. Issues with people being dumb. if(17) new/obj/item/weapon/melee/energy/sword/pirate(src) if(18) - new/obj/item/weapon/twohanded/dualsaber(src) +// new/obj/item/weapon/twohanded/dualsaber(src) Dummy if(19) new/obj/item/weapon/claymore(src) - new/obj/item/weapon/katana(src) +// new/obj/item/weapon/katana(src) if(20) new/obj/item/weapon/pickaxe/plasmacutter(src) new/obj/item/weapon/pickaxe/diamonddrill(src) @@ -80,30 +80,30 @@ new/obj/item/device/soulstone(src) new/obj/structure/constructshell(src) if(25) - new/obj/item/mecha_parts/chassis/honker(src) - new/obj/item/mecha_parts/part/honker_torso(src) +// new/obj/item/mecha_parts/chassis/honker(src) +// new/obj/item/mecha_parts/part/honker_torso(src) new/obj/item/mecha_parts/part/honker_head(src) - new/obj/item/mecha_parts/part/honker_left_arm(src) +// new/obj/item/mecha_parts/part/honker_left_arm(src) new/obj/item/mecha_parts/part/honker_right_arm(src) new/obj/item/mecha_parts/part/honker_left_leg(src) new/obj/item/mecha_parts/part/honker_right_leg(src) if(26) +// new/obj/item/weapon/bikehorn(src) new/obj/item/weapon/bikehorn(src) new/obj/item/weapon/bikehorn(src) - new/obj/item/weapon/bikehorn(src) - new/obj/item/weapon/circuitboard/mecha/honker/peripherals(src) +// new/obj/item/weapon/circuitboard/mecha/honker/peripherals(src) new/obj/item/weapon/circuitboard/mecha/honker/targeting(src) new/obj/item/weapon/circuitboard/mecha/honker/main(src) - new/obj/item/mecha_parts/mecha_equipment/weapon/honker(src) +// new/obj/item/mecha_parts/mecha_equipment/weapon/honker(src) new/obj/item/mecha_parts/mecha_equipment/weapon/ballistic/missile_rack/banana_mortar(src) new/obj/item/mecha_parts/mecha_equipment/weapon/ballistic/missile_rack/banana_mortar/mousetrap_mortar(src) if(27) - new/obj/item/mecha_parts/chassis/phazon(src) +// new/obj/item/mecha_parts/chassis/phazon(src) new/obj/item/mecha_parts/part/phazon_torso(src) new/obj/item/mecha_parts/part/phazon_head(src) if(28) new/obj/item/mecha_parts/part/phazon_left_arm(src) - new/obj/item/mecha_parts/part/phazon_right_arm(src) +// new/obj/item/mecha_parts/part/phazon_right_arm(src) new/obj/item/mecha_parts/part/phazon_left_leg(src) new/obj/item/mecha_parts/part/phazon_right_leg(src) if(29) @@ -111,7 +111,7 @@ new/obj/item/clothing/mask/facehugger(src) new/obj/item/clothing/mask/facehugger(src) if(30) - new/obj/item/weapon/gun/energy/staff/focus(src) +// new/obj/item/weapon/gun/energy/staff/focus(src) Dummy //Dummy crates end here. //is what it would say if we weren't getting rid of the dummy crates for being dumb if(31) new/obj/item/weapon/melee/baton(src) @@ -211,7 +211,7 @@ new/obj/item/clothing/mask/gas/owl_mask(src) new/obj/item/weapon/gun/energy/crossbow(src) new/obj/item/clothing/shoes/syndigaloshes(src) - + if(56) new/obj/item/clothing/under/waiter(src) new/obj/item/clothing/head/kitty(src) @@ -257,7 +257,7 @@ new/obj/item/device/pda/clown(src) new/obj/item/weapon/storage/backpack/clown(src) new/obj/item/weapon/bikehorn(src) - new/obj/item/weapon/reagent_containers/food/snacks/clownburger(src) +// new/obj/item/weapon/reagent_containers/food/snacks/clownburger(src) new/obj/item/weapon/reagent_containers/food/snacks/grown/banana(src) new/obj/item/weapon/reagent_containers/food/snacks/pie(src) new/obj/item/weapon/reagent_containers/food/snacks/sliceable/bananabread(src) @@ -271,9 +271,9 @@ new/obj/item/weapon/bedsheet/mime(src) new/obj/item/clothing/head/beret(src) new/obj/item/clothing/suit/suspenders(src) - new/obj/item/weapon/reagent_containers/food/snacks/egg/mime(src) +// new/obj/item/weapon/reagent_containers/food/snacks/egg/mime(src) new/obj/item/device/pda/mime(src) - new/obj/item/weapon/reagent_containers/food/drinks/bottle/bottleofnothing(src) +// new/obj/item/weapon/reagent_containers/food/drinks/bottle/bottleofnothing(src) if(68) new/obj/item/weapon/spacecash/c1000(src) new/obj/item/weapon/spacecash/c1000(src) @@ -316,7 +316,7 @@ if (attempts == 0) user << "The crate's anti-tamper system activates!" var/turf/T = get_turf(src.loc) - explosion(T, 0, 0, 0, 1) + explosion(T, 0, 1, 4, 4) del(src) return else @@ -346,3 +346,9 @@ user << "* Last access attempt higher than expected code." else ..() else ..() + +/obj/structure/closet/crate/secure/loot/bullet_act(var/obj/item/projectile/Proj) + var/turf/T = get_turf(src.loc) + explosion(T, 0, 1, 4, 4) + del(src) + return \ No newline at end of file