cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 10:43:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #10187 from Baystation12/master

Browse Source 
Master > dev-freeze
This commit is contained in:
Zuhayr
2015-07-15 16:10:13 +09:30
parent 06fae7d2e8 a6ec43f0b1
commit 03927918c6
2 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
code/modules/clothing/spacesuits/rig/suits/station.dm
View File

@@ -109,9 +109,14 @@
/obj/item/rig_module/vision/meson /obj/item/rig_module/vision/meson
) )
chest_type = /obj/item/clothing/suit/space/rig/ce
boot_type = null boot_type = null
glove_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 /obj/item/weapon/rig/hazmat
name = "AMI control module" name = "AMI control module"

2
code/modules/projectiles/projectile.dm
View File

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