cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-24 21:48:39 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1561 from RobRichards1997/11/10/2013-Limbs-are-Objects

Browse Source 
Changes Limbs into Objects [Merge/Give Feedback]
This commit is contained in:
Aranclanos
2013-10-22 00:41:09 -07:00
parent 5988e4b6a6 a3e0921814
commit dd281bb6b2
35 changed files with 331 additions and 214 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/reagents/Chemistry-Reagents.dm
+1 -1
View File
@@ -1628,7 +1628,7 @@ datum
if(!M.unacidable)
if(istype(M, /mob/living/carbon/human) && volume >= 3)
var/mob/living/carbon/human/H = M
var/datum/limb/affecting = H.get_organ("head")
var/obj/item/organ/limb/affecting = H.get_organ("head")
if(affecting)
if(affecting.take_damage(4*toxpwr, 2*toxpwr))
H.update_damage_overlays(0)
code/modules/reagents/reagent_containers/food/drinks/bottle.dm
+1 -1
View File
@@ -43,7 +43,7 @@
force = 15 //Smashing bottles over someoen's head hurts.
var/datum/limb/affecting = user.zone_sel.selecting //Find what the player is aiming at
var/obj/item/organ/limb/affecting = user.zone_sel.selecting //Find what the player is aiming at
var/armor_block = 0 //Get the target's armour values for normal attack damage.
var/armor_duration = 0 //The more force the bottle has, the longer the duration.