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

2019-11-15 00:36:50 +01:00
parent 09860d463f 364e267598
commit 6484eea339
447 changed files with 16075 additions and 3073 deletions
@@ -1293,8 +1293,8 @@
 	var/toysound = 'sound/machines/click.ogg'

 /obj/item/toy/figure/New()
-    desc = "A \"Space Life\" brand [src]."
-    ..()
+	desc = "A \"Space Life\" brand [src]."
+	..()

 /obj/item/toy/figure/attack_self(mob/user as mob)
 	if(cooldown <= world.time)