Merge remote-tracking branch 'upstream/master' into cache2

This commit is contained in:
Archie
2021-06-27 04:32:49 -03:00
7 changed files with 77 additions and 46 deletions
@@ -79,6 +79,10 @@
name = "Witch Wing"
icon_state = "witchwing"
/datum/sprite_accessory/moth_wings/bee
name = "Bee Wing"
icon_state = "bee"
/datum/sprite_accessory/moth_markings // the markings that moths can have. finally something other than the boring tan
icon = 'icons/mob/moth_markings.dmi'
color_src = null
@@ -141,4 +145,4 @@
/datum/sprite_accessory/moth_markings/witchwing
name = "Witch Wing"
icon_state = "witchwing"
icon_state = "witchwing"
@@ -599,16 +599,22 @@
name = "Cybernetic Stomach"
desc = "A cybernetic stomach."
id = "cybernetic_stomach"
build_type = PROTOLATHE
materials = list(MAT_METAL = 500, MAT_GLASS = 500)
build_path = /obj/item/organ/stomach/cybernetic
category = list("Medical Designs")
departmental_flags = DEPARTMENTAL_FLAG_MEDICAL
/datum/design/cybernetic_stomach_u
name = "Upgraded Cybernetic Stomach"
desc = "An upgraded cybernetic stomach."
id = "cybernetic_stomach_u"
build_type = PROTOLATHE
construction_time = 50
materials = list(MAT_METAL = 500, MAT_GLASS = 500, MAT_SILVER = 500)
build_path = /obj/item/organ/stomach/cybernetic/upgraded
category = list("Medical Designs")
departmental_flags = DEPARTMENTAL_FLAG_MEDICAL
/datum/design/cybernetic_tongue
name = "Cybernetic tongue"