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

2019-06-24 16:55:10 +02:00
parent a055f12394 dcd74f899a
commit 28d3747c5e
222 changed files with 9157 additions and 5419 deletions
@@ -22,7 +22,7 @@
 	icon_state = "datadisk1"
 	max_blueprints = 1

-/obj/item/disk/design_disk/golem_shell/Initialize()
+/obj/item/disk/design_disk/plant_disk/Initialize()
 	. = ..()
 	var/datum/design/diskplantgene/P = new
 	blueprints[1] = P