Bugfixing the bugfixes:

Updated paths for flashbangs:
- Flashbangs fit in sec belts once again
- Fixes issue 648

Removed the distance check from shift+click examine:
- I was hoping we'd be able to alter this so that we could.. say.. require people to be closer to something to examine it... but it's just causing problems
- Fixes issue 646.

A bit more work on shield generators
- Shield generators are now called "Emergency Shield Projectors" to help tell them apart from Field Generators and Shield Wall Generators
- The as per Cheridan's advice, the shield bits now use the old cloaking animation as a sprite since it's much easier to click on then those tiny dissapearing stars.
- They now shut off when unsecured by a wrench.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4031 316c924e-a436-60f5-8080-3fe189b3f50e
This commit is contained in:
johnsonmt88@gmail.com
2012-07-11 05:39:51 +00:00
parent 4c4153f248
commit ff2ac76177
5 changed files with 16 additions and 12 deletions

View File

@@ -11,7 +11,7 @@
"/obj/item/weapon/smokebomb",
"/obj/item/weapon/smokebomb",
"/obj/item/weapon/pen/paralysis",
"/obj/item/weapon/chem_grenade/incendiary")
"/obj/item/weapon/grenade/chem_grenade/incendiary")
cost = 20
containertype = "/obj/structure/closet/crate"
containername = "Special Ops crate"
@@ -441,9 +441,9 @@
"/obj/item/weapon/tank/plasma",
"/obj/item/weapon/tank/plasma",
"/obj/item/weapon/tank/plasma",
"/obj/item/weapon/chem_grenade/incendiary",
"/obj/item/weapon/chem_grenade/incendiary",
"/obj/item/weapon/chem_grenade/incendiary")
"/obj/item/weapon/grenade/chem_grenade/incendiary",
"/obj/item/weapon/grenade/chem_grenade/incendiary",
"/obj/item/weapon/grenade/chem_grenade/incendiary")
cost = 25
containertype = "/obj/structure/closet/crate/secure/weapon"
containername = "Experimental weapons crate"

View File

@@ -176,7 +176,7 @@
icon_state = "sec"
icon_deny = "sec-deny"
req_access_txt = "1"
product_paths = "/obj/item/weapon/handcuffs;/obj/item/weapon/flashbang;/obj/item/device/flash;/obj/item/weapon/reagent_containers/food/snacks/donut;/obj/item/weapon/storage/box/evidence"
product_paths = "/obj/item/weapon/handcuffs;/obj/item/weapon/grenade/flashbang;/obj/item/device/flash;/obj/item/weapon/reagent_containers/food/snacks/donut;/obj/item/weapon/storage/box/evidence"
product_amounts = "8;4;5;12;6"
product_hidden = "/obj/item/clothing/glasses/sunglasses;/obj/item/kitchen/donut_box"
product_hideamt = "2;2"

View File

@@ -1035,8 +1035,9 @@ var/using_new_click_proc = 0 //TODO ERRORAGE (This is temporary, while the DblCl
if(istype(M.machine, /obj/machinery/computer/security)) //No examining by looking through cameras
return
if(( abs(src.x-M.x)<8 || abs(src.y-M.y)<8 ) && src.z == M.z ) //This should prevent non-observers to examine stuff from outside their view.
examine()
//I dont think this was ever really a problem and it's only creating more bugs...
// if(( abs(src.x-M.x)<8 || abs(src.y-M.y)<8 ) && src.z == M.z ) //This should prevent non-observers to examine stuff from outside their view.
examine()
return

View File

@@ -1,8 +1,8 @@
/obj/machinery/shield
name = "emergency energy shield"
desc = "An energy shield usually used to contain hull breaches."
name = "Emergency energy shield"
desc = "An energy shield used to contain hull breaches."
icon = 'effects.dmi'
icon_state = "shieldsparkles"
icon_state = "shield-old"
density = 1
opacity = 0
anchored = 1
@@ -169,7 +169,7 @@
/obj/machinery/shieldgen
name = "Shield generator"
name = "Emergency shield projector"
desc = "Used to seal minor hull breaches."
icon = 'objects.dmi'
icon_state = "shieldoff"
@@ -294,6 +294,9 @@
playsound(src.loc, 'Ratchet.ogg', 100, 1)
if(anchored)
user << "\blue You unsecure the [src] from the floor!"
if(active)
user << "The [src] shuts off!"
src.shields_down()
anchored = 0
else
user << "\blue You secure the [src] to the floor!"

View File

@@ -103,7 +103,7 @@
item_state = "security"//Could likely use a better one.
storage_slots = 4
can_hold = list(
"/obj/item/weapon/flashbang",
"/obj/item/weapon/grenade/flashbang",
"/obj/item/weapon/pepperspray",
"/obj/item/weapon/handcuffs",
"/obj/item/device/flash",