Merge pull request #10187 from Baystation12/master

Master > dev-freeze
This commit is contained in:
Zuhayr
2015-07-15 16:10:13 +09:30
2 changed files with 6 additions and 1 deletions

View File

@@ -109,9 +109,14 @@
/obj/item/rig_module/vision/meson
)
chest_type = /obj/item/clothing/suit/space/rig/ce
boot_type = null
glove_type = null
/obj/item/clothing/suit/space/rig/ce
heat_protection = UPPER_TORSO|LOWER_TORSO|LEGS|FEET|ARMS|HANDS
body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|FEET|ARMS|HANDS
/obj/item/weapon/rig/hazmat
name = "AMI control module"

View File

@@ -118,7 +118,7 @@
return 1
firer = user
def_zone = user.zone_sel.selecting
def_zone = target_zone
if(user == target) //Shooting yourself
user.bullet_act(src, target_zone)