Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit229

2020-02-22 00:55:32 +01:00
parent 5dc1de1d04 0cffb2e672
commit 8fbfd07692
1009 changed files with 20505 additions and 13193 deletions
@@ -74,4 +74,8 @@

 /obj/item/implanter/stealth
 	name = "implanter (stealth)"
-	imp_type = /obj/item/implant/stealth
+	imp_type = /obj/item/implant/stealth
+
+/obj/item/implanter/hijack
+	name = "implanter (hijack)"
+	imp_type = /obj/item/implant/hijack