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

this shit dosen't even compile yet...

Browse Source
This commit is contained in:
Aurorablade
2015-12-19 22:39:47 -05:00
parent 4c03cf2599
commit 80eb828563
95 changed files with 1140 additions and 648 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items/devices/laserpointer.dm
+1 -1
View File
@@ -113,7 +113,7 @@
severity -= 1
severity = min(max(severity, 0), 4)
var/mob/living/carbon/human/H = C
var/obj/item/organ/eyes/E = H.internal_organs_by_name["eyes"]
var/obj/item/organ/internal/eyes/E = H.internal_organs_by_name["eyes"]
switch(severity)
if(0)
code/game/objects/items/devices/scanners.dm
+1 -1
View File
@@ -202,7 +202,7 @@ REAGENT SCANNER
// user.show_message("\blue Bloodstream Analysis located [M.reagents:get_reagent_amount("epinephrine")] units of rejuvenation chemicals.")
if (M.has_brain_worms())
user.show_message("\red Subject suffering from aberrant brain activity. Recommend further scanning.")
else if (M.getBrainLoss() >= 100 || istype(M, /mob/living/carbon/human) && M:brain_op_stage == 4.0)
else if (M.getBrainLoss() >= 100 || istype(M, /mob/living/carbon/human) && !M.get_int_organ(/obj/item/organ/internal/brain))
user.show_message("\red Subject is brain dead.")
else if (M.getBrainLoss() >= 60)
user.show_message("\red Severe brain damage detected. Subject likely to have mental retardation.")
code/game/objects/items/weapons/defib.dm
+1 -1
View File
@@ -383,7 +383,7 @@
defib.deductcharge(revivecost)
add_logs(M, user, "revived", object="defibrillator")
else
if(tplus > tlimit)
if(tplus > tlimit|| !H.get_int_organ(/obj/item/organ/internal/heart))
user.visible_message("<span class='boldnotice'>[defib] buzzes: Resuscitation failed - Heart tissue damage beyond point of no return for defibrillation.</span>")
else if(total_burn >= 180 || total_brute >= 180)
user.visible_message("<span class='boldnotice'>[defib] buzzes: Resuscitation failed - Severe tissue damage detected.</span>")
code/game/objects/items/weapons/grenades/flashbang.dm
+1 -1
View File
@@ -46,7 +46,7 @@
if(!eye_safety && ishuman(M))
var/mob/living/carbon/human/H = M
var/obj/item/organ/eyes/E = H.internal_organs_by_name["eyes"]
var/obj/item/organ/internal/eyes/E = H.internal_organs_by_name["eyes"]
flick("e_flash", M.flash)
if (E)
E.damage += eye_damage
code/game/objects/items/weapons/tools.dm
+1 -1
View File
@@ -358,7 +358,7 @@
var/safety = user:eyecheck()
if(ishuman(user))
var/mob/living/carbon/human/H = user
var/obj/item/organ/eyes/E = H.internal_organs_by_name["eyes"]
var/obj/item/organ/internal/eyes/E = H.internal_organs_by_name["eyes"]
if(!istype(E)) // No eyes? No problem!
return
switch(safety)