Tastyfish 6a8ea815b2 Merge branch 'master' into buttbots2 ...

Conflicts:
	code/defines/procs/AStar.dm
	code/modules/mob/living/simple_animal/bot/cleanbot.dm
	code/modules/mob/living/simple_animal/bot/medbot.dm
	paradise.dme

2016-03-31 13:33:46 -04:00

..

aifixer.dm

…

arcade.dm

Revolver stuff

2015-12-03 23:18:03 -05:00

atmos_alert.dm

…

camera.dm

Port -tg-station cameranets

2016-03-13 15:06:24 -07:00

card.dm

Central Command access rework

2015-03-04 16:36:17 +01:00

cloning.dm

…

communications.dm

tgshuttles unfinished

2015-12-03 10:59:06 -08:00

crew.dm

Corrected the capitalization of a large amount of machines and items. This will also cause BYOND to use the correct articles (a/an).

2015-12-07 16:14:26 +01:00

customs.dm

…

HolodeckControl.dm

Corrected the capitalization of a large amount of machines and items. This will also cause BYOND to use the correct articles (a/an).

2015-12-07 16:14:26 +01:00

law.dm

Corrected the capitalization of a large amount of machines and items. This will also cause BYOND to use the correct articles (a/an).

2015-12-07 16:14:26 +01:00

medical.dm

Merge branch 'master' into buttbots2

2016-03-31 13:33:46 -04:00

message.dm

refactored datum/effect/system because it was a complete mess

2015-11-22 19:43:01 -05:00

Operating.dm

…

power.dm

…

prisoner.dm

TG Implant Refactor/Overhaul

2016-01-16 01:50:10 -05:00

prisonshuttle.dm

Progress bars + Wall Rationalization

2015-08-31 13:38:51 -07:00

robot.dm

…

scanconsole.dm

Used apply_effect for all radiation effects

2015-09-24 16:08:59 -07:00

security.dm

hud_updateflag purge!

2015-12-13 17:16:14 -05:00

shuttle.dm

Adds a "params" parameter to attackby(), so it keeps track of pixel_x and pixel_y among other things

2015-02-22 22:12:11 +01:00

specops_shuttle.dm

Adds a "params" parameter to attackby(), so it keeps track of pixel_x and pixel_y among other things

2015-02-22 22:12:11 +01:00

station_alert.dm

…

syndicate_shuttle.dm

Adds a "params" parameter to attackby(), so it keeps track of pixel_x and pixel_y among other things

2015-02-22 22:12:11 +01:00

syndicate_specops_shuttle.dm

Adds a "params" parameter to attackby(), so it keeps track of pixel_x and pixel_y among other things

2015-02-22 22:12:11 +01:00

welcome.dm

…