cyberpresidentvanellope/Polaris
1
0
Fork 0
mirror of https://github.com/PolarisSS13/Polaris.git synced 2025-12-25 09:31:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

halved species-unfitting damage, made cramp damage actually stick to max 10 + lowered accum rate

Browse Source 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
This commit is contained in:
Cael_Aislinn
2012-10-28 10:30:06 +10:00
parent 5b5153ee37
commit b88aaea336
2 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
code/modules/clothing/suits/suit_cramp.dm
View File

@@ -19,9 +19,9 @@
var/afforgan = pick("chest","l_foot","r_foot","l_arm","l_leg")
var/datum/organ/external/affecting = H.get_organ(afforgan)
if(affecting)
if(prob(25))
affecting.take_damage(5, 0, 0)
cramp_damage_caused += 5
if(prob(20) && cramp_damage_caused < CRAMP_DAMAGE_MAX)
affecting.take_damage(3, 0, 0)
cramp_damage_caused += 3
H << "\red [pick("Your [affecting.display_name] goes to sleep.","Your [affecting.display_name] begins to twitch.","Your [affecting.display_name] begins to seize up.","You can feel cramps in your [affecting.display_name].","Your [affecting.display_name] begins to ache.","You can feel pins and needles in your [affecting.display_name].")]"
spawn(rand(MIN_CRAMP_TIME, MAX_CRAMP_TIME))

26
code/modules/mob/living/carbon/human/inventory.dm
View File

@@ -235,23 +235,23 @@
if(cur_species == "Tajaran")
if(prob(5))
src.visible_message("\red Your claws burst out of the [W], ripping them to shreds!", "\red [src]'s claws burst out of the [W], ripping them to shreds!", "\red You hear a ripping, tearing sound!")
var/datum/organ/external/affecting = get_organ("l_foot")
var/datum/organ/external/affecting = get_organ("l_hand")
if(affecting)
affecting.take_damage(5, 0, 0)
affecting.take_damage(2.5, 0, 0)
affecting = get_organ("r_foot")
if(affecting)
affecting.take_damage(5, 0, 0)
affecting.take_damage(2.5, 0, 0)
broken = 1
spawn(0)
del(W)
else if(prob(50))
src << "\red You hurt your claws forcing them into the [W]!"
var/datum/organ/external/affecting = get_organ("l_foot")
var/datum/organ/external/affecting = get_organ("r_hand")
if(affecting)
affecting.take_damage(5, 0, 0)
affecting.take_damage(2.5, 0, 0)
affecting = get_organ("r_foot")
if(affecting)
affecting.take_damage(5, 0, 0)
affecting.take_damage(2.5, 0, 0)
if(!broken)
src.gloves = W
W.equipped(src, slot)
@@ -271,21 +271,21 @@
src.visible_message("\red Your feet burst out of the [W], ripping them to shreds!", "\red [src]'s feet burst out of the [W], ripping them to shreds!", "\red You hear a ripping, tearing sound!")
var/datum/organ/external/affecting = get_organ("l_foot")
if(affecting)
affecting.take_damage(5, 0, 0)
affecting.take_damage(2.5, 0, 0)
affecting = get_organ("r_foot")
if(affecting)
affecting.take_damage(5, 0, 0)
affecting.take_damage(2.5, 0, 0)
broken = 1
spawn(0)
del(W)
else if(prob(50))
src << "\red You hurt your feet forcing them into the [W]!"
var/datum/organ/external/affecting = get_organ("l_foot")
var/datum/organ/external/affecting = get_organ("r_foot")
if(affecting)
affecting.take_damage(5, 0, 0)
affecting.take_damage(2.5, 0, 0)
affecting = get_organ("r_foot")
if(affecting)
affecting.take_damage(5, 0, 0)
affecting.take_damage(2.5, 0, 0)
if(!broken)
src.shoes = W
W.equipped(src, slot)
@@ -329,13 +329,13 @@
src << "\red You twist your tail trying to fit it into the [W]!"
var/datum/organ/external/affecting = get_organ("chest")
if(affecting)
affecting.take_damage(10, 0, 0)
affecting.take_damage(5, 0, 0)
if( W.body_parts_covered & HEAD && W.flags & BLOCKHAIR && (cur_species == "Skrell"))
if(prob(50))
src << "\red You twist your eartails trying to fit them into the [W]!"
var/datum/organ/external/affecting = get_organ("head")
if(affecting)
affecting.take_damage(10, 0, 0)
affecting.take_damage(5, 0, 0)
W.layer = 20