Skip to content

Commit c4add5c

Browse files
committed
I've decided I do not like these properties
1 parent 711fa53 commit c4add5c

File tree

3 files changed

+5
-9
lines changed

3 files changed

+5
-9
lines changed

code/__DEFINES/examine_properties.dm

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,7 @@
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-
/// 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")
19+
2320
//Clothing
2421
/// STOPSPRESSUREDAMAGE clothing flag
2522
#define PROPERTY_SPACEPROOF_CLOTHING span_tooltip("Protects the wearer from vacuum environments.", "Vacuumproof")

code/game/objects/items.dm

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -372,11 +372,6 @@ 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-
380375
if(siemens_coefficient == 0)
381376
. += PROPERTY_NONCONDUCTIVE
382377

code/modules/clothing/gloves/color.dm

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -90,6 +90,10 @@
9090
. = ..()
9191
siemens_coefficient = pick(0,0,0,0.5,0.5,0.5,0.75)
9292

93+
/obj/item/clothing/gloves/color/fyellow/old/examine_properties()
94+
. = ..()
95+
. |= PROPERTY_NONCONDUCTIVE
96+
9397
/obj/item/clothing/gloves/cut
9498
desc = "These gloves would protect the wearer from electric shock... if the fingers were covered."
9599
name = "fingerless insulated gloves"

0 commit comments

Comments
 (0)