Rob Nelson 7832e1c26f PLASMA MAAAAAAAAAAAAAAAAAAAAAAAN ...

Conflicts:
	.gitignore
	baystation12.dme
	code/_onclick/hud/screen_objects.dm
	code/modules/clothing/spacesuits/alien.dm
	code/modules/media/tapedeck.dm
	code/modules/mob/living/carbon/human/human.dm
	code/modules/mob/living/carbon/human/life.dm
	code/modules/mob/living/carbon/species.dm
	html/changelog.html
	icons/mob/back.dmi
	icons/mob/head.dmi
	icons/mob/in-hand/in-hand_sync_report.txt
	icons/mob/items_lefthand.dmi
	icons/mob/items_righthand.dmi
	icons/mob/suit.dmi
	icons/obj/clothing/hats.dmi
	icons/obj/clothing/suits.dmi
	icons/obj/tank.dmi

2014-07-31 18:58:49 -04:00

..

hud

PLASMA MAAAAAAAAAAAAAAAAAAAAAAAN

2014-07-31 18:58:49 -04:00

adjacent.dm

Standardize windows.

2014-04-19 19:36:33 -04:00

ai.dm

Expands the AI photo-camera so that it now has robot/cyborg support. Also implements DRY in practice.

2014-07-31 17:31:23 -04:00

click.dm

Bevy of newhydro fixes.

2014-07-28 13:49:18 -04:00

cyborg.dm

Expands the AI photo-camera so that it now has robot/cyborg support. Also implements DRY in practice.

2014-07-31 17:31:23 -04:00

drag_drop.dm

…

item_attack.dm

Slime update

2014-07-15 00:50:41 -04:00

observer.dm

compile fix

2014-02-28 19:38:55 -05:00

oldcode.dm

Standardize LASER, NOCLONE, and HUSK

2014-01-21 22:59:53 -05:00

other_mobs.dm

Xeno nerf

2014-07-21 10:08:02 -04:00

overmind.dm

Add missing overmind clicks.

2014-02-28 19:19:49 -05:00

telekinesis.dm

Thrown items can be targeted, has miss chance...

2014-07-16 09:53:34 -04:00