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

Final commit of the examine/damage overhaul.

Browse Source
This commit is contained in:
SkyMarshal
2012-03-29 20:44:10 -07:00
parent 01d2d5f339
commit 61820bc5ec
44 changed files with 1166 additions and 2730 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items.dm
+6 -3
View File
@@ -474,7 +474,8 @@
istype(W, /obj/item/weapon/kitchen/utensil/knife) || \
istype(W, /obj/item/weapon/shard) || \
istype(W, /obj/item/weapon/reagent_containers/syringe) || \
istype(W, /obj/item/weapon/kitchen/utensil/fork) && W.icon_state != "forkloaded" \
istype(W, /obj/item/weapon/kitchen/utensil/fork) && W.icon_state != "forkloaded" || \
istype(W,/obj/item/projectile)\
)
/proc/is_cut(obj/item/W as obj)
@@ -488,7 +489,8 @@
istype(W, /obj/item/weapon/butch) || \
istype(W, /obj/item/weapon/scalpel) || \
istype(W, /obj/item/weapon/kitchen/utensil/knife) || \
istype(W, /obj/item/weapon/shard) \
istype(W, /obj/item/weapon/shard) || \
istype(W,/obj/item/projectile) \
)
/proc/is_burn(obj/item/W as obj)
@@ -496,7 +498,8 @@
istype(W, /obj/item/weapon/weldingtool) && W:welding || \
istype(W, /obj/item/weapon/zippo) && W:lit || \
istype(W, /obj/item/weapon/match) && W:lit || \
istype(W, /obj/item/clothing/mask/cigarette) && W:lit \
istype(W, /obj/item/clothing/mask/cigarette) && W:lit || \
istype(W,/obj/item/projectile/beam)\
)
/obj/item/weapon/paper/temperature_expose(datum/gas_mixture/air, exposed_temperature, exposed_volume)