Merge branch 'master' of https://github.com/ArchieBeepBoop/Hyper-Station-13 into syndicateleague2

This commit is contained in:
Dip
2020-11-10 14:05:51 -03:00
80 changed files with 1523 additions and 426 deletions
@@ -234,3 +234,10 @@
name = "surgical toolset implant"
desc = "A set of surgical tools hidden behind a concealed panel on the user's arm."
contents = newlist(/obj/item/retractor/augment, /obj/item/hemostat/augment, /obj/item/cautery/augment, /obj/item/surgicaldrill/augment, /obj/item/scalpel/augment, /obj/item/circular_saw/augment, /obj/item/surgical_drapes)
//Ignore this one this is for a bus character.
/obj/item/organ/cyberimp/arm/COMPound
name = "chemical cybernetics implant"
desc = "A powerful cybernetic implant that contains chemical fabrication modules built into the user's arm."
contents = newlist(/obj/item/reagent_containers/hypospray/debug, /obj/item/gun/chem/debug, /obj/item/reagent_containers/chemical_tongue, /obj/item/fermichem/pHmeter)