PsiOmega 3d49ad3927 Merge remote-tracking branch 'upstream/dev-freeze' into dev ...

Conflicts:
	code/game/jobs/job/job.dm
	code/game/jobs/job/silicon.dm
	code/game/objects/items/weapons/surgery_tools.dm
	code/modules/materials/materials.dm
	code/modules/mob/living/carbon/human/species/species.dm
	code/modules/mob/living/carbon/human/species/station/station.dm
	code/modules/organs/organ_external.dm
	icons/obj/objects.dmi

2015-06-01 09:07:03 +02:00

..

datum_pool.dm

Grilles and rods.

2015-05-02 21:35:02 +02:00

files.dm

Server log files are now sorted when using .getruntimelog or .getserverlog

2014-02-28 22:37:36 -06:00

game.dm

get_mobs_in_view() renamed to get_mobs_or_objects_in_view(). Returns mobs or objects depending on specifications

2015-05-17 16:54:18 +10:00

global_lists.dm

Endgame tweaks.

2015-05-26 12:29:50 +02:00

icons.dm

Prevents infinite loop if a camera takes a picture of an atom with null in either it's overlays or underlays.

2014-12-09 17:19:02 -05:00

lists.dm

Optimises uniqueList()

2015-05-10 16:59:32 +02:00

logging.dm

Fixes #9452

2015-05-26 22:34:06 -04:00

maths.dm

Merge remote-tracking branch 'refs/remotes/origin/dev' into dev

2015-02-04 04:44:09 +06:00

mobs.dm

Added construction drone sprites from Pawn.

2015-05-11 14:46:47 +09:30

names.dm

Prevents mindless candidates for mutiny mode, adds loyalists/mutineers to AntagHUD, allows admins to reassign heads, and adds remaining Directive X objectives to Check Antagonists panel.

2014-06-03 21:26:34 -05:00

sanitize_values.dm

…

text.dm

Return strip_html_properly() back

2015-04-21 00:38:41 +03:00

time.dm

Makes it possible to write [date] and [time] to get the current date and time in ISO 8601 format.

2015-04-18 18:40:35 +02:00

turfs.dm

Stack reorganization, use() now dels after yield

2014-12-25 15:09:09 -05:00

type2type.dm

Server build date and revision.

2015-05-29 08:26:31 +02:00

unsorted.dm

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

2015-05-02 21:50:11 +02:00

vector.dm

Adds gun firemodes and burst firing

2015-04-26 03:13:52 -04:00