Merge branch 'master' into upstream-merge-37476
# Please enter a commit message to explain why this merge is necessary, # especially if it merges an updated upstream into a topic branch. # # Lines starting with '#' will be ignored, and an empty message aborts # the commit.
This commit is contained in:
@@ -278,3 +278,9 @@ datum/gear/darksabresheath
|
||||
path = /obj/item/ssword_kit
|
||||
ckeywhitelist = list("phillip458")
|
||||
|
||||
/datum/gear/techcoat
|
||||
name = "Techomancers Labcoat"
|
||||
category = slot_in_backpack
|
||||
path = /obj/item/clothing/suit/toggle/labcoat/mad/techcoat
|
||||
ckeywhitelist = list("wilchen")
|
||||
|
||||
|
||||
@@ -343,3 +343,11 @@
|
||||
desc = "A piece of paper folded into neat little hat."
|
||||
icon_state = "paperhat"
|
||||
item_state = "paperhat"
|
||||
|
||||
/obj/item/clothing/suit/toggle/labcoat/mad/techcoat
|
||||
name = "Techomancers Labcoat"
|
||||
desc = "An oddly special looking coat."
|
||||
icon = 'icons/obj/custom.dmi'
|
||||
icon_state = "rdcoat"
|
||||
icon_override = 'icons/mob/custom_w.dmi'
|
||||
item_state = "rdcoat"
|
||||
|
||||
Reference in New Issue
Block a user