cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-07-21 03:56:47 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixes some stuff (+2 squashed commit)

Browse Source 
Squashed commit:

[f63e170] Removes unnecessary /

[ac1b52c] re adds 1 bear trap i somehow accidently removed
This commit is contained in:
Yoshax
2015-05-10 20:15:19 +01:00
parent 86bf94ba07
commit b0d10a6508
4 changed files with 6 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/defines/obj/weapon.dm
+3 -13
View File
@@ -228,25 +228,15 @@
if(H.m_intent == "run")
armed = 0
update_icon()
//H.legcuffed = src
//src.loc = H
//H.update_inv_legcuffed()
H << "<span class='danger'>You step on \the [src]!</span>"
feedback_add_details("handcuffs","B")
for(var/mob/O in viewers(H, null))
if(O == H)
continue
O.show_message("<span class='danger'>[H] steps on \the [src].</span>", 1)
if(H.lying)
var/list/potentialorgans = list()
for(var/organ in list("l_leg", "l_foot", "r_leg", "r_foot", "groin", "chest", "head", "r_arm", "r_hand", "l_arm", "l_hand")) //iterate over names
var/obj/item/organ/external/R = H.get_organ(organ)
if(R && !(R.status & ORGAN_DESTROYED))
potentialorgans += R
var/obj/item/organ/external/affecting = pick(potentialorgans)
var/obj/item/organ/external/affecting = pick(H.organs)
affecting.take_damage(30, 0)
affecting.embed(src, 1)
affecting.embed(src)
H.UpdateDamageIcon()
H.updatehealth()
else
@@ -257,7 +247,7 @@
potentialorgans += R
var/obj/item/organ/external/affecting = pick(potentialorgans)
affecting.take_damage(30, 0)
affecting.embed(src, 1)
affecting.embed(src)
H.UpdateDamageIcon()
H.updatehealth()