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

..

area

Map fixes

2014-07-25 20:20:38 +02:00

dna

Made all current wizard + genetic spells a subtype of spell/wizard (Since they use the same action button row)

2014-07-23 11:04:07 -04:00

gamemodes

Merge pull request #342 from Robertha89/patch-1

2014-07-28 17:20:18 -04:00

jobs

Merge pull request #334 from Bone-White/master

2014-07-27 11:58:42 -04:00

machinery

Fixes runtime errors. AIs and cyborgs can now attach their photos to newscasters as well as photocopy them.

2014-07-31 17:38:14 -04:00

magic

…

mecha

An Odysseus with patients now bypass mech movement-overrides.

2014-07-30 00:17:48 -04:00

objects

PLASMA MAAAAAAAAAAAAAAAAAAAAAAAN

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

structure

Completed adding Kidan Ambassador decorations

2014-07-23 13:24:51 -04:00

turfs

Possibly improved /turf/simulated/Entered() performance

2014-07-27 23:11:49 +02:00

vehicles

…

verbs

adds trim() to OOC and LOOC

2014-07-20 05:58:26 -04:00

asteroid.dm

New stuff for mining

2014-02-16 03:54:39 -05:00

atoms_movable.dm

Fix jukeboxes needing reset after shuttle movement, [CLASSIFIED], warning fix.

2014-07-24 21:01:49 -04:00

atoms.dm

Removing examine from popup menu to help with right-click lag. Use shift-click instead.

2014-07-19 04:03:23 -04:00

communications.dm

BS12 Hooks

2014-05-22 23:56:35 +02:00

json.dm

…

response_team.dm

Moar Event stuff

2014-06-21 07:12:55 -04:00

shuttle_engines.dm

…

skincmd.dm

…

smoothwall.dm

Recoded wall-smoothing for optimization. Fixes #835.

2014-07-25 16:29:00 -04:00

socket_talk.dm

Code for new bots allowing admins to PM Players via IRC and vice versa.

2014-05-12 04:45:13 -04:00

sound.dm

Goddamnit

2014-07-30 00:21:26 -04:00

supplyshuttle.dm

More train fixes

2014-07-28 13:34:50 -04:00