Merge pull request #8180 from mwerezak/mercenary

Map updates and fixes, plus hardsuit icons
This commit is contained in:
Chinsky
2015-02-23 15:27:35 +03:00
13 changed files with 221 additions and 180 deletions

View File

@@ -1,6 +1,6 @@
/obj/item/weapon/gun/projectile/heavysniper
name = "\improper PTRS-7 rifle"
desc = "A portable anti-armour rifle fitted with a scope. Originally designed to used against armoured exosuits, it is capable of punching through non-reinforced walls with ease. Fires armor piercing 14.5mm shells."
desc = "A portable anti-armour rifle fitted with a scope. Originally designed to used against armoured exosuits, it is capable of punching through windows and non-reinforced walls with ease. Fires armor piercing 14.5mm shells."
icon_state = "heavysniper"
item_state = "shotgun"
w_class = 4

View File

@@ -43,10 +43,10 @@
var/chance = 0
if(istype(A, /turf/simulated/wall))
var/turf/simulated/wall/W = A
chance = round(damage/W.damage_cap*180)
chance = round(damage/W.damage_cap*250)
else if(istype(A, /obj/machinery/door))
var/obj/machinery/door/D = A
chance = round(damage/D.maxhealth*100)
chance = round(damage/D.maxhealth*150)
else if(istype(A, /obj/structure/girder) || istype(A, /obj/structure/cultgirder))
chance = 100
else if(istype(A, /obj/machinery) || istype(A, /obj/structure))
@@ -141,13 +141,13 @@
penetrating = 1
/obj/item/projectile/bullet/rifle/a145
damage = 80
damage = 60
stun = 3
weaken = 3
penetrating = 5
/obj/item/projectile/bullet/rifle/a556
damage = 50
damage = 40
penetrating = 1
/* Miscellaneous */