merge robotics and RnD 2014


On Fri, Jan 17, 2014 at 5:27 PM, Rolan7 <notifications@github.com> wrote:

> In code/modules/mob/living/simple_animal/friendly/corgi.dm:
>
> > @@ -437,6 +437,10 @@
> >  	if(facehugger)
> >  		if(istype(src, /mob/living/simple_animal/corgi/puppy))
> >  			overlays += image('icons/mob/mask.dmi',"facehugger_corgipuppy")
> > +		else if(istype(src, /mob/living/simple_animal/corgi/cyberian))
>
> If I add
> /mob/living/simple_animal/corgi/cyberian/regenerate_icons()
>
> And it has the code which deletes and clears the facehugger, then I guess
> it would be safe to call the parent regenerate_icons() with ..()
> Seems a bit extreme when there is already an istype for puppies *right
> there*, and less readable? But better object oriented design, sure.
>
> —
> Reply to this email directly or view it on GitHub<https://github.com/tgstation/-tg-station/pull/2402/files#r8970867>
> .
>