goddamnit_again (#2511)

This commit is contained in:
kevinz000
2017-08-26 18:43:57 -07:00
committed by GitHub
parent c64aeef239
commit 3254fcf535
54 changed files with 93 additions and 93 deletions
+2 -2
View File
@@ -2,7 +2,7 @@
gender = PLURAL
name = "red lipstick"
desc = "A generic brand of lipstick."
icon = 'icons/obj/items.dmi'
icon = 'icons/obj/items_and_weapons.dmi'
icon_state = "lipstick"
w_class = WEIGHT_CLASS_TINY
var/colour = "red"
@@ -105,7 +105,7 @@
/obj/item/razor
name = "electric razor"
desc = "The latest and greatest power razor born from the science of shaving."
icon = 'icons/obj/items.dmi'
icon = 'icons/obj/items_and_weapons.dmi'
icon_state = "razor"
flags_1 = CONDUCT_1
w_class = WEIGHT_CLASS_TINY