cyberpresidentvanellope/Polaris
1
0
Fork 0
mirror of https://github.com/PolarisSS13/Polaris.git synced 2025-12-27 02:23:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #6681 from Baystation12/dev-freeze

Browse Source 
Dev freeze -> Dev
This commit is contained in:
Chinsky
2014-10-13 03:15:44 +04:00
parent 382d9a115d 4ec1ff12bc
commit 7a6722bc31
6 changed files with 357 additions and 348 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
code/modules/mob/living/carbon/human/species.dm
View File

@@ -477,10 +477,12 @@
if(H.a_intent != "hurt")
return 0
if(unarmed.shredding && unarmed.is_usable(H))
return 1
else if(secondary_unarmed.shredding && secondary_unarmed.is_usable(H))
return 1
if(unarmed.is_usable(H))
if(unarmed.shredding)
return 1
else if(secondary_unarmed.is_usable(H))
if(secondary_unarmed.shredding)
return 1
return 0
@@ -512,7 +514,7 @@
/datum/unarmed_attack/bite
attack_verb = list("bite") // 'x has biteed y', needs work.
attack_sound = 'sound/weapons/bite.ogg'
shredding = 1
shredding = 0
damage = 5
sharp = 1
edge = 1

2
code/modules/power/breaker_box.dm
View File

@@ -21,7 +21,7 @@
icon_state = "bbox_on"
// Enabled on server startup. Used in substations to keep them in bypass mode.
/obj/machinery/power/breakerbox/activated/New()
/obj/machinery/power/breakerbox/activated/initialize()
set_state(1)
/obj/machinery/power/breakerbox/examine()