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

2020-04-02 16:07:13 +02:00
parent 21a42579c1 431722e34d
commit 45d1917f0f
322 changed files with 5080 additions and 3953 deletions
@@ -10,6 +10,8 @@
 	has_limbs = 1
 	hud_type = /datum/hud/robot

+	blocks_emissive = EMISSIVE_BLOCK_UNIQUE
+
 	var/custom_name = ""
 	var/braintype = "Cyborg"
 	var/obj/item/robot_suit/robot_suit = null //Used for deconstruction to remember what the borg was constructed out of..