Skip to content

Commit 711fa53

Browse files
committed
new props for items
1 parent dd98437 commit 711fa53

File tree

2 files changed

+9
-1
lines changed

2 files changed

+9
-1
lines changed

code/__DEFINES/examine_properties.dm

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,10 @@
1616
#define PROPERTY_HUGE span_tooltip("Can not be placed into most storage containers.", "Huge")
1717
/// Gigantic size
1818
#define PROPERTY_GIGANTIC span_tooltip("Can not be picked up.", "Gigantic")
19-
19+
/// EDGED
20+
#define PROPERTY_EDGED span_tooltip("Can be used to cut.", "Sharp")
21+
/// POINTY
22+
#define PROPERTY_POINTY span_tooltip("Can be used to puncture.", "Pointed")
2023
//Clothing
2124
/// STOPSPRESSUREDAMAGE clothing flag
2225
#define PROPERTY_SPACEPROOF_CLOTHING span_tooltip("Protects the wearer from vacuum environments.", "Vacuumproof")

code/game/objects/items.dm

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -372,6 +372,11 @@ DEFINE_INTERACTABLE(/obj/item)
372372
if(slot_flags)
373373
. += PROPERTY_WEARABLE
374374

375+
if(sharpness & SHARP_EDGED)
376+
. += PROPERTY_EDGED
377+
if(sharpness & SHARP_POINTY)
378+
. += PROPERTY_POINTY
379+
375380
if(siemens_coefficient == 0)
376381
. += PROPERTY_NONCONDUCTIVE
377382

0 commit comments

Comments
 (0)