PsiOmega ea874a8baa Merge remote-tracking branch 'upstream/dev' into Ghosts ...

Conflicts:
	code/modules/mob/dead/observer/observer.dm

2014-11-06 08:40:18 +01:00

..

dead

Merge remote-tracking branch 'upstream/dev' into Ghosts

2014-11-06 08:40:18 +01:00

living

Merge pull request #6939 from PsiOmegaDelta/VerbOptimization

2014-11-05 23:23:56 +03:00

new_player

Re-move resource update

2014-10-20 17:26:55 +01:00

death.dm

Merge branch 'organremoval' of https://github.com/Zuhayr/Baystation12 into dev

2014-09-29 06:19:26 +09:30

emote.dm

…

hear_say.dm

…

holder.dm

Updated borer icons slightly.

2014-07-30 21:51:17 +09:30

inventory.dm

Fixes a bug with stationary turrets. Removes quotes in path-name to ensure type always exists. Includes code review suggestions.

2014-10-24 07:23:48 +02:00

language.dm

Fixes robot radio component not using power

2014-10-19 00:50:13 -04:00

login.dm

Re-move resource update

2014-10-20 17:26:55 +01:00

logout.dm

…

mob_cleanup.dm

…

mob_defines.dm

Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into xenorewrite

2014-10-01 18:16:04 +09:30

mob_grab.dm

Alien attack_hand() conflicts out the wazoo. I thought I already did these but that may have been on an unmerged branch. Burn that bridge when I come to it.

2014-10-12 11:48:54 +10:30

mob_helpers.dm

Merge pull request #6939 from PsiOmegaDelta/VerbOptimization

2014-11-05 23:23:56 +03:00

mob_movement.dm

Zooming with an item is now done with a general proc zoom(). This applies to binoculars and sniper rifle.

2014-10-04 17:38:38 +08:00

mob_transformation_simple.dm

Readded transform procs for xenos.

2014-09-30 16:07:47 +09:30

mob.dm

All the relevant examine changes.

2014-11-05 12:44:23 +01:00

say.dm

Merge branch 'organremoval' of https://github.com/Zuhayr/Baystation12 into dev

2014-09-29 06:19:26 +09:30

transform_procs.dm

Makes the AI radio channel listing more dynamic. Kills copy-pasting.

2014-10-30 22:27:58 +01:00

typing_indicator.dm

Merge

2014-10-11 13:58:16 -04:00

update_icons.dm

…